From 1c4426810c71eead57084be8a18ade8d314dd8c4 Mon Sep 17 00:00:00 2001
From: patrick <patrick.xu@broconcentric.com>
Date: 星期二, 10 十二月 2019 14:24:31 +0800
Subject: [PATCH] 1. 重构项目

---
 src/A032.Process/Calibration/CtrlCalib9PDynamic.cs |   58 +++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/src/A032.Process/Calibration/CtrlCalib9PDynamic.cs b/src/A032.Process/Calibration/CtrlCalib9PDynamic.cs
index dcf6c73..3edee32 100644
--- a/src/A032.Process/Calibration/CtrlCalib9PDynamic.cs
+++ b/src/A032.Process/Calibration/CtrlCalib9PDynamic.cs
@@ -20,7 +20,7 @@
 namespace A032.Process.Calibration
 {
     [Device("Calibration_9P_Dynamic", "鍔ㄦ��9鐐规爣瀹�", EnumHelper.DeviceAttributeType.OperationConfigCtrl)]
-    public partial class CtrlCalib9PDynamic : UserControl, IConfigCtrl<CameraBase, CalibrationConfigCollection>
+    public partial class CtrlCalib9PDynamic : UserControl//, IConfigCtrl<CameraBase, CalibrationConfigCollection>
     {
         PubSubCenter PubSubCenter = PubSubCenter.GetInstance();
         AutoResetEvent _confirmHandle = new AutoResetEvent(false);
@@ -30,20 +30,28 @@
             InitializeComponent();
         }
 
-        public CtrlCalib9PDynamic(ProcessControl process, IDevice device, IOperationConfig config, Action<List<CalibrationConfig>> finalCalculation)
+        public CtrlCalib9PDynamic(ProcessControl process, CalibrationConfigCollection calibConfig, AGVBindUnit bind, PathPosition position, Action<CalibrationConfigCollection, AGVBindUnit, PathPosition> finalCalculation)
         {
             InitializeComponent();
 
             ProcessControl = process;
-            Camera = device as CameraBase;
-            Config = config as CalibrationConfigCollection;
+
+            Config = calibConfig as CalibrationConfigCollection;
+
+            Camera = bind.Camera as CameraBase;
+
+            Bind = bind;
+            Position = position;
             FinalCalculation = finalCalculation;
         }
 
-        public CalibrationConfigCollection Config { get; set; }
-        public CameraBase Camera { get; set; }
-        public ProcessControl ProcessControl { get; set; }
-        public Action<List<CalibrationConfig>> FinalCalculation { get; set; }
+        AGVBindUnit Bind { get; set; }
+        PathPosition Position { get; set; }
+        Action<AGVBindUnit, int, int> CommuAction;
+        CalibrationConfigCollection Config { get; set; }
+        CameraBase Camera { get; set; }
+        ProcessControl ProcessControl { get; set; }
+        Action<CalibrationConfigCollection, AGVBindUnit, PathPosition> FinalCalculation { get; set; }
 
         public CalibrationConfigCollection GetConfig()
         {
@@ -152,14 +160,15 @@
 
             _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}瀹屾垚";
 
             if (chkManualConfirm.Checked)
             {
-                this.Invoke(new Action(() => btnContinueCalib.Visible = true));                ;
+                this.Invoke(new Action(() => btnContinueCalib.Visible = true)); ;
                 _confirmHandle.WaitOne();
             }
 
@@ -182,20 +191,24 @@
             {
                 _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);
             }
         }
 
         private void btnStartCalib_Click(object sender, EventArgs e)
         {
-            if (chkOfflineCalib.Checked)
-            {
-                //ProcessControl.Calibration_Pick_9P_Dynamic_Offline(Config.Configs);
-            }
-            else
-            {
-                //ProcessControl.SendCalibStartSignal(Config.TriggerAddress);
-            }
+            //if (chkOfflineCalib.Checked)
+            //{
+            //    //ProcessControl.Calibration_Pick_9P_Dynamic_Offline(Config.Configs);
+            //}
+            //else
+            //{
+            //    //ProcessControl.SendCalibStartSignal(Config.TriggerAddress);
+            //}
+
+            ProcessControl.MultipleStepsProcess(Config, Bind);
         }
 
         private void btnLoadOfflineImages_Click(object sender, EventArgs e)
@@ -213,7 +226,7 @@
 
         private void btnStepRun_Click(object sender, EventArgs e)
         {
-            //CalibrationConfig config = propGridConfig.SelectedObject as CalibrationConfig;
+            CalibrationConfig config = propGridConfig.SelectedObject as CalibrationConfig;
             //if (!chkOfflineRun.Checked)
             //{
             //    ProcessControl.CalibMarkPoint(Camera, config, _selectedStepIndex + 1);
@@ -224,11 +237,14 @@
             //}
 
             //tsslInfo.Text = $"鍗曟杩愮畻瀹屾垚銆傛爣璁扮偣鍧愭爣锛歿config.ImageMarkPoint.X},{config.ImageMarkPoint.Y}";
+
+            ProcessControl.SingleStepProcess(config, Bind, _selectedStepIndex);
+            tsslInfo.Text = $"鍗曟杩愮畻瀹屾垚銆傛爣璁扮偣鍧愭爣锛歿config.ImageMarkPoint.X},{config.ImageMarkPoint.Y}";
         }
 
         private void btnCalcuMatrix_Click(object sender, EventArgs e)
         {
-            FinalCalculation.Invoke(Config.Configs);
+            FinalCalculation.Invoke(Config, Bind, Position);
         }
 
         private void btnSnap_Click(object sender, EventArgs e)

--
Gitblit v1.8.0