From 2edc3c54ba7a42d5e9bb9120b9881d418e6bd408 Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期五, 13 八月 2021 09:38:29 +0800
Subject: [PATCH] 1. GTS回原点修改，避免来回 2. 添加单键测量结果补偿 3. 部分条件限制，日志修改 4. 来料检debug，添加退出条件判断
---
src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.cs | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.cs
index d3f0c1d..6da479f 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.cs
@@ -9,6 +9,7 @@
using System.Windows.Forms;
using Bro.Common.Interface;
using Bro.Common.Base;
+using Bro.Common.Model;
namespace Bro.UI.Device.Winform
{
@@ -25,21 +26,6 @@
Device = device;
InitialLayout();
- //CvImage = new Canvas();
- //CvImage.IsShowElementList = false;
- //CvImage.IsShowROITool = false;
- //CvImage.Dock = DockStyle.Fill;
- //Controls.Add(CvImage);
- //Camera.OnImageUpdated += Camera_UpdateShowImage;
- //Camera.OnElementsUpdated += Camera_OnElementsUpdated;
- //Camera.OnCameraOpModeChanged += Camera_OnCameraOpModeChanged;
-
- //InitialToolBarVisible();
- }
-
- private void InitialLayout()
- {
-
}
public IDevice Device { get; set; }
@@ -49,10 +35,31 @@
get => Device as MotionCardBase;
}
+ //private void MotionCard_OnMonitorInvoke(DateTime arg1, string arg2, IDevice arg3, IMonitorSet arg4)
+ //{
+ // throw new NotImplementedException();
+ //}
+
+ private void InitialLayout()
+ {
+ foreach (var axisConfig in MotionCard.IConfig.AxisSettings.FindAll(u => u.IsAxisEnabled))
+ {
+ CtrlMotionCardAxisStatus ctrlMotionCardAxisStatus = new CtrlMotionCardAxisStatus(Device, axisConfig.AxisIndex, axisConfig.AxisName);
+ flowLayoutPanel1.Controls.Add(ctrlMotionCardAxisStatus);
+ }
+
+ CtrlMotionCardIOStatus ctrlMotionCardIOStatus = new CtrlMotionCardIOStatus(Device);
+ //ctrlMotionCardIOStatus.Dock = DockStyle.Fill; //flowLayoutPanel鍐呴儴鎺т欢 涓嶈dock fill
+ flowLayoutPanel2.Controls.Add(ctrlMotionCardIOStatus);
+ }
+
+
+
private void buttonMotionCardOperation_Click(object sender, EventArgs e)
{
FrmMotionCardOperationBase motionCardOperationBase = new FrmMotionCardOperationBase(Device);
motionCardOperationBase.Show();
}
+
}
}
--
Gitblit v1.8.0