ZengQingming/JoyD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复Camera.cs中的语法错误和命名空间引用问题

Browse Source
This commit is contained in:
zqm
2025-11-12 14:25:12 +08:00
parent ee70cb8fc8
commit 60257fc297
3 changed files with 559 additions and 533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

298
Windows/CS/Framework4.0/Toprie/Toprie/Camera.Designer.cs generated
View File

@@ -21,11 +21,6 @@ namespace JoyD.Windows.CS.Toprie
this.imageModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.thermalModeToolStripMenuItem = 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.whiteHotToolStripMenuItem = 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.saveTemperatureToolStripMenuItem = 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();
this.contextMenuStrip1.SuspendLayout();
this.SuspendLayout();
@@ -58,12 +59,11 @@ namespace JoyD.Windows.CS.Toprie
this.imageBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.imageBox.TabIndex = 0;
this.imageBox.TabStop = false;
this.imageBox.DoubleClick += new System.EventHandler(this.ImageBox_DoubleClick);
//
// contextMenuStrip1
//
// 初始化保存日志菜单项
this.saveLogToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.contextMenuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.imageModeToolStripMenuItem,
this.colorModeToolStripMenuItem,
@@ -73,7 +73,7 @@ namespace JoyD.Windows.CS.Toprie
this.pauseDetectionToolStripMenuItem,
this.saveLogToolStripMenuItem});
this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(161, 100);
this.contextMenuStrip1.Size = new System.Drawing.Size(139, 154);
//
// imageModeToolStripMenuItem
//
@@ -81,75 +81,23 @@ namespace JoyD.Windows.CS.Toprie
this.thermalModeToolStripMenuItem,
this.visibleModeToolStripMenuItem});
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 = "图像模式";
//
// 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.Click += new System.EventHandler(this.ThermalModeToolStripMenuItem_Click);
//
// 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.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
//
this.colorModeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -161,100 +109,174 @@ namespace JoyD.Windows.CS.Toprie
this.ironGrayToolStripMenuItem,
this.redHotToolStripMenuItem,
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.Size = new System.Drawing.Size(160, 22);
this.colorModeToolStripMenuItem.Size = new System.Drawing.Size(138, 24);
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
//
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.Click += new System.EventHandler(this.WhiteHotToolStripMenuItem_Click);
//
// 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.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
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
// 添加imageBox
this.Controls.Add(this.imageBox);
this.Name = "Camera";
this.Size = new System.Drawing.Size(512, 384);

5
Windows/CS/Framework4.0/Toprie/Toprie/Camera.cs
View File

@@ -2743,9 +2743,8 @@ namespace JoyD.Windows.CS.Toprie
Console.WriteLine($"验证菜单功能失败: {ex.Message}");
}
}
}
}
/// <summary>
/// <summary>
/// imageBox双击事件处理方法
/// 双击后弹出检测配置窗口
@@ -2763,3 +2762,5 @@ namespace JoyD.Windows.CS.Toprie
MessageBox.Show($"打开配置窗口时出错: {ex.Message}", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
}
}

3
Windows/CS/Framework4.0/Toprie/Toprie/Camera.resx
View File

@@ -117,4 +117,7 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</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>