From 00ea1cd461d6d8d128d727f6a40edca75da9ccdd Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期三, 08 七月 2020 16:38:46 +0800
Subject: [PATCH] 相机运行界面基类添加操作配置 gocator驱动修正长宽比例，输出进行复制插值处理 显示基元添加8个方向的拉伸和移动处理 标签基元实现3个方向的拉伸和移动

---
 src/Bro.Common.Device/DeviceBase/MotionCardBase.cs |   59 +++++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs b/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs
index e42e318..e826d28 100644
--- a/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs
+++ b/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs
@@ -47,9 +47,17 @@
             }
         }
 
+        /// <summary>
+        /// IO鐨勭洃鍚��
+        /// </summary>
         public List<IOItem> MonitorValues { get; set; } = new List<IOItem>();
 
-        public abstract void WriteOutput(short cardNum, short index, IOValue value);
+        /// <summary>
+        /// 杞寸殑杩愬姩鐘舵�佸��
+        /// </summary>
+        public List<AxisMovingStatus> AxisMovingOptionValues { get; set; } = new List<AxisMovingStatus>();
+
+        public abstract void WriteOutput(short index, IOValue value);     
     }
 
     public class MotionCardInitialConfigBase : InitialConfigBase, IMonitorConfig
@@ -138,7 +146,7 @@
         [Category("鏉垮崱鎿嶄綔")]
         [Description("鏉垮崱鎿嶄綔閰嶇疆鍩虹被闆嗗悎锛屼緷娆℃墽琛�")]
         [TypeConverter(typeof(CollectionCountConvert))]
-        [Editor(typeof(ComplexCollectionEditor<MotionCardOperationConfigBase>), typeof(UITypeEditor))]
+        [Editor(typeof(ComplexCollectionEditor<MotionCardOperationSet>), typeof(UITypeEditor))]
         public List<MotionCardOperationSet> OperationCollection { get; set; } = new List<MotionCardOperationSet>();
 
         public string GetDisplayText()
@@ -147,7 +155,8 @@
         }
     }
 
-    public class MotionCardOperationSet : IComplexDisplay
+    [Device("MotionOperationSet", "杩愬姩鎿嶄綔閰嶇疆鍩虹被", EnumHelper.DeviceAttributeType.OperationConfig)]
+    public class MotionCardOperationSet :  IComplexDisplay
     {
         [Category("IO鎿嶄綔閰嶇疆")]
         [DisplayName("IO棰勬鏌ュ畾涔夐泦鍚�")]
@@ -155,6 +164,7 @@
         [TypeConverter(typeof(CollectionCountConvert))]
         [Editor(typeof(IORefrenceItemCollectionEditor), typeof(UITypeEditor))]
         public List<IORefrenceItem> PreCheckIOCollection { get; set; } = new List<IORefrenceItem>();
+
         [Category("IO鎿嶄綔閰嶇疆")]
         [Description("瓒呮椂璁剧疆锛屽崟浣嶏細ms")]
         [DisplayName("IO棰勬鏌ヨ秴鏃�")]
@@ -176,12 +186,18 @@
         [DisplayName("IO纭瓒呮椂")]
         public int IOConfirmTimeout { get; set; } = 0;
 
+        //[Category("鏉垮崱杩愬姩閰嶇疆")]
+        //[DisplayName("杩愬姩閰嶇疆闆嗗悎")]
+        //[Description("MovingOps锛氳繍鍔ㄩ厤缃泦鍚�")]
+        //[TypeConverter(typeof(CollectionCountConvert))]
+        //[Editor(typeof(ComplexCollectionEditor<MovingOption>), typeof(UITypeEditor))]
+        //public List<MovingOption> MovingOps { get; set; } = new List<MovingOption>();
         [Category("鏉垮崱杩愬姩閰嶇疆")]
         [DisplayName("杩愬姩閰嶇疆闆嗗悎")]
         [Description("MovingOps锛氳繍鍔ㄩ厤缃泦鍚�")]
-        [TypeConverter(typeof(CollectionCountConvert))]
-        [Editor(typeof(ComplexCollectionEditor<MovingOption>), typeof(UITypeEditor))]
-        public List<MovingOption> MovingOps { get; set; } = new List<MovingOption>();
+        [TypeConverter(typeof(ComplexObjectConvert))]
+        [Editor(typeof(PropertyObjectEditor),typeof(UITypeEditor))]
+        public MotionOperationCollection MotionOperationCollection { get; set; } = new MotionOperationCollection();
 
 
         public string GetDisplayText()
@@ -216,19 +232,34 @@
             }
 
             string moving = "";
-            MovingOps.ForEach(i =>
-            {
-                moving += i.GetDisplayText() + " ";
-            });
-            if (moving != "")
-            {
-                moving = " 杩愬姩锛�" + moving;
-            }
+            //MovingOps.ForEach(i =>
+            //{
+            //    moving += i.GetDisplayText() + " ";
+            //});
+            //if (moving != "")
+            //{
+            //    moving = " 杩愬姩锛�" + moving;
+            //}
 
             return (preCheck + output + confirm + moving).Trim();
         }
     }
 
+    public class MotionOperationCollection : OperationConfigBase, IComplexDisplay
+    {
+        [Category("杩愬姩閰嶇疆")]
+        [DisplayName("杩愬姩閰嶇疆闆嗗悎")]
+        [Description("MovingOps锛氳繍鍔ㄩ厤缃泦鍚�")]
+        [TypeConverter(typeof(CollectionCountConvert))]
+        [Editor(typeof(ComplexCollectionEditor<MovingOption>), typeof(UITypeEditor))]
+        public List<MovingOption> MovingOps { get; set; } = new List<MovingOption>();
+
+        public string GetDisplayText()
+        {
+            return $"{string.Join(" ", MovingOps.Select(u => u.GetDisplayText()))}";
+        }
+    }
+
     //[Device("MotionCardOperationConfigCollection", "鏉垮崱鎿嶄綔閰嶇疆鍩虹被闆嗗悎", EnumHelper.DeviceAttributeType.OperationConfig)]
     //public class MotionCardOperationConfigCollection : OperationConfigBase
     //{

--
Gitblit v1.8.0