From 6428fad15dbe79e30a48ffc9aabe31e03a45426c Mon Sep 17 00:00:00 2001
From: patrick <patrick.xu@broconcentric.com>
Date: 星期四, 05 十二月 2019 12:50:13 +0800
Subject: [PATCH] 1. 添加部分log信息 2. 修改部分机器人动作流程 3. 开放OperationConfig的InputData参数
---
src/A032.Process/Calibration/CalibrationConfig.cs | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/src/A032.Process/Calibration/CalibrationConfig.cs b/src/A032.Process/Calibration/CalibrationConfig.cs
index 8c0d7fe..1b8f099 100644
--- a/src/A032.Process/Calibration/CalibrationConfig.cs
+++ b/src/A032.Process/Calibration/CalibrationConfig.cs
@@ -1,6 +1,7 @@
锘縰sing Bro.Common.Base;
using Bro.Common.Helper;
using Bro.Common.Model;
+using Bro.Common.Model.Interface;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
@@ -14,12 +15,12 @@
namespace A032.Process.Calibration
{
[Device("CalibrationCollection", "澶氭鏍囧畾閰嶇疆", EnumHelper.DeviceAttributeType.OperationConfig)]
- public class CalibrationConfigCollection : OperationConfigBase
+ public class CalibrationConfigCollection : OperationConfigBase, IComplexDisplay,IHalconToolPath
{
[Category("鍏宠仈閰嶇疆")]
- [Description("浣嶇疆浠ｇ爜")]
- [TypeConverter(typeof(PositionCodeConverter))]
- public string PositionCode { get; set; }
+ [Description("浣嶇疆搴忓彿")]
+ [TypeConverter(typeof(PositionNoConverter))]
+ public int PositionNo { get; set; }
[Category("鍏宠仈閰嶇疆")]
[Description("閫傜敤鐩告満缂栧彿")]
@@ -31,10 +32,24 @@
[TypeConverter(typeof(CollectionCountConvert))]
[Editor(typeof(ComplexCollectionEditor<CalibrationConfig>), typeof(UITypeEditor))]
public List<CalibrationConfig> Configs { get; set; } = new List<CalibrationConfig>();
+
+ [Category("鏄剧ず閰嶇疆")]
+ [Description("鏄惁鏄剧ずUI锛屼粠UI鍚姩鏍囧畾")]
+ public bool IsStartedFromUI { get; set; } = false;
+
+ public string GetDisplayText()
+ {
+ return $"PositionNo:{PositionNo}; Configs:{Configs.Count}";
+ }
+
+ public List<string> GetHalconToolPathList()
+ {
+ return Configs.SelectMany(c => c.GetHalconToolPathList()).ToList();
+ }
}
//[Device("Calibration", "鍗曟鏍囧畾閰嶇疆", EnumHelper.DeviceAttributeType.OperationConfig)]
- public class CalibrationConfig : OperationConfigBase, IComplexDisplay, INotifyPropertyChanged
+ public class CalibrationConfig : OperationConfigBase, IComplexDisplay, INotifyPropertyChanged, IHalconToolPath
{
private Bitmap image = null;
[JsonIgnore]
@@ -63,7 +78,7 @@
[Description("鍥惧儚鏍囧噯鐐瑰潗鏍�")]
[TypeConverter(typeof(ComplexObjectConvert))]
[Editor(typeof(PropertyObjectEditor), typeof(UITypeEditor))]
- public CustomizedPoint ImageMarkPoint { get; set; } = new CustomizedPoint();
+ public CustomizedPointWithAngle ImageMarkPoint { get; set; } = new CustomizedPointWithAngle();
[Category("鐩告満閰嶇疆")]
[Description("鐩告満鎿嶄綔閰嶇疆")]
@@ -83,5 +98,10 @@
{
return JsonConvert.SerializeObject(this);
}
+
+ public List<string> GetHalconToolPathList()
+ {
+ return CameraOpConfig.GetHalconToolPathList();
+ }
}
}
--
Gitblit v1.8.0