From ed0114ee9921cb8cef6373334de742269759f36c Mon Sep 17 00:00:00 2001 From: zqm Date: Fri, 31 Oct 2025 08:57:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9Camera.cs=E6=96=87=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E5=AE=9E=E7=8E=B0=E5=8F=AA=E6=9C=89=E7=BA=A2=E5=A4=96?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E6=97=B6=E6=89=8D=E6=98=BE=E7=A4=BA=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E6=B8=A9=E5=BA=A6=E8=8F=9C=E5=8D=95=E7=9A=84=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Windows/CS/Framework4.0/Toprie/Toprie/Camera.cs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Windows/CS/Framework4.0/Toprie/Toprie/Camera.cs b/Windows/CS/Framework4.0/Toprie/Toprie/Camera.cs index 60f70ea..3764863 100644 --- a/Windows/CS/Framework4.0/Toprie/Toprie/Camera.cs +++ b/Windows/CS/Framework4.0/Toprie/Toprie/Camera.cs @@ -1173,9 +1173,13 @@ namespace JoyD.Windows.CS.Toprie // 检查设备是否已连接 bool isConnected = _deviceManager != null && _deviceManager.ConnectionStatus == ConnectionStatus.Connected; - + // 在暂停状态或未连接状态下，隐藏图像模式根菜单和色彩模式菜单 // 注意：根菜单隐藏后，其所有子菜单会自动隐藏，不需要单独设置 + var currentImageMode = _deviceManager.CurrentImageMode; + bool isInfraredMode = currentImageMode == ImageMode.Infrared; + colorModeToolStripMenuItem.Visible = isInfraredMode; + saveTemperatureToolStripMenuItem.Visible = isInfraredMode; if (isPaused || !isConnected) { // 隐藏图像模式根菜单 @@ -1184,7 +1188,8 @@ namespace JoyD.Windows.CS.Toprie // 隐藏色彩模式菜单 colorModeToolStripMenuItem.Visible = false; - + saveTemperatureToolStripMenuItem.Visible = false; + // 当只有一个菜单项可见时，隐藏分隔符 toolStripSeparator1.Visible = false; } @@ -1200,9 +1205,6 @@ namespace JoyD.Windows.CS.Toprie // 根据当前图像模式控制色彩模式菜单的可见性 // 只有在红外模式下才显示色彩模式菜单和保存温度菜单 - bool isInfraredMode = _deviceManager.CurrentImageMode == ImageMode.Infrared; - colorModeToolStripMenuItem.Visible = isInfraredMode; - saveTemperatureToolStripMenuItem.Visible = isInfraredMode; // 清除视频模式菜单项的选中状态 thermalModeToolStripMenuItem.Checked = false; visibleModeToolStripMenuItem.Checked = false; @@ -1268,7 +1270,6 @@ namespace JoyD.Windows.CS.Toprie try { // 更改为使用ImageMode枚举 - var currentImageMode = _deviceManager.CurrentImageMode; thermalModeToolStripMenuItem.Checked = currentImageMode == ImageMode.Infrared; visibleModeToolStripMenuItem.Checked = currentImageMode == ImageMode.Natural; }