合并lybxhm分支

DH.Commons/DetectionConfig.cs

@@ -5,6 +5,7 @@ using static OpenCvSharp.AgastFeatureDetector;
 using System.Text.RegularExpressions;
 using System.Text;
 using System.Drawing.Design;
+using AntdUI;
 
 namespace DH.Commons.Enums
 {
@@ -292,20 +293,30 @@ namespace DH.Commons.Enums
         }
        
     }
-    public class RelatedCamera 
+    public class RelatedCamera : NotifyProperty
     {
 
+        private string _cameraSourceId = "";
         [Category("关联相机")]
-        [DisplayName("关联相机")]
-        [Description("关联相机描述")]
-       
+        [DisplayName("相机源ID")]
+        [Description("关联相机的唯一标识符")]
         //[TypeConverter(typeof(CollectionCountConvert))]
-        public string CameraSourceId { get; set; } = "";
+        public string CameraSourceId
+        {
+            get { return _cameraSourceId; }
+            set
+            {
+                if (_cameraSourceId == value) return;
+                _cameraSourceId = value;
+                OnPropertyChanged(nameof(CameraSourceId));
+            }
+        }
 
         public RelatedCamera()
         {
-
         }
+
+        // 可选：添加带 Selected 的构造函数
         public RelatedCamera(string cameraSourceId)
         {
             CameraSourceId = cameraSourceId;
@@ -514,6 +525,8 @@ namespace DH.Commons.Enums
         [Description("关联相机描述")]
         //[TypeConverter(typeof(DeviceIdSelectorConverter<CameraBase>))]
        
+
+
         public List<RelatedCamera> CameraCollects { get; set; } = new List<RelatedCamera>();
 
 
@@ -615,6 +628,11 @@ namespace DH.Commons.Enums
         
         public List<DetectionFilter> DetectionFilterList { get; set; } = new List<DetectionFilter>();
 
+
+        /// <summary>
+        /// 标签集合
+        /// </summary>
+        public List<DetectionLable> DetectionLableList { get; set; } = new List<DetectionLable>();
         //[Category("深度学习配置")]
         //[DisplayName("检测配置标签")]
         //[Description("检测配置标签关联")]
@@ -643,6 +661,184 @@ namespace DH.Commons.Enums
 
         }
     }
+
+    //大改预处理类
+    /// <summary>
+    /// 预处理
+    /// </summary>
+    public class PreTreatParam : NotifyProperty
+    {
+
+
+        private bool _selected = false;
+        public bool Selected
+        {
+            get { return _selected; }
+            set
+            {
+                if (_selected == value) return;
+                _selected = value;
+                OnPropertyChanged(nameof(Selected));
+            }
+        }
+        private string _name;
+        public string Name
+        {
+            get { return _name; }
+            set
+            {
+                if (_name == value) return;
+                _name = value;
+                OnPropertyChanged(nameof(Name));
+            }
+        }
+
+
+        private string _value;
+        public string Value
+        {
+            get { return _value; }
+            set
+            {
+                if (_value == value) return;
+                _value = value;
+                OnPropertyChanged(nameof(Value));
+            }
+        }
+
+        private CellLink[] cellLinks;
+        public CellLink[] CellLinks
+        {
+            get { return cellLinks; }
+            set
+            {
+                if (cellLinks == value) return;
+                cellLinks = value;
+                OnPropertyChanged(nameof(CellLinks));
+            }
+        }
+
+
+    }
+
+
+    public class DetectionLable : NotifyProperty
+    {
+        private bool _selected = false;
+        private string _labelId;
+        private string _labelName;
+        private double _maxSource;
+        private double _minSource;
+        private double _maxArea;
+        private double _minArea;
+        private ResultState _resultState = ResultState.ResultTBD;
+
+
+
+   
+        public bool Selected
+        {
+            get { return _selected; }
+            set
+            {
+                if (_selected == value) return;
+                _selected = value;
+                OnPropertyChanged(nameof(Selected));
+            }
+        }
+
+
+        public string LabelId
+        {
+            get { return _labelId; }
+            set
+            {
+                if (_labelId == value) return;
+                _labelId = value;
+                OnPropertyChanged(nameof(LabelId));
+            }
+        }
+
+        public string LabelName
+        {
+            get { return _labelName; }
+            set
+            {
+                if (_labelName == value) return;
+                _labelName = value;
+                OnPropertyChanged(nameof(LabelName));
+            }
+        }
+
+        public double MaxSource
+        {
+            get { return _maxSource; }
+            set
+            {
+                if (_maxSource.Equals(value)) return;
+                _maxSource = value;
+                OnPropertyChanged(nameof(MaxSource));
+            }
+        }
+
+        public double MinSource
+        {
+            get { return _minSource; }
+            set
+            {
+                if (_minSource.Equals(value)) return;
+                _minSource = value;
+                OnPropertyChanged(nameof(MinSource));
+            }
+        }
+
+        public double MaxArea
+        {
+            get { return _maxArea; }
+            set
+            {
+                if (_maxArea.Equals(value)) return;
+                _maxArea = value;
+                OnPropertyChanged(nameof(MaxArea));
+            }
+        }
+
+        public double MinArea
+        {
+            get { return _minArea; }
+            set
+            {
+                if (_minArea.Equals(value)) return;
+                _minArea = value;
+                OnPropertyChanged(nameof(MinArea));
+            }
+        }
+
+        public ResultState ResultState
+        {
+            get { return _resultState; }
+            set
+            {
+                if (_resultState == value) return;
+                _resultState = value;
+                OnPropertyChanged(nameof(ResultState));
+            }
+        }
+
+        private CellLink[] cellLinks;
+        public CellLink[] CellLinks
+        {
+            get { return cellLinks; }
+            set
+            {
+                if (cellLinks == value) return;
+                cellLinks = value;
+                OnPropertyChanged(nameof(CellLinks));
+            }
+        }
+    }
+
+
     /// <summary>
     /// 识别目标定义 class：分类信息    Detection Segmentation：要识别的对象
     /// </summary>