修复Camera.cs中的语法错误和命名空间引用问题
This commit is contained in:
298
Windows/CS/Framework4.0/Toprie/Toprie/Camera.Designer.cs
generated
298
Windows/CS/Framework4.0/Toprie/Toprie/Camera.Designer.cs
generated
@@ -21,11 +21,6 @@ namespace JoyD.Windows.CS.Toprie
|
|||||||
this.imageModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.imageModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.thermalModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.thermalModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.visibleModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.visibleModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.fusionMode1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
|
||||||
this.fusionMode2ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
|
||||||
this.fusionMode3ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
|
||||||
this.fusionMode4ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
|
||||||
this.fusionMode5ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
|
||||||
this.colorModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.colorModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.whiteHotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.whiteHotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.blackHotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.blackHotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
@@ -44,6 +39,12 @@ namespace JoyD.Windows.CS.Toprie
|
|||||||
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
|
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
|
||||||
this.saveTemperatureToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.saveTemperatureToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.pauseDetectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.pauseDetectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
|
this.saveLogToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
|
this.fusionMode1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
|
this.fusionMode2ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
|
this.fusionMode3ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
|
this.fusionMode4ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
|
this.fusionMode5ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
((System.ComponentModel.ISupportInitialize)(this.imageBox)).BeginInit();
|
((System.ComponentModel.ISupportInitialize)(this.imageBox)).BeginInit();
|
||||||
this.contextMenuStrip1.SuspendLayout();
|
this.contextMenuStrip1.SuspendLayout();
|
||||||
this.SuspendLayout();
|
this.SuspendLayout();
|
||||||
@@ -58,12 +59,11 @@ namespace JoyD.Windows.CS.Toprie
|
|||||||
this.imageBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
|
this.imageBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
|
||||||
this.imageBox.TabIndex = 0;
|
this.imageBox.TabIndex = 0;
|
||||||
this.imageBox.TabStop = false;
|
this.imageBox.TabStop = false;
|
||||||
|
this.imageBox.DoubleClick += new System.EventHandler(this.ImageBox_DoubleClick);
|
||||||
//
|
//
|
||||||
// contextMenuStrip1
|
// contextMenuStrip1
|
||||||
//
|
//
|
||||||
// 初始化保存日志菜单项
|
this.contextMenuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
|
||||||
this.saveLogToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
|
||||||
|
|
||||||
this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||||
this.imageModeToolStripMenuItem,
|
this.imageModeToolStripMenuItem,
|
||||||
this.colorModeToolStripMenuItem,
|
this.colorModeToolStripMenuItem,
|
||||||
@@ -73,7 +73,7 @@ namespace JoyD.Windows.CS.Toprie
|
|||||||
this.pauseDetectionToolStripMenuItem,
|
this.pauseDetectionToolStripMenuItem,
|
||||||
this.saveLogToolStripMenuItem});
|
this.saveLogToolStripMenuItem});
|
||||||
this.contextMenuStrip1.Name = "contextMenuStrip1";
|
this.contextMenuStrip1.Name = "contextMenuStrip1";
|
||||||
this.contextMenuStrip1.Size = new System.Drawing.Size(161, 100);
|
this.contextMenuStrip1.Size = new System.Drawing.Size(139, 154);
|
||||||
//
|
//
|
||||||
// imageModeToolStripMenuItem
|
// imageModeToolStripMenuItem
|
||||||
//
|
//
|
||||||
@@ -81,75 +81,23 @@ namespace JoyD.Windows.CS.Toprie
|
|||||||
this.thermalModeToolStripMenuItem,
|
this.thermalModeToolStripMenuItem,
|
||||||
this.visibleModeToolStripMenuItem});
|
this.visibleModeToolStripMenuItem});
|
||||||
this.imageModeToolStripMenuItem.Name = "imageModeToolStripMenuItem";
|
this.imageModeToolStripMenuItem.Name = "imageModeToolStripMenuItem";
|
||||||
this.imageModeToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
this.imageModeToolStripMenuItem.Size = new System.Drawing.Size(138, 24);
|
||||||
this.imageModeToolStripMenuItem.Text = "图像模式";
|
this.imageModeToolStripMenuItem.Text = "图像模式";
|
||||||
//
|
//
|
||||||
// thermalModeToolStripMenuItem
|
// thermalModeToolStripMenuItem
|
||||||
//
|
//
|
||||||
this.thermalModeToolStripMenuItem.Name = "thermalModeToolStripMenuItem";
|
this.thermalModeToolStripMenuItem.Name = "thermalModeToolStripMenuItem";
|
||||||
this.thermalModeToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
this.thermalModeToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
|
||||||
this.thermalModeToolStripMenuItem.Text = "红外模式";
|
this.thermalModeToolStripMenuItem.Text = "红外模式";
|
||||||
this.thermalModeToolStripMenuItem.Click += new System.EventHandler(this.ThermalModeToolStripMenuItem_Click);
|
this.thermalModeToolStripMenuItem.Click += new System.EventHandler(this.ThermalModeToolStripMenuItem_Click);
|
||||||
//
|
//
|
||||||
// visibleModeToolStripMenuItem
|
// visibleModeToolStripMenuItem
|
||||||
//
|
//
|
||||||
this.visibleModeToolStripMenuItem.Name = "visibleModeToolStripMenuItem";
|
this.visibleModeToolStripMenuItem.Name = "visibleModeToolStripMenuItem";
|
||||||
this.visibleModeToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
this.visibleModeToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
|
||||||
this.visibleModeToolStripMenuItem.Text = "自然模式";
|
this.visibleModeToolStripMenuItem.Text = "自然模式";
|
||||||
this.visibleModeToolStripMenuItem.Click += new System.EventHandler(this.VisibleModeToolStripMenuItem_Click);
|
this.visibleModeToolStripMenuItem.Click += new System.EventHandler(this.VisibleModeToolStripMenuItem_Click);
|
||||||
//
|
//
|
||||||
// temperatureDisplayToolStripMenuItem
|
|
||||||
//
|
|
||||||
this.temperatureDisplayToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
|
||||||
this.globalTemperatureToolStripMenuItem,
|
|
||||||
this.areaTemperatureToolStripMenuItem,
|
|
||||||
this.maxTemperatureToolStripMenuItem,
|
|
||||||
this.avgTemperatureToolStripMenuItem,
|
|
||||||
this.minTemperatureToolStripMenuItem});
|
|
||||||
this.temperatureDisplayToolStripMenuItem.Name = "temperatureDisplayToolStripMenuItem";
|
|
||||||
this.temperatureDisplayToolStripMenuItem.Size = new System.Drawing.Size(160, 22);
|
|
||||||
this.temperatureDisplayToolStripMenuItem.Text = "温度显示";
|
|
||||||
//
|
|
||||||
// globalTemperatureToolStripMenuItem
|
|
||||||
//
|
|
||||||
this.globalTemperatureToolStripMenuItem.CheckOnClick = true;
|
|
||||||
this.globalTemperatureToolStripMenuItem.Name = "globalTemperatureToolStripMenuItem";
|
|
||||||
this.globalTemperatureToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
|
|
||||||
this.globalTemperatureToolStripMenuItem.Text = "全局温度";
|
|
||||||
this.globalTemperatureToolStripMenuItem.Click += new System.EventHandler(this.GlobalTemperatureToolStripMenuItem_Click);
|
|
||||||
//
|
|
||||||
// areaTemperatureToolStripMenuItem
|
|
||||||
//
|
|
||||||
this.areaTemperatureToolStripMenuItem.CheckOnClick = true;
|
|
||||||
this.areaTemperatureToolStripMenuItem.Name = "areaTemperatureToolStripMenuItem";
|
|
||||||
this.areaTemperatureToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
|
|
||||||
this.areaTemperatureToolStripMenuItem.Text = "区域温度";
|
|
||||||
this.areaTemperatureToolStripMenuItem.Click += new System.EventHandler(this.AreaTemperatureToolStripMenuItem_Click);
|
|
||||||
//
|
|
||||||
// maxTemperatureToolStripMenuItem
|
|
||||||
//
|
|
||||||
this.maxTemperatureToolStripMenuItem.CheckOnClick = true;
|
|
||||||
this.maxTemperatureToolStripMenuItem.Name = "maxTemperatureToolStripMenuItem";
|
|
||||||
this.maxTemperatureToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
|
|
||||||
this.maxTemperatureToolStripMenuItem.Text = "最高温度";
|
|
||||||
this.maxTemperatureToolStripMenuItem.Click += new System.EventHandler(this.MaxTemperatureToolStripMenuItem_Click);
|
|
||||||
//
|
|
||||||
// avgTemperatureToolStripMenuItem
|
|
||||||
//
|
|
||||||
this.avgTemperatureToolStripMenuItem.CheckOnClick = true;
|
|
||||||
this.avgTemperatureToolStripMenuItem.Name = "avgTemperatureToolStripMenuItem";
|
|
||||||
this.avgTemperatureToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
|
|
||||||
this.avgTemperatureToolStripMenuItem.Text = "平均温度";
|
|
||||||
this.avgTemperatureToolStripMenuItem.Click += new System.EventHandler(this.AvgTemperatureToolStripMenuItem_Click);
|
|
||||||
//
|
|
||||||
// minTemperatureToolStripMenuItem
|
|
||||||
//
|
|
||||||
this.minTemperatureToolStripMenuItem.CheckOnClick = true;
|
|
||||||
this.minTemperatureToolStripMenuItem.Name = "minTemperatureToolStripMenuItem";
|
|
||||||
this.minTemperatureToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
|
|
||||||
this.minTemperatureToolStripMenuItem.Text = "最低温度";
|
|
||||||
this.minTemperatureToolStripMenuItem.Click += new System.EventHandler(this.MinTemperatureToolStripMenuItem_Click);
|
|
||||||
//
|
|
||||||
// colorModeToolStripMenuItem
|
// colorModeToolStripMenuItem
|
||||||
//
|
//
|
||||||
this.colorModeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
this.colorModeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||||
@@ -161,100 +109,174 @@ namespace JoyD.Windows.CS.Toprie
|
|||||||
this.ironGrayToolStripMenuItem,
|
this.ironGrayToolStripMenuItem,
|
||||||
this.redHotToolStripMenuItem,
|
this.redHotToolStripMenuItem,
|
||||||
this.rainbow2ToolStripMenuItem});
|
this.rainbow2ToolStripMenuItem});
|
||||||
//
|
|
||||||
// toolStripSeparator1
|
|
||||||
//
|
|
||||||
this.toolStripSeparator1.Name = "toolStripSeparator1";
|
|
||||||
this.toolStripSeparator1.Size = new System.Drawing.Size(157, 6);
|
|
||||||
//
|
|
||||||
// saveTemperatureToolStripMenuItem
|
|
||||||
//
|
|
||||||
this.saveTemperatureToolStripMenuItem.Name = "saveTemperatureToolStripMenuItem";
|
|
||||||
this.saveTemperatureToolStripMenuItem.Size = new System.Drawing.Size(160, 22);
|
|
||||||
this.saveTemperatureToolStripMenuItem.Text = "保存温度";
|
|
||||||
this.saveTemperatureToolStripMenuItem.Click += new System.EventHandler(this.SaveTemperatureToolStripMenuItem_Click);
|
|
||||||
//
|
|
||||||
// saveLogToolStripMenuItem
|
|
||||||
//
|
|
||||||
this.saveLogToolStripMenuItem.CheckOnClick = true;
|
|
||||||
this.saveLogToolStripMenuItem.Name = "saveLogToolStripMenuItem";
|
|
||||||
this.saveLogToolStripMenuItem.Size = new System.Drawing.Size(160, 22);
|
|
||||||
this.saveLogToolStripMenuItem.Text = "保存日志";
|
|
||||||
this.saveLogToolStripMenuItem.Click += new System.EventHandler(this.SaveLogToolStripMenuItem_Click);
|
|
||||||
//
|
|
||||||
// pauseDetectionToolStripMenuItem
|
|
||||||
//
|
|
||||||
this.pauseDetectionToolStripMenuItem.Name = "pauseDetectionToolStripMenuItem";
|
|
||||||
this.pauseDetectionToolStripMenuItem.Size = new System.Drawing.Size(160, 22);
|
|
||||||
this.pauseDetectionToolStripMenuItem.Text = "暂停检测";
|
|
||||||
this.pauseDetectionToolStripMenuItem.Click += new System.EventHandler(this.PauseDetectionToolStripMenuItem_Click);
|
|
||||||
this.colorModeToolStripMenuItem.Name = "colorModeToolStripMenuItem";
|
this.colorModeToolStripMenuItem.Name = "colorModeToolStripMenuItem";
|
||||||
this.colorModeToolStripMenuItem.Size = new System.Drawing.Size(160, 22);
|
this.colorModeToolStripMenuItem.Size = new System.Drawing.Size(138, 24);
|
||||||
this.colorModeToolStripMenuItem.Text = "色彩模式";
|
this.colorModeToolStripMenuItem.Text = "色彩模式";
|
||||||
//
|
//
|
||||||
// rainbowToolStripMenuItem
|
|
||||||
//
|
|
||||||
this.rainbowToolStripMenuItem.Name = "rainbowToolStripMenuItem";
|
|
||||||
this.rainbowToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
|
|
||||||
this.rainbowToolStripMenuItem.Text = "彩虹";
|
|
||||||
this.rainbowToolStripMenuItem.Click += new System.EventHandler(this.RainbowToolStripMenuItem_Click);
|
|
||||||
//
|
|
||||||
// ironRedToolStripMenuItem
|
|
||||||
//
|
|
||||||
this.ironRedToolStripMenuItem.Name = "ironRedToolStripMenuItem";
|
|
||||||
this.ironRedToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
|
|
||||||
this.ironRedToolStripMenuItem.Text = "铁红";
|
|
||||||
this.ironRedToolStripMenuItem.Click += new System.EventHandler(this.IronRedToolStripMenuItem_Click);
|
|
||||||
//
|
|
||||||
// lavaToolStripMenuItem
|
|
||||||
//
|
|
||||||
this.lavaToolStripMenuItem.Name = "lavaToolStripMenuItem";
|
|
||||||
this.lavaToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
|
|
||||||
this.lavaToolStripMenuItem.Text = "熔岩";
|
|
||||||
this.lavaToolStripMenuItem.Click += new System.EventHandler(this.LavaToolStripMenuItem_Click);
|
|
||||||
//
|
|
||||||
// ironGrayToolStripMenuItem
|
|
||||||
//
|
|
||||||
this.ironGrayToolStripMenuItem.Name = "ironGrayToolStripMenuItem";
|
|
||||||
this.ironGrayToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
|
|
||||||
this.ironGrayToolStripMenuItem.Text = "铁灰";
|
|
||||||
this.ironGrayToolStripMenuItem.Click += new System.EventHandler(this.IronGrayToolStripMenuItem_Click);
|
|
||||||
//
|
|
||||||
// redHotToolStripMenuItem
|
|
||||||
//
|
|
||||||
this.redHotToolStripMenuItem.Name = "redHotToolStripMenuItem";
|
|
||||||
this.redHotToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
|
|
||||||
this.redHotToolStripMenuItem.Text = "红热";
|
|
||||||
this.redHotToolStripMenuItem.Click += new System.EventHandler(this.RedHotToolStripMenuItem_Click);
|
|
||||||
//
|
|
||||||
// rainbow2ToolStripMenuItem
|
|
||||||
//
|
|
||||||
this.rainbow2ToolStripMenuItem.Name = "rainbow2ToolStripMenuItem";
|
|
||||||
this.rainbow2ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
|
|
||||||
this.rainbow2ToolStripMenuItem.Text = "彩虹2";
|
|
||||||
this.rainbow2ToolStripMenuItem.Click += new System.EventHandler(this.Rainbow2ToolStripMenuItem_Click);
|
|
||||||
//
|
|
||||||
// whiteHotToolStripMenuItem
|
// whiteHotToolStripMenuItem
|
||||||
//
|
//
|
||||||
this.whiteHotToolStripMenuItem.Name = "whiteHotToolStripMenuItem";
|
this.whiteHotToolStripMenuItem.Name = "whiteHotToolStripMenuItem";
|
||||||
this.whiteHotToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
|
this.whiteHotToolStripMenuItem.Size = new System.Drawing.Size(123, 26);
|
||||||
this.whiteHotToolStripMenuItem.Text = "白热";
|
this.whiteHotToolStripMenuItem.Text = "白热";
|
||||||
this.whiteHotToolStripMenuItem.Click += new System.EventHandler(this.WhiteHotToolStripMenuItem_Click);
|
this.whiteHotToolStripMenuItem.Click += new System.EventHandler(this.WhiteHotToolStripMenuItem_Click);
|
||||||
//
|
//
|
||||||
// blackHotToolStripMenuItem
|
// blackHotToolStripMenuItem
|
||||||
//
|
//
|
||||||
this.blackHotToolStripMenuItem.Name = "blackHotToolStripMenuItem";
|
this.blackHotToolStripMenuItem.Name = "blackHotToolStripMenuItem";
|
||||||
this.blackHotToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
|
this.blackHotToolStripMenuItem.Size = new System.Drawing.Size(123, 26);
|
||||||
this.blackHotToolStripMenuItem.Text = "黑热";
|
this.blackHotToolStripMenuItem.Text = "黑热";
|
||||||
this.blackHotToolStripMenuItem.Click += new System.EventHandler(this.BlackHotToolStripMenuItem_Click);
|
this.blackHotToolStripMenuItem.Click += new System.EventHandler(this.BlackHotToolStripMenuItem_Click);
|
||||||
//
|
//
|
||||||
// 已移除蓝红菜单项(不在SDK的8种标准色板中)
|
// ironRedToolStripMenuItem
|
||||||
|
//
|
||||||
|
this.ironRedToolStripMenuItem.Name = "ironRedToolStripMenuItem";
|
||||||
|
this.ironRedToolStripMenuItem.Size = new System.Drawing.Size(123, 26);
|
||||||
|
this.ironRedToolStripMenuItem.Text = "铁红";
|
||||||
|
this.ironRedToolStripMenuItem.Click += new System.EventHandler(this.IronRedToolStripMenuItem_Click);
|
||||||
|
//
|
||||||
|
// lavaToolStripMenuItem
|
||||||
|
//
|
||||||
|
this.lavaToolStripMenuItem.Name = "lavaToolStripMenuItem";
|
||||||
|
this.lavaToolStripMenuItem.Size = new System.Drawing.Size(123, 26);
|
||||||
|
this.lavaToolStripMenuItem.Text = "熔岩";
|
||||||
|
this.lavaToolStripMenuItem.Click += new System.EventHandler(this.LavaToolStripMenuItem_Click);
|
||||||
|
//
|
||||||
|
// rainbowToolStripMenuItem
|
||||||
|
//
|
||||||
|
this.rainbowToolStripMenuItem.Name = "rainbowToolStripMenuItem";
|
||||||
|
this.rainbowToolStripMenuItem.Size = new System.Drawing.Size(123, 26);
|
||||||
|
this.rainbowToolStripMenuItem.Text = "彩虹";
|
||||||
|
this.rainbowToolStripMenuItem.Click += new System.EventHandler(this.RainbowToolStripMenuItem_Click);
|
||||||
|
//
|
||||||
|
// ironGrayToolStripMenuItem
|
||||||
|
//
|
||||||
|
this.ironGrayToolStripMenuItem.Name = "ironGrayToolStripMenuItem";
|
||||||
|
this.ironGrayToolStripMenuItem.Size = new System.Drawing.Size(123, 26);
|
||||||
|
this.ironGrayToolStripMenuItem.Text = "铁灰";
|
||||||
|
this.ironGrayToolStripMenuItem.Click += new System.EventHandler(this.IronGrayToolStripMenuItem_Click);
|
||||||
|
//
|
||||||
|
// redHotToolStripMenuItem
|
||||||
|
//
|
||||||
|
this.redHotToolStripMenuItem.Name = "redHotToolStripMenuItem";
|
||||||
|
this.redHotToolStripMenuItem.Size = new System.Drawing.Size(123, 26);
|
||||||
|
this.redHotToolStripMenuItem.Text = "红热";
|
||||||
|
this.redHotToolStripMenuItem.Click += new System.EventHandler(this.RedHotToolStripMenuItem_Click);
|
||||||
|
//
|
||||||
|
// rainbow2ToolStripMenuItem
|
||||||
|
//
|
||||||
|
this.rainbow2ToolStripMenuItem.Name = "rainbow2ToolStripMenuItem";
|
||||||
|
this.rainbow2ToolStripMenuItem.Size = new System.Drawing.Size(123, 26);
|
||||||
|
this.rainbow2ToolStripMenuItem.Text = "彩虹2";
|
||||||
|
this.rainbow2ToolStripMenuItem.Click += new System.EventHandler(this.Rainbow2ToolStripMenuItem_Click);
|
||||||
|
//
|
||||||
|
// temperatureDisplayToolStripMenuItem
|
||||||
|
//
|
||||||
|
this.temperatureDisplayToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||||
|
this.globalTemperatureToolStripMenuItem,
|
||||||
|
this.areaTemperatureToolStripMenuItem,
|
||||||
|
this.maxTemperatureToolStripMenuItem,
|
||||||
|
this.avgTemperatureToolStripMenuItem,
|
||||||
|
this.minTemperatureToolStripMenuItem});
|
||||||
|
this.temperatureDisplayToolStripMenuItem.Name = "temperatureDisplayToolStripMenuItem";
|
||||||
|
this.temperatureDisplayToolStripMenuItem.Size = new System.Drawing.Size(138, 24);
|
||||||
|
this.temperatureDisplayToolStripMenuItem.Text = "温度显示";
|
||||||
|
//
|
||||||
|
// globalTemperatureToolStripMenuItem
|
||||||
|
//
|
||||||
|
this.globalTemperatureToolStripMenuItem.CheckOnClick = true;
|
||||||
|
this.globalTemperatureToolStripMenuItem.Name = "globalTemperatureToolStripMenuItem";
|
||||||
|
this.globalTemperatureToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
|
||||||
|
this.globalTemperatureToolStripMenuItem.Text = "全局温度";
|
||||||
|
this.globalTemperatureToolStripMenuItem.Click += new System.EventHandler(this.GlobalTemperatureToolStripMenuItem_Click);
|
||||||
|
//
|
||||||
|
// areaTemperatureToolStripMenuItem
|
||||||
|
//
|
||||||
|
this.areaTemperatureToolStripMenuItem.CheckOnClick = true;
|
||||||
|
this.areaTemperatureToolStripMenuItem.Name = "areaTemperatureToolStripMenuItem";
|
||||||
|
this.areaTemperatureToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
|
||||||
|
this.areaTemperatureToolStripMenuItem.Text = "区域温度";
|
||||||
|
this.areaTemperatureToolStripMenuItem.Click += new System.EventHandler(this.AreaTemperatureToolStripMenuItem_Click);
|
||||||
|
//
|
||||||
|
// maxTemperatureToolStripMenuItem
|
||||||
|
//
|
||||||
|
this.maxTemperatureToolStripMenuItem.CheckOnClick = true;
|
||||||
|
this.maxTemperatureToolStripMenuItem.Name = "maxTemperatureToolStripMenuItem";
|
||||||
|
this.maxTemperatureToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
|
||||||
|
this.maxTemperatureToolStripMenuItem.Text = "最高温度";
|
||||||
|
this.maxTemperatureToolStripMenuItem.Click += new System.EventHandler(this.MaxTemperatureToolStripMenuItem_Click);
|
||||||
|
//
|
||||||
|
// avgTemperatureToolStripMenuItem
|
||||||
|
//
|
||||||
|
this.avgTemperatureToolStripMenuItem.CheckOnClick = true;
|
||||||
|
this.avgTemperatureToolStripMenuItem.Name = "avgTemperatureToolStripMenuItem";
|
||||||
|
this.avgTemperatureToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
|
||||||
|
this.avgTemperatureToolStripMenuItem.Text = "平均温度";
|
||||||
|
this.avgTemperatureToolStripMenuItem.Click += new System.EventHandler(this.AvgTemperatureToolStripMenuItem_Click);
|
||||||
|
//
|
||||||
|
// minTemperatureToolStripMenuItem
|
||||||
|
//
|
||||||
|
this.minTemperatureToolStripMenuItem.CheckOnClick = true;
|
||||||
|
this.minTemperatureToolStripMenuItem.Name = "minTemperatureToolStripMenuItem";
|
||||||
|
this.minTemperatureToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
|
||||||
|
this.minTemperatureToolStripMenuItem.Text = "最低温度";
|
||||||
|
this.minTemperatureToolStripMenuItem.Click += new System.EventHandler(this.MinTemperatureToolStripMenuItem_Click);
|
||||||
|
//
|
||||||
|
// toolStripSeparator1
|
||||||
|
//
|
||||||
|
this.toolStripSeparator1.Name = "toolStripSeparator1";
|
||||||
|
this.toolStripSeparator1.Size = new System.Drawing.Size(135, 6);
|
||||||
|
//
|
||||||
|
// saveTemperatureToolStripMenuItem
|
||||||
|
//
|
||||||
|
this.saveTemperatureToolStripMenuItem.Name = "saveTemperatureToolStripMenuItem";
|
||||||
|
this.saveTemperatureToolStripMenuItem.Size = new System.Drawing.Size(138, 24);
|
||||||
|
this.saveTemperatureToolStripMenuItem.Text = "保存温度";
|
||||||
|
this.saveTemperatureToolStripMenuItem.Click += new System.EventHandler(this.SaveTemperatureToolStripMenuItem_Click);
|
||||||
|
//
|
||||||
|
// pauseDetectionToolStripMenuItem
|
||||||
|
//
|
||||||
|
this.pauseDetectionToolStripMenuItem.Name = "pauseDetectionToolStripMenuItem";
|
||||||
|
this.pauseDetectionToolStripMenuItem.Size = new System.Drawing.Size(138, 24);
|
||||||
|
this.pauseDetectionToolStripMenuItem.Text = "暂停检测";
|
||||||
|
this.pauseDetectionToolStripMenuItem.Click += new System.EventHandler(this.PauseDetectionToolStripMenuItem_Click);
|
||||||
|
//
|
||||||
|
// saveLogToolStripMenuItem
|
||||||
|
//
|
||||||
|
this.saveLogToolStripMenuItem.CheckOnClick = true;
|
||||||
|
this.saveLogToolStripMenuItem.Name = "saveLogToolStripMenuItem";
|
||||||
|
this.saveLogToolStripMenuItem.Size = new System.Drawing.Size(138, 24);
|
||||||
|
this.saveLogToolStripMenuItem.Text = "保存日志";
|
||||||
|
this.saveLogToolStripMenuItem.Click += new System.EventHandler(this.SaveLogToolStripMenuItem_Click);
|
||||||
|
//
|
||||||
|
// fusionMode1ToolStripMenuItem
|
||||||
|
//
|
||||||
|
this.fusionMode1ToolStripMenuItem.Name = "fusionMode1ToolStripMenuItem";
|
||||||
|
this.fusionMode1ToolStripMenuItem.Size = new System.Drawing.Size(32, 19);
|
||||||
|
//
|
||||||
|
// fusionMode2ToolStripMenuItem
|
||||||
|
//
|
||||||
|
this.fusionMode2ToolStripMenuItem.Name = "fusionMode2ToolStripMenuItem";
|
||||||
|
this.fusionMode2ToolStripMenuItem.Size = new System.Drawing.Size(32, 19);
|
||||||
|
//
|
||||||
|
// fusionMode3ToolStripMenuItem
|
||||||
|
//
|
||||||
|
this.fusionMode3ToolStripMenuItem.Name = "fusionMode3ToolStripMenuItem";
|
||||||
|
this.fusionMode3ToolStripMenuItem.Size = new System.Drawing.Size(32, 19);
|
||||||
|
//
|
||||||
|
// fusionMode4ToolStripMenuItem
|
||||||
|
//
|
||||||
|
this.fusionMode4ToolStripMenuItem.Name = "fusionMode4ToolStripMenuItem";
|
||||||
|
this.fusionMode4ToolStripMenuItem.Size = new System.Drawing.Size(32, 19);
|
||||||
|
//
|
||||||
|
// fusionMode5ToolStripMenuItem
|
||||||
|
//
|
||||||
|
this.fusionMode5ToolStripMenuItem.Name = "fusionMode5ToolStripMenuItem";
|
||||||
|
this.fusionMode5ToolStripMenuItem.Size = new System.Drawing.Size(32, 19);
|
||||||
//
|
//
|
||||||
// Camera
|
// Camera
|
||||||
//
|
//
|
||||||
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
|
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
|
||||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||||
// 添加imageBox
|
|
||||||
this.Controls.Add(this.imageBox);
|
this.Controls.Add(this.imageBox);
|
||||||
this.Name = "Camera";
|
this.Name = "Camera";
|
||||||
this.Size = new System.Drawing.Size(512, 384);
|
this.Size = new System.Drawing.Size(512, 384);
|
||||||
|
|||||||
@@ -650,9 +650,9 @@ namespace JoyD.Windows.CS.Toprie
|
|||||||
if (_lastImage == null) _lastImage = new Bitmap(newImage);
|
if (_lastImage == null) _lastImage = new Bitmap(newImage);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
using(Graphics g= Graphics.FromImage(_lastImage))
|
using (Graphics g = Graphics.FromImage(_lastImage))
|
||||||
{
|
{
|
||||||
g.DrawImage(newImage,Point.Empty);
|
g.DrawImage(newImage, Point.Empty);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1114,7 +1114,7 @@ namespace JoyD.Windows.CS.Toprie
|
|||||||
ShowError($"连接状态处理错误: {ex.Message}");
|
ShowError($"连接状态处理错误: {ex.Message}");
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{}
|
{ }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1868,13 +1868,13 @@ namespace JoyD.Windows.CS.Toprie
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 修改流程第6点:数据显示菜单勾选变化时,只在非暂停状态下调用更新实时信息
|
// 修改流程第6点:数据显示菜单勾选变化时,只在非暂停状态下调用更新实时信息
|
||||||
if (!_isPaused)
|
if (!_isPaused)
|
||||||
{
|
{
|
||||||
UpdateRealTimeInfoOnUI();
|
UpdateRealTimeInfoOnUI();
|
||||||
}
|
}
|
||||||
|
|
||||||
// 菜单状态变更时自动静默保存配置
|
// 菜单状态变更时自动静默保存配置
|
||||||
SaveMenuConfig();
|
SaveMenuConfig();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -2218,7 +2218,7 @@ namespace JoyD.Windows.CS.Toprie
|
|||||||
string line = lines[i];
|
string line = lines[i];
|
||||||
if (string.IsNullOrWhiteSpace(line))
|
if (string.IsNullOrWhiteSpace(line))
|
||||||
{
|
{
|
||||||
WriteLog($"警告: 配置文件第{i+1}行为空,已跳过");
|
WriteLog($"警告: 配置文件第{i + 1}行为空,已跳过");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2240,12 +2240,12 @@ namespace JoyD.Windows.CS.Toprie
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
WriteLog($"警告: 配置文件第{i+1}行格式不正确,字段数量不足: {line}");
|
WriteLog($"警告: 配置文件第{i + 1}行格式不正确,字段数量不足: {line}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
WriteLog($"解析配置文件第{i+1}行时出错: {ex.Message} - {ex.StackTrace}");
|
WriteLog($"解析配置文件第{i + 1}行时出错: {ex.Message} - {ex.StackTrace}");
|
||||||
// 继续处理下一行,不中断整个解析过程
|
// 继续处理下一行,不中断整个解析过程
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2743,23 +2743,24 @@ namespace JoyD.Windows.CS.Toprie
|
|||||||
Console.WriteLine($"验证菜单功能失败: {ex.Message}");
|
Console.WriteLine($"验证菜单功能失败: {ex.Message}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// imageBox双击事件处理方法
|
/// <summary>
|
||||||
/// 双击后弹出检测配置窗口
|
/// imageBox双击事件处理方法
|
||||||
/// </summary>
|
/// 双击后弹出检测配置窗口
|
||||||
private void ImageBox_DoubleClick(object sender, EventArgs e)
|
/// </summary>
|
||||||
|
private void ImageBox_DoubleClick(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
try
|
// 显示配置窗口,使用完整命名空间引用Setting类
|
||||||
{
|
JoyD.Windows.CS.Setting.Form.ShowDialog();
|
||||||
// 显示配置窗口,使用完整命名空间引用Setting类
|
|
||||||
JoyD.Windows.CS.Setting.Form.ShowDialog();
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
Console.WriteLine($"打开配置窗口时出错: {ex.Message}");
|
|
||||||
MessageBox.Show($"打开配置窗口时出错: {ex.Message}", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Console.WriteLine($"打开配置窗口时出错: {ex.Message}");
|
||||||
|
MessageBox.Show($"打开配置窗口时出错: {ex.Message}", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -117,4 +117,7 @@
|
|||||||
<resheader name="writer">
|
<resheader name="writer">
|
||||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
</resheader>
|
</resheader>
|
||||||
|
<metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||||
|
<value>17, 17</value>
|
||||||
|
</metadata>
|
||||||
</root>
|
</root>
|
||||||
Reference in New Issue
Block a user