1. 重构项目

patrick

2019-12-10 1c4426810c71eead57084be8a18ade8d314dd8c4

 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}";
        }