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.M071.Process/M071Config.cs |   27 ++++++++++++++++++++++++---
 1 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/Bro.M071.Process/M071Config.cs b/src/Bro.M071.Process/M071Config.cs
index b3ae3f3..9f8559f 100644
--- a/src/Bro.M071.Process/M071Config.cs
+++ b/src/Bro.M071.Process/M071Config.cs
@@ -44,25 +44,28 @@
         [Category("鑳屾櫙鍥剧墖璁剧疆")]
         [Description("杩愯鑳屾櫙鍥剧墖璺緞")]
         [Editor(typeof(FileDialogEditor), typeof(UITypeEditor))]
+        [DisplayName("鑳屾櫙鍥剧墖")]
         public string BackgroundImagePath { get; set; }
 
         [Category("妫�娴嬭缃�")]
         [Description("鎷嶆憚鐐逛綅璁剧疆闆嗗悎")]
         [TypeConverter(typeof(CollectionCountConvert))]
         [Editor(typeof(ComplexCollectionEditor<SnapshotPoint>), typeof(UITypeEditor))]
+        [DisplayName("鎷嶆憚鐐逛綅")]
         public List<SnapshotPoint> SnapshotPointCollection { get; set; } = new List<SnapshotPoint>();
 
         [Category("妫�娴嬭缃�")]
         [Description("瑙嗚妫�娴嬪崟閿厤缃泦鍚�")]
         [TypeConverter(typeof(CollectionCountConvert))]
         [Editor(typeof(ComplexCollectionEditor<KeyUnit>), typeof(UITypeEditor))]
+        [DisplayName("鍗曢敭閰嶇疆")]
         public List<KeyUnit> KeyUnitCollection { get; set; } = new List<KeyUnit>();
 
         [Category("妫�娴嬭缃�")]
         [Description("妫�娴嬮厤缃泦鍚�")]
         [TypeConverter(typeof(CollectionCountConvert))]
-        [Editor(typeof(ComplexCollectionEditor<MeasurementUint>), typeof(UITypeEditor))]
-        public List<MeasurementUint> MeasurementUnitCollection { get; set; } = new List<MeasurementUint>();
+        [Editor(typeof(ComplexCollectionEditor<MeasurementUnit>), typeof(UITypeEditor))]
+        public List<MeasurementUnit> MeasurementUnitCollection { get; set; } = new List<MeasurementUnit>();
 
         [Category("鍥剧墖淇濆瓨閰嶇疆")]
         [Description("鍗曢敭鍥剧墖淇濆瓨閰嶇疆")]
@@ -72,7 +75,25 @@
 
         [Category("鍥剧墖淇濆瓨閰嶇疆")]
         [Description("鍗曢敭鍥剧墖淇濆瓨鐩綍璺緞")]
-        [Editor(typeof(FoldDialogEditor),typeof(UITypeEditor))]
+        [Editor(typeof(FoldDialogEditor), typeof(UITypeEditor))]
         public string ImageSaveFolder { get; set; } = "";
+
+        [Category("灞忚斀閰嶇疆")]
+        [Description("true锛氬睆钄藉畨鍏ㄩ棬 false锛氬惎鐢ㄥ畨鍏ㄩ棬")]
+        [ReadOnly(true)]
+        public bool IsSafetyDoorBlocked { get; set; } = false;
+
+        [Category("灞忚斀閰嶇疆")]
+        [Description("true锛氬睆钄藉畨鍏ㄥ厜绾� false锛氬惎鐢ㄥ畨鍏ㄥ厜绾�")]
+        [ReadOnly(true)]
+        public bool IsSafetyBeamBlocked { get; set; } = false;
+
+        [Category("灞忚斀閰嶇疆")]
+        [Description("true锛氬睆钄借渹楦e櫒 false锛氬惎鐢ㄨ渹楦e櫒")]
+        public bool IsBeepBlocked { get; set; } = false;
+
+        [Category("灞忚斀閰嶇疆")]
+        [Description("true锛氱姝㈡墜鍔ㄨ緭鍏ユ潯鐮� false锛氬厑璁告墜鍔ㄨ緭鍏ユ潯鐮�")]
+        public bool IsBarcodeManulInputBlocked { get; set; } = true;
     }
 }

--
Gitblit v1.8.0