From ef6bff7f82b6cb9c37213fc6bc8c48acfb7ab2d6 Mon Sep 17 00:00:00 2001
From: wells <123>
Date: 星期六, 11 七月 2020 10:19:43 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.cs | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.cs
index 740b2ad..f497998 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.cs
@@ -35,10 +35,10 @@
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()
{
@@ -50,13 +50,10 @@
axisMovingStatus = new AxisMovingStatus();
}
CtrlMotionCardAxisStatus ctrlMotionCardAxisStatus = new CtrlMotionCardAxisStatus(axisMovingStatus);
- //ctrlMotionCardAxisStatus.Dock = DockStyle.Fill;
flowLayoutPanel1.Controls.Add(ctrlMotionCardAxisStatus);
-
}
CtrlMotionCardIOStatus ctrlMotionCardIOStatus = new CtrlMotionCardIOStatus(Device, MotionCard.MonitorValues);
- //ctrlMotionCardIOStatus.Dock = DockStyle.Fill;
flowLayoutPanel2.Controls.Add(ctrlMotionCardIOStatus);
}
--
Gitblit v1.8.0