diff --git a/Windows/CS/Framework4.0/Toprie/Toprie/Properties/AssemblyInfo.cs b/Windows/CS/Framework4.0/Toprie/Toprie/Properties/AssemblyInfo.cs index 2dcf829..d6ac815 100644 --- a/Windows/CS/Framework4.0/Toprie/Toprie/Properties/AssemblyInfo.cs +++ b/Windows/CS/Framework4.0/Toprie/Toprie/Properties/AssemblyInfo.cs @@ -32,7 +32,7 @@ using System.Runtime.InteropServices; // 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号 //通过使用 "*",如下所示: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.1.0")] -[assembly: AssemblyFileVersion("1.0.1.2")] +[assembly: AssemblyVersion("1.0.2.0")] +[assembly: AssemblyFileVersion("1.0.2.2")] // NuGet包相关信息已在项目文件中配置 diff --git a/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs b/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs index 692378e..83c91a4 100644 --- a/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs +++ b/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs @@ -1034,48 +1034,12 @@ namespace JoyD.Windows.CS // 恢复叠加层绘制,显示测温区和温差图 CreateRectangleOverlayImage(); - // 在检测区修改模式下,只显示相关按钮 - // 隐藏所有与检测区无关的按钮 - btnDrawRegion.Visible = false; // 隐藏绘制区域按钮 - btnDrawTempDiff.Visible = false; // 隐藏温差图按钮 - btnDeleteRegion.Visible = false; // 隐藏删除区域按钮 - - // 隐藏配置相关按钮 - btnNewTempRegion.Visible = false; - btnLoadTempRegion.Visible = false; - btnSaveTempRegion.Visible = false; - btnNewTempDiff.Visible = false; - btnLoadTempDiff.Visible = false; - btnSaveTempDiff.Visible = false; - - // 隐藏温差图例相关按钮 - btnAddTempDiff.Visible = false; - btnDeleteTempDiff.Visible = false; - - // 隐藏擦除按钮 - btnEraseTempDiff.Visible = false; - - // 隐藏所有画笔大小按钮 - btnBrushSize1.Visible = false; - btnBrushSize3.Visible = false; - btnBrushSize5.Visible = false; - btnBrushSize10.Visible = false; - btnBrushSize15.Visible = false; - btnBrushSize25.Visible = false; - - // 隐藏区域编号设置控件 - txtRegionNumber.Visible = false; - txtRegionNumber.Text = ""; - - // 显示修改检测区按钮和颜色选择按钮 - btnModifyDetectionZone.Visible = true; - btnSelectColor.Visible = true; - // 更新颜色选择按钮图标,确保显示检测区的颜色 - UpdateColorButtonIcon(); - - // 更新_selectedColor为检测区的颜色,并更新按钮图标 - _selectedColor = _tempDetectionZone.Color; - UpdateColorButtonIcon(); + // 恢复到正常状态,使用统一的方法更新按钮可见性,设置为就绪状态 + UpdateButtonsVisibility(0); + + // 更新_selectedColor为检测区的颜色,并更新按钮图标 + _selectedColor = _tempDetectionZone.Color; + UpdateColorButtonIcon(); // 刷新绘制 picBoxTemp.Invalidate();