From ac3fe69582750e86cb13ed8267cf6afe5d0738c1 Mon Sep 17 00:00:00 2001 From: zqm Date: Mon, 10 Nov 2025 09:45:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E9=85=8D=E7=BD=AE=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E8=AF=B4=E6=98=8E=E6=8E=A7=E5=88=B6=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E5=92=8CdataGridViewTempDiff=E7=9A=84=E6=98=BE=E7=A4=BA/?= =?UTF-8?q?=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CS/Framework4.0/Toprie/Toprie/Setting.cs | 34 ++++++++++++------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs b/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs index 0a72235..233443f 100644 --- a/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs +++ b/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs @@ -60,10 +60,10 @@ namespace JoyD.Windows.CS _timer = new Timer { Interval = 1000 }; _timer.Tick += Timer_Tick; - // 初始隐藏颜色选择按钮,只有在绘制模式下才显示 + // 初始隐藏颜色选择按钮 btnSelectColor.Visible = false; - // 初始隐藏删除按钮,只有在选中区域时才显示 + // 初始隐藏删除按钮 try { btnDeleteRegion.Visible = false; @@ -77,6 +77,9 @@ namespace JoyD.Windows.CS // 初始化温差图例DataGridView InitializeTempDiffDataGridView(); + + // 初始状态下隐藏温差图例表格 + dataGridViewTempDiff.Visible = false; } /// @@ -224,24 +227,28 @@ namespace JoyD.Windows.CS btnDrawTempDiff.Visible = true; // 显示温差图按钮 btnSelectColor.Visible = false; // 隐藏颜色选择按钮 btnDeleteRegion.Visible = false; // 隐藏删除区域按钮 + dataGridViewTempDiff.Visible = false; // 隐藏温差图例表格 break; case 1: // 选中区域状态 btnDrawRegion.Visible = false; // 隐藏绘制区域按钮 btnDrawTempDiff.Visible = false; // 隐藏温差图按钮 btnSelectColor.Visible = true; // 显示颜色选择按钮 btnDeleteRegion.Visible = true; // 显示删除区域按钮 + dataGridViewTempDiff.Visible = false; // 隐藏温差图例表格 break; case 2: // 绘制状态 btnSelectColor.Visible = true; // 显示颜色选择按钮 btnDrawRegion.Visible = true; // 显示绘制区域按钮 btnDeleteRegion.Visible = false; // 隐藏删除区域按钮 btnDrawTempDiff.Visible = false; // 隐藏温差图按钮 + dataGridViewTempDiff.Visible = false; // 隐藏温差图例表格 break; case 3: // 温差图绘制状态 btnDrawTempDiff.Visible = true; // 显示温差图按钮 btnDrawRegion.Visible = false; // 隐藏绘制区域按钮 btnSelectColor.Visible = false; // 隐藏颜色选择按钮 btnDeleteRegion.Visible = false; // 隐藏删除区域按钮 + dataGridViewTempDiff.Visible = true; // 显示温差图例表格 break; } } @@ -1022,12 +1029,8 @@ namespace JoyD.Windows.CS // 取消选中状态 _selectedRegionIndex = -1; - // 隐藏删除按钮和颜色选择按钮 - btnDeleteRegion.Visible = false; - btnSelectColor.Visible = false; - - // 显示绘制区域按钮 - btnDrawRegion.Visible = true; + // 使用统一的方法更新按钮可见性,设置为就绪状态 + UpdateButtonsVisibility(0); // 重绘叠加层 CreateRectangleOverlayImage(); @@ -1287,11 +1290,16 @@ namespace JoyD.Windows.CS try { bool isRegionSelected = (_selectedRegionIndex != -1); - btnDeleteRegion.Visible = isRegionSelected; - btnSelectColor.Visible = isRegionSelected; - btnDrawRegion.Visible = !isRegionSelected; // 选中区域时隐藏绘制按钮 - // 温差图按钮只在就绪状态且未选中区域时显示 - btnDrawTempDiff.Visible = !isRegionSelected; + if (isRegionSelected) + { + // 选中区域状态 + UpdateButtonsVisibility(1); + } + else + { + // 就绪状态 + UpdateButtonsVisibility(0); + } } catch (Exception ex) {