From e54c5a471c372e314f89c340644ddda98ab063bb Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期三, 19 八月 2020 11:04:22 +0800
Subject: [PATCH] 1. 优化gts板卡回原点操作 2. 添加数据精度配置 3. 添加HalconTool异常捕捉分类和部分非空判断
---
src/Bro.M071.Process/M071Config.cs | 46 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 37 insertions(+), 9 deletions(-)
diff --git a/src/Bro.M071.Process/M071Config.cs b/src/Bro.M071.Process/M071Config.cs
index b0944f2..08a33a7 100644
--- a/src/Bro.M071.Process/M071Config.cs
+++ b/src/Bro.M071.Process/M071Config.cs
@@ -41,37 +41,55 @@
public List<KeyResult> KeyResultCollection { get; set; } = new List<KeyResult>();
#endregion
- [Category("鑳屾櫙鍥剧墖璁剧疆")]
+ [Category("鏄剧ず閰嶇疆")]
[Description("杩愯鑳屾櫙鍥剧墖璺緞")]
[Editor(typeof(FileDialogEditor), typeof(UITypeEditor))]
[DisplayName("鑳屾櫙鍥剧墖")]
public string BackgroundImagePath { get; set; }
+ [Category("鏄剧ず閰嶇疆")]
+ [Description("閿洏鍏抽敭閿綅甯冨眬鏄剧ず")]
+ [TypeConverter(typeof(CollectionCountConvert))]
+ [Editor(typeof(ComplexCollectionEditor<KeyLocation>), typeof(UITypeEditor))]
+ [DisplayName("閿綅鏄剧ず")]
+ public List<KeyLocation> KeyLocationCollection { get; set; } = new List<KeyLocation>();
+
[Category("妫�娴嬭缃�")]
[Description("鎷嶆憚鐐逛綅璁剧疆闆嗗悎")]
[TypeConverter(typeof(CollectionCountConvert))]
[Editor(typeof(ComplexCollectionEditor<SnapshotPoint>), typeof(UITypeEditor))]
- [DisplayName("鎷嶆憚鐐逛綅")]
+ [DisplayName("1.杩愬姩鐐逛綅")]
public List<SnapshotPoint> SnapshotPointCollection { get; set; } = new List<SnapshotPoint>();
[Category("妫�娴嬭缃�")]
[Description("瑙嗚妫�娴嬪崟閿厤缃泦鍚�")]
[TypeConverter(typeof(CollectionCountConvert))]
[Editor(typeof(ComplexCollectionEditor<KeyUnit>), typeof(UITypeEditor))]
- [DisplayName("鍗曢敭閰嶇疆")]
+ [DisplayName("2.鍗曢敭閰嶇疆")]
public List<KeyUnit> KeyUnitCollection { get; set; } = new List<KeyUnit>();
[Category("妫�娴嬭缃�")]
[Description("妫�娴嬮厤缃泦鍚�")]
+ [DisplayName("3.妫�娴嬮」闆嗗悎")]
[TypeConverter(typeof(CollectionCountConvert))]
[Editor(typeof(ComplexCollectionEditor<MeasurementUnit>), typeof(UITypeEditor))]
public List<MeasurementUnit> MeasurementUnitCollection { get; set; } = new List<MeasurementUnit>();
[Category("妫�娴嬭缃�")]
- [DisplayName("缁撴灉鏁版嵁淇濆瓨璺緞")]
- [Description("妫�娴嬬粨鏋滄暟鎹繚瀛樿矾寰�")]
- [Editor(typeof(FoldDialogEditor), typeof(UITypeEditor))]
- public string ResultDataSaveFolder { get; set; } = "";
+ [Description("骞抽潰琛ュ伩鍊�")]
+ [DisplayName("4.骞抽潰琛ュ伩鍊�")]
+ public double PlanCompensation { get; set; }
+
+ [Category("妫�娴嬭缃�")]
+ [Description("鏁版嵁绮惧害璁剧疆")]
+ [DisplayName("5.鏁版嵁绮惧害浣嶆暟")]
+ public int Precision { get; set; } = 3;
+
+ //[Category("妫�娴嬭缃�")]
+ //[DisplayName("缁撴灉鏁版嵁淇濆瓨璺緞")]
+ //[Description("妫�娴嬬粨鏋滄暟鎹繚瀛樿矾寰�")]
+ //[Editor(typeof(FoldDialogEditor), typeof(UITypeEditor))]
+ //public string ResultDataSaveFolder { get; set; } = "";
[Category("鍥剧墖淇濆瓨閰嶇疆")]
[Description("鍗曢敭鍥剧墖淇濆瓨閰嶇疆")]
@@ -94,13 +112,23 @@
[ReadOnly(true)]
public bool IsSafetyBeamBlocked { get; set; } = false;
+ private bool isBeepBlocked = false;
[Category("灞忚斀閰嶇疆")]
[Description("true锛氬睆钄借渹楦ｅ櫒 false锛氬惎鐢ㄨ渹楦ｅ櫒")]
- public bool IsBeepBlocked { get; set; } = false;
+ public bool IsBeepBlocked
+ {
+ get => isBeepBlocked;
+ set => Set(ref isBeepBlocked, value);
+ }
+ private bool isBarcodeManualInputBlocked = true;
[Category("灞忚斀閰嶇疆")]
[Description("true锛氱姝㈡墜鍔ㄨ緭鍏ユ潯鐮� false锛氬厑璁告墜鍔ㄨ緭鍏ユ潯鐮�")]
- public bool IsBarcodeManulInputBlocked { get; set; } = true;
+ public bool IsBarcodeManualInputBlocked
+ {
+ get => isBarcodeManualInputBlocked;
+ set => Set(ref isBarcodeManualInputBlocked, value);
+ }
[Category("MES璁剧疆")]
[Description("true锛氭暟鎹笂浼犺嚦MES false锛氭暟鎹笉涓婁紶")]
--
Gitblit v1.8.0