From 1f2fa3f54d4a7b5a2f601c4c947a06476342e3bd Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期五, 22 一月 2021 09:23:06 +0800
Subject: [PATCH] 1. gocator驱动将system.stop移到system.ReceiveData之后 2. 修改测量完成后状态切换逻辑，避免安全光线等干扰 3. 添加设备异常输出日志记录 4. 产品结果输出时做硬盘文件记录
---
src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.cs | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.cs
index 05b0341..6da479f 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.cs
@@ -35,28 +35,21 @@
get => Device as MotionCardBase;
}
- private void MotionCard_OnMonitorInvoke(DateTime arg1, string arg2, IDevice arg3, IMonitorSet arg4)
- {
- throw new NotImplementedException();
- }
+ //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))
{
- var axisMovingStatus = MotionCard.AxisMovingOptionValues.FirstOrDefault(u => u.AxisIndex == axisConfig.AxisIndex);
- if (axisMovingStatus == null)
- {
- axisMovingStatus = new AxisMovingStatus();
- }
- CtrlMotionCardAxisStatus ctrlMotionCardAxisStatus = new CtrlMotionCardAxisStatus(axisMovingStatus);
- //ctrlMotionCardAxisStatus.Dock = DockStyle.Fill;
+ CtrlMotionCardAxisStatus ctrlMotionCardAxisStatus = new CtrlMotionCardAxisStatus(Device, axisConfig.AxisIndex, axisConfig.AxisName);
flowLayoutPanel1.Controls.Add(ctrlMotionCardAxisStatus);
-
}
- CtrlMotionCardIOStatus ctrlMotionCardIOStatus = new CtrlMotionCardIOStatus(Device, MotionCard.MonitorValues);
- //ctrlMotionCardIOStatus.Dock = DockStyle.Fill;
+ CtrlMotionCardIOStatus ctrlMotionCardIOStatus = new CtrlMotionCardIOStatus(Device);
+ //ctrlMotionCardIOStatus.Dock = DockStyle.Fill; //flowLayoutPanel鍐呴儴鎺т欢 涓嶈dock fill
flowLayoutPanel2.Controls.Add(ctrlMotionCardIOStatus);
}
--
Gitblit v1.8.0