From 5b6ffebeeee53e375cf8f8d5c30c51f03ad1d96e Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期四, 09 七月 2020 19:12:42 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.cs | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.cs
index 1583630..23144a3 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
{
@@ -27,6 +28,13 @@
InitialLayout();
}
+ public IDevice Device { get; set; }
+
+ protected MotionCardBase MotionCard
+ {
+ get => Device as MotionCardBase;
+ }
+
private void MotionCard_OnMonitorInvoke(DateTime arg1, string arg2, IDevice arg3, IMonitorSet arg4)
{
throw new NotImplementedException();
@@ -36,25 +44,23 @@
{
foreach (var axisConfig in MotionCard.IConfig.AxisSettings.FindAll(u => u.IsAxisEnabled))
{
- var axisMovingStatus = MotionCard.AxisMovingOptionValues.FirstOrDefault(u=>u.AxisIndex== axisConfig.AxisIndex);
- if (axisMovingStatus!=null)
+ var axisMovingStatus = MotionCard.AxisMovingOptionValues.FirstOrDefault(u => u.AxisIndex == axisConfig.AxisIndex);
+ if (axisMovingStatus == null)
{
- CtrlMotionCardAxisStatus ctrlMotionCardAxisStatus = new CtrlMotionCardAxisStatus(axisMovingStatus);
- ctrlMotionCardAxisStatus.Dock = DockStyle.Fill;
- flowLayoutPanel1.Controls.Add(ctrlMotionCardAxisStatus);
+ axisMovingStatus = new AxisMovingStatus();
}
+ CtrlMotionCardAxisStatus ctrlMotionCardAxisStatus = new CtrlMotionCardAxisStatus(axisMovingStatus);
+ //ctrlMotionCardAxisStatus.Dock = DockStyle.Fill;
+ flowLayoutPanel1.Controls.Add(ctrlMotionCardAxisStatus);
+
}
- CtrlMotionCardIOStatus ctrlMotionCardIOStatus = new CtrlMotionCardIOStatus();
+ CtrlMotionCardIOStatus ctrlMotionCardIOStatus = new CtrlMotionCardIOStatus(MotionCard.MonitorValues);
+ //ctrlMotionCardIOStatus.Dock = DockStyle.Fill;
flowLayoutPanel2.Controls.Add(ctrlMotionCardIOStatus);
}
- public IDevice Device { get; set; }
- protected MotionCardBase MotionCard
- {
- get => Device as MotionCardBase;
- }
private void buttonMotionCardOperation_Click(object sender, EventArgs e)
{
--
Gitblit v1.8.0