From 8cbf4a6b9f334246d88c8101ae3db9a21f1bab3f Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期三, 28 四月 2021 11:40:08 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.M071.Process/M071Config.cs | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/src/Bro.M071.Process/M071Config.cs b/src/Bro.M071.Process/M071Config.cs
index 99f9cdc..34346d5 100644
--- a/src/Bro.M071.Process/M071Config.cs
+++ b/src/Bro.M071.Process/M071Config.cs
@@ -42,6 +42,11 @@
public List<KeyResult> KeyResultCollection { get; set; } = new List<KeyResult>();
#endregion
+ [Category("绂荤嚎娴嬭瘯妯″紡")]
+ [Description("true锛氳澶囩绾挎ā寮� false锛氳澶囪繛绾挎ā寮�")]
+ [DisplayName("绂荤嚎妯″紡")]
+ public bool IsOfflineMode { get; set; } = false;
+
[Category("鏄剧ず閰嶇疆")]
[Description("杩愯鑳屾櫙鍥剧墖璺緞")]
[Editor(typeof(FileDialogEditor), typeof(UITypeEditor))]
@@ -175,6 +180,11 @@
[Editor(typeof(ComplexCollectionEditor<KeyCodeMap>), typeof(UITypeEditor))]
public List<KeyCodeMap> KeyCodeMappingCollection { get; set; } = new List<KeyCodeMap>();
+ [Category("MES璁剧疆")]
+ [Description("MES鏁版嵁璇︾粏璁板綍寮�鍏�")]
+ [DisplayName("MES鏃ュ織寮�鍏�")]
+ public bool IsEnableMESLog { get; set; } = false;
+
[Category("澶嶄綅璁剧疆")]
[Description("澶у浣嶉渶瑕佷俊鍙锋寔缁椂闂达紝澶嶄綅淇″彿鎸佺画瓒呭嚭璇ユ椂闂存墽琛屽ぇ澶嶄綅锛屽崟浣嶏細s")]
[DisplayName("澶у浣嶆寔缁俊鍙烽暱搴�")]
@@ -196,6 +206,14 @@
}
}
+ [Device("ManualTest", "鎵嬪姩娴嬭瘯鎿嶄綔閰嶇疆", EnumHelper.DeviceAttributeType.OperationConfig)]
+ public class ManualTestOperationConfig : OperationConfigBase
+ {
+ [Category("鎵嬪姩娴嬭瘯閰嶇疆")]
+ [Description("鎵嬪姩娴嬭瘯閲嶅娆℃暟")]
+ public int RepeatTimes { get; set; } = 1;
+ }
+
public class OperationCombination : IComplexDisplay, IHalconToolPath
{
[Category("杩愬姩鏈烘瀯閰嶇疆")]
--
Gitblit v1.8.0