From b0a4c47dd74bc41c5df3bab6ddd8de7bcc6a52b0 Mon Sep 17 00:00:00 2001
From: patrick <patrick.xu@broconcentric.com>
Date: 星期五, 06 十二月 2019 18:35:42 +0800
Subject: [PATCH] 1. 重新整理项目，按照A034模式，将设备异步操作修改为类同步操作。使用任务队列来存储和分配任务。
---
src/A032.Process/Calibration/CalibrationConfig.cs | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/A032.Process/Calibration/CalibrationConfig.cs b/src/A032.Process/Calibration/CalibrationConfig.cs
index 1b8f099..1c02514 100644
--- a/src/A032.Process/Calibration/CalibrationConfig.cs
+++ b/src/A032.Process/Calibration/CalibrationConfig.cs
@@ -19,8 +19,8 @@
{
[Category("鍏宠仈閰嶇疆")]
[Description("浣嶇疆搴忓彿")]
- [TypeConverter(typeof(PositionNoConverter))]
- public int PositionNo { get; set; }
+ [TypeConverter(typeof(PositionCodeConverter))]
+ public string PositionCode { get; set; }
[Category("鍏宠仈閰嶇疆")]
[Description("閫傜敤鐩告満缂栧彿")]
@@ -39,7 +39,7 @@
public string GetDisplayText()
{
- return $"PositionNo:{PositionNo}; Configs:{Configs.Count}";
+ return $"PositionNo:{PositionCode}; Configs:{Configs.Count}";
}
public List<string> GetHalconToolPathList()
@@ -86,11 +86,17 @@
[Editor(typeof(PropertyObjectEditor), typeof(UITypeEditor))]
public HalconRelatedCameraOprerationConfigBase CameraOpConfig { get; set; } = new HalconRelatedCameraOprerationConfigBase();
+ //[Category("杩愬姩骞冲彴璁剧疆")]
+ //[Description("骞冲彴褰撳墠鍧愭爣")]
+ //[TypeConverter(typeof(ComplexObjectConvert))]
+ //[Editor(typeof(PropertyObjectEditor), typeof(UITypeEditor))]
+ //public CustomizedPoint CurrentPlatPoint { get; set; } = new CustomizedPoint();
+
[Category("杩愬姩骞冲彴璁剧疆")]
- [Description("骞冲彴褰撳墠鍧愭爣")]
+ [Description("鏈哄櫒浜鸿繍鍔ㄥ潗鏍�")]
[TypeConverter(typeof(ComplexObjectConvert))]
[Editor(typeof(PropertyObjectEditor), typeof(UITypeEditor))]
- public CustomizedPoint CurrentPlatPoint { get; set; } = new CustomizedPoint();
+ public RobotPoint PlatPoint { get; set; } = new RobotPoint();
public event PropertyChangedEventHandler PropertyChanged;
--
Gitblit v1.8.0