diff --git a/Windows/CS/Framework4.0/Toprie/Toprie/Camera.cs b/Windows/CS/Framework4.0/Toprie/Toprie/Camera.cs index faac0e2..cf00e52 100644 --- a/Windows/CS/Framework4.0/Toprie/Toprie/Camera.cs +++ b/Windows/CS/Framework4.0/Toprie/Toprie/Camera.cs @@ -2393,7 +2393,7 @@ namespace JoyD.Windows.CS.Toprie // 保存检测区配置 csvContent.AppendLine(); // 添加空行 - csvContent.AppendLine($"detectionZone,{_detectionZone.X},{_detectionZone.Y},{_detectionZone.Width},{_detectionZone.Height},{_detectionZone.Color.Name}"); + csvContent.AppendLine($"detectionZone,{_detectionZone.X},{_detectionZone.Y},{_detectionZone.Width},{_detectionZone.Height},{ColorTranslator.ToHtml(_detectionZone.Color)}"); } catch (Exception ex) { diff --git a/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs b/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs index 7499bd7..7a26739 100644 --- a/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs +++ b/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs @@ -3568,9 +3568,6 @@ namespace JoyD.Windows.CS // 更新选中的颜色 _selectedColor = colorDialog.Color; - // 更新按钮图标,显示新选择的颜色 - UpdateColorButtonIcon(); - // 检测区修改模式下,更新检测区的颜色 if (_isModifyingDetectionZone) { @@ -3588,6 +3585,9 @@ namespace JoyD.Windows.CS } } + // 更新按钮图标,显示新选择的颜色 + UpdateColorButtonIcon(); + // 重绘图片区域,显示新颜色的矩形或检测区 picBoxTemp.Invalidate(); } @@ -5076,6 +5076,8 @@ namespace JoyD.Windows.CS // 显示修改检测区按钮和颜色选择按钮 btnModifyDetectionZone.Visible = true; btnSelectColor.Visible = true; + // 更新颜色选择按钮图标,确保显示检测区的颜色 + UpdateColorButtonIcon(); } else { @@ -5087,6 +5089,7 @@ namespace JoyD.Windows.CS _detectionZone.Y = _tempDetectionZone.Y; _detectionZone.Width = _tempDetectionZone.Width; _detectionZone.Height = _tempDetectionZone.Height; + _detectionZone.Color = _tempDetectionZone.Color; // 保存检测区颜色 // 恢复叠加层绘制,显示测温区和温差图 CreateRectangleOverlayImage();