From 7971d855ba2cf9772b46a7f67e2b669c0afcb91b Mon Sep 17 00:00:00 2001
From: patrick <patrick.xu@broconcentric.com>
Date: 星期二, 22 十月 2019 11:30:35 +0800
Subject: [PATCH] 1. 添加标定操作及界面 2. 修改配置界面方法调用参数 3. SeerAGV添加电池信息监听 4. 添加AGV电池充电操作 5. 修改AGV状态变化操作，添加操作锁
---
src/A032.Process/Calibration/FrmCalib9PDynamic.cs | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/src/A032.Process/Calibration/FrmCalib9PDynamic.cs b/src/A032.Process/Calibration/FrmCalib9PDynamic.cs
index e780681..5fe5c52 100644
--- a/src/A032.Process/Calibration/FrmCalib9PDynamic.cs
+++ b/src/A032.Process/Calibration/FrmCalib9PDynamic.cs
@@ -16,25 +16,49 @@
{
public partial class FrmCalib9PDynamic : Form
{
+ //private CalibrationConfigCollection calibConfig;
+ //private AGVBindUnit bind;
+ //private PathPosition position;
+ //private Action<AGVBindUnit, int, int> sendMessageToRobot_Calibration;
+ //private Action<CalibrationConfigCollection, AGVBindUnit, PathPosition> calculateMatrix;
+
public FrmCalib9PDynamic()
{
InitializeComponent();
}
- public FrmCalib9PDynamic(ProcessControl process, IDevice device, IOperationConfig config, Action<List<CalibrationConfig>> finalCalculation)
+ //public FrmCalib9PDynamic(ProcessControl process, IDevice device, IOperationConfig config, Action<List<CalibrationConfig>> finalCalculation)
+ //{
+ // InitializeComponent();
+
+ // Device = device as CameraBase;
+ // Config = config as CalibrationConfigCollection;
+ // FinalCalculation = finalCalculation;
+ // CtrlCalib9PDynamic = new CtrlCalib9PDynamic(process, device, config, finalCalculation);
+ //}
+
+ public FrmCalib9PDynamic(ProcessControl process, CalibrationConfigCollection calibConfig, AGVBindUnit bind, PathPosition position, Action<AGVBindUnit, int, int> commuAction, Action<CalibrationConfigCollection, AGVBindUnit, PathPosition> finalCalculation)
{
InitializeComponent();
- Device = device as CameraBase;
- Config = config as CalibrationConfigCollection;
- FinalCalculation = finalCalculation;
- CtrlCalib9PDynamic = new CtrlCalib9PDynamic(process, device, config, finalCalculation);
+ //Config = calibConfig;
+ //Bind = bind;
+ //Camera = Bind.Camera;
+ //Position = position;
+ //CommuAction = commuAction;
+ //FinalCalculation = finalCalculation;
+
+ CtrlCalib9PDynamic = new CtrlCalib9PDynamic(process, calibConfig, bind, position, commuAction, finalCalculation);
}
- CameraBase Device { get; set; }
- CalibrationConfigCollection Config { get; set; }
+ //AGVBindUnit Bind { get; set; }
+ //CameraBase Camera { get; set; }
+ //CalibrationConfigCollection Config { get; set; }
+ //PathPosition Position { get; set; }
+ //Action<AGVBindUnit, int, int> CommuAction;
+ //Action<CalibrationConfigCollection, AGVBindUnit, PathPosition> FinalCalculation { get; set; }
+
CtrlCalib9PDynamic CtrlCalib9PDynamic { get; set; }
- Action<List<CalibrationConfig>> FinalCalculation { get; set; }
private void FrmCalib9PDynamic_Load(object sender, EventArgs e)
{
--
Gitblit v1.8.0