From c0b8009ef36746c7a14606267662570e8c59c2c6 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期四, 09 七月 2020 19:12:37 +0800
Subject: [PATCH] 部分模型修改
---
src/Bro.M071.Process/M071Config.cs | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/src/Bro.M071.Process/M071Config.cs b/src/Bro.M071.Process/M071Config.cs
index 2cdacf0..9f8559f 100644
--- a/src/Bro.M071.Process/M071Config.cs
+++ b/src/Bro.M071.Process/M071Config.cs
@@ -1,4 +1,5 @@
-锘縰sing Bro.Common.Helper;
+锘縰sing Bro.Common.Base;
+using Bro.Common.Helper;
using Bro.Common.Model;
using Bro.Process;
using System;
@@ -43,24 +44,56 @@
[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("鍗曢敭鍥剧墖淇濆瓨閰嶇疆")]
+ [TypeConverter(typeof(ComplexObjectConvert))]
+ [Editor(typeof(PropertyObjectEditor), typeof(UITypeEditor))]
+ public ImageSaveOption ImageSaveOption { get; set; } = new ImageSaveOption();
+
+ [Category("鍥剧墖淇濆瓨閰嶇疆")]
+ [Description("鍗曢敭鍥剧墖淇濆瓨鐩綍璺緞")]
+ [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锛氬睆钄借渹楦ｅ櫒 false锛氬惎鐢ㄨ渹楦ｅ櫒")]
+ public bool IsBeepBlocked { get; set; } = false;
+
+ [Category("灞忚斀閰嶇疆")]
+ [Description("true锛氱姝㈡墜鍔ㄨ緭鍏ユ潯鐮� false锛氬厑璁告墜鍔ㄨ緭鍏ユ潯鐮�")]
+ public bool IsBarcodeManulInputBlocked { get; set; } = true;
}
}
--
Gitblit v1.8.0