diff --git a/Windows/CS/Framework4.0/Toprie/Toprie/Camera.cs b/Windows/CS/Framework4.0/Toprie/Toprie/Camera.cs index 05240b4..6cfe55b 100644 --- a/Windows/CS/Framework4.0/Toprie/Toprie/Camera.cs +++ b/Windows/CS/Framework4.0/Toprie/Toprie/Camera.cs @@ -522,7 +522,7 @@ namespace JoyD.Windows.CS.Toprie /// /// 加载所有配置文件 /// - private void LoadAllConfigs() + public void LoadAllConfigs() { LoadMenuConfig(); LoadZoneConfig(); diff --git a/Windows/CS/Framework4.0/Toprie/Toprie/Properties/AssemblyInfo.cs b/Windows/CS/Framework4.0/Toprie/Toprie/Properties/AssemblyInfo.cs index a13f9cf..c4fb20b 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.2.0")] -[assembly: AssemblyFileVersion("1.0.2.4")] +[assembly: AssemblyVersion("1.0.2.5")] +[assembly: AssemblyFileVersion("1.0.2.6")] // NuGet包相关信息已在项目文件中配置 diff --git a/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs b/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs index 7221fad..2ade21c 100644 --- a/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs +++ b/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs @@ -1019,10 +1019,13 @@ namespace JoyD.Windows.CS _detectionZone.Color = _tempDetectionZone.Color; // 保存颜色 // 检测区发生变化,更新绝对测温区 - UpdateAbsoluteTemperatureZones(); - - // 更新绝对温差图数据 - UpdateAbsoluteTempDiffData(); + UpdateAbsoluteTemperatureZones(); + + // 同步_drawnRectangles列表 + SyncDrawnRectanglesFromAbsoluteTemperatureZones(); + + // 更新绝对温差图数据 + UpdateAbsoluteTempDiffData(); // 检测区发生变化,正确释放叠加层资源后设为 null if (_rectangleOverlayImage != null) @@ -2700,6 +2703,9 @@ namespace JoyD.Windows.CS // 更新绝对测温区列表 UpdateAbsoluteTemperatureZones(); + + // 同步_drawnRectangles列表 + SyncDrawnRectanglesFromAbsoluteTemperatureZones(); } /// @@ -5469,6 +5475,9 @@ namespace JoyD.Windows.CS // 检测区发生变化,更新绝对测温区 UpdateAbsoluteTemperatureZones(); + // 同步_drawnRectangles列表 + SyncDrawnRectanglesFromAbsoluteTemperatureZones(); + // 更新绝对温差图数据 UpdateAbsoluteTempDiffData();