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/CtrlCalib9PDynamic.cs | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/A032.Process/Calibration/CtrlCalib9PDynamic.cs b/src/A032.Process/Calibration/CtrlCalib9PDynamic.cs
index 1cce895..3edee32 100644
--- a/src/A032.Process/Calibration/CtrlCalib9PDynamic.cs
+++ b/src/A032.Process/Calibration/CtrlCalib9PDynamic.cs
@@ -30,7 +30,7 @@
InitializeComponent();
}
- public CtrlCalib9PDynamic(ProcessControl process, CalibrationConfigCollection calibConfig, AGVBindUnit bind, PathPosition position, Action<AGVBindUnit, int, int> commuAction, Action<CalibrationConfigCollection, AGVBindUnit, PathPosition> finalCalculation)
+ public CtrlCalib9PDynamic(ProcessControl process, CalibrationConfigCollection calibConfig, AGVBindUnit bind, PathPosition position, Action<CalibrationConfigCollection, AGVBindUnit, PathPosition> finalCalculation)
{
InitializeComponent();
@@ -42,7 +42,6 @@
Bind = bind;
Position = position;
- CommuAction = commuAction;
FinalCalculation = finalCalculation;
}
@@ -161,7 +160,8 @@
_canvas.LoadImage(Config.Configs[index].Image);
_canvas.Elements.Clear();
- CrossHair ch = new CrossHair(new CalibrationPoint(Config.Configs[index].ImageMarkPoint, Config.Configs[index].CurrentPlatPoint));
+ var config = Config.Configs[index];
+ CrossHair ch = new CrossHair(new CalibrationPoint(new CustomizedPoint(config.ImageMarkPoint.X, config.ImageMarkPoint.Y), new CustomizedPoint(config.PlatPoint.X, config.PlatPoint.Y)));
_canvas.Elements.Add(ch);
tsslInfo.Text = $"姝ラ{index + 1}瀹屾垚";
@@ -191,7 +191,9 @@
{
_canvas.LoadImage(stepConfig.Image);
_canvas.Elements.Clear();
- _canvas.Elements.Add(new CrossHair(new CalibrationPoint(stepConfig.ImageMarkPoint, stepConfig.CurrentPlatPoint)));
+
+ CrossHair ch = new CrossHair(new CalibrationPoint(new CustomizedPoint(stepConfig.ImageMarkPoint.X, stepConfig.ImageMarkPoint.Y), new CustomizedPoint(stepConfig.PlatPoint.X, stepConfig.PlatPoint.Y)));
+ _canvas.Elements.Add(ch);
}
}
@@ -206,7 +208,7 @@
// //ProcessControl.SendCalibStartSignal(Config.TriggerAddress);
//}
- ProcessControl.MultipleStepsProcess(Config, Bind, CommuAction);
+ ProcessControl.MultipleStepsProcess(Config, Bind);
}
private void btnLoadOfflineImages_Click(object sender, EventArgs e)
@@ -236,7 +238,7 @@
//tsslInfo.Text = $"鍗曟杩愮畻瀹屾垚銆傛爣璁扮偣鍧愭爣锛歿config.ImageMarkPoint.X},{config.ImageMarkPoint.Y}";
- ProcessControl.SingleStepProcess(config, CommuAction, Bind, Position.PositionNo, _selectedStepIndex);
+ ProcessControl.SingleStepProcess(config, Bind, _selectedStepIndex);
tsslInfo.Text = $"鍗曟杩愮畻瀹屾垚銆傛爣璁扮偣鍧愭爣锛歿config.ImageMarkPoint.X},{config.ImageMarkPoint.Y}";
}
--
Gitblit v1.8.0