From 642cd31f0d1586a2a5ca6f9a3b3364725f4f1ecd Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期六, 04 七月 2020 13:44:24 +0800
Subject: [PATCH] 暂存
---
src/Bro.M071.Process/M071Models.cs | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/src/Bro.M071.Process/M071Models.cs b/src/Bro.M071.Process/M071Models.cs
index d9a40ac..a5c4137 100644
--- a/src/Bro.M071.Process/M071Models.cs
+++ b/src/Bro.M071.Process/M071Models.cs
@@ -75,7 +75,7 @@
{
public string GetDisplayText()
{
- return (IsEnabled ? "" : "绂佺敤 ") + Name + " " + string.Join(" ", Destination.Select(u => u.GetDisplayText())) + " " + CameraOp.GetDisplayText();
+ return (IsEnabled ? "" : "绂佺敤 ") + Name + " " + MotionOp.GetDisplayText() + " " + CameraOp.GetDisplayText();
}
public List<string> GetHalconToolPathList()
@@ -101,16 +101,22 @@
[Description("true锛氬惎鐢� false锛氱鐢�")]
public bool IsEnabled { get; set; } = true;
- [Category("璁惧閰嶇疆")]
- [Description("杩愬姩璁惧")]
- [TypeConverter(typeof(DeviceSelectorConverter<IMotion>))]
- public string MotionDevice { get; set; }
+ //[Category("璁惧閰嶇疆")]
+ //[Description("杩愬姩璁惧")]
+ //[TypeConverter(typeof(DeviceSelectorConverter<IMotion>))]
+ //public string MotionDevice { get; set; }
- [Category("杩愬姩鐐逛綅")]
- [Description("杩愬姩鐐逛綅")]
+ //[Category("杩愬姩鐐逛綅")]
+ //[Description("杩愬姩鐐逛綅")]
+ //[TypeConverter(typeof(ComplexObjectConvert))]
+ //[Editor(typeof(ComplexCollectionEditor<AxisInfo>), typeof(UITypeEditor))]
+ //public List<AxisInfo> Destination { get; set; } = new List<AxisInfo>();
+
+ [Category("杩愬姩鏈烘瀯閰嶇疆")]
+ [Description("杩愬姩鏈烘瀯閰嶇疆")]
[TypeConverter(typeof(ComplexObjectConvert))]
- [Editor(typeof(ComplexCollectionEditor<AxisInfo>), typeof(UITypeEditor))]
- public List<AxisInfo> Destination { get; set; } = new List<AxisInfo>();
+ [Editor(typeof(IOperationConfigByDeviceEditor), typeof(UITypeEditor))]
+ public DeviceOpBind MotionOp { get; set; } = new DeviceOpBind();
[Category("鐩告満鍜屾搷浣滈厤缃�")]
[Description("鐩告満鍜屾搷浣滈厤缃�")]
@@ -277,7 +283,7 @@
{
if (string.IsNullOrWhiteSpace(Name))
{
- return (IsEnabled ? "" : "绂佺敤 ") + string.Join("-", KeyUnitCollection.Select(u => u.GetDisplayText())) + "-" + MeasureType.ToString();
+ return (IsEnabled ? "" : "绂佺敤 ") + string.Join("-", KeyUnitCollection.Select(u => u.GetDisplayText())) + "-" + MeasureType?.ToString();
}
else
{
@@ -306,7 +312,7 @@
[Category("鍗曢敭閰嶇疆")]
[Description("鍗曢敭缁撴灉閰嶇疆")]
[TypeConverter(typeof(KeyUnitResultConverter))]
- public string KeyResult { get; set; } = "";
+ public string KeyResultId { get; set; } = "";
public List<HImage> KeyImages = new List<HImage>();
@@ -336,7 +342,7 @@
{
string msg = Key;
- msg += string.IsNullOrWhiteSpace(KeyResult) ? "" : $"-{KeyResult}";
+ msg += string.IsNullOrWhiteSpace(KeyResultId) ? "" : $"-{KeyResultId}";
return msg;
}
--
Gitblit v1.8.0