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 | 57 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 43 insertions(+), 14 deletions(-)
diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.cs
index 142fc16..f497998 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.cs
@@ -8,10 +8,12 @@
using System.Threading.Tasks;
using System.Windows.Forms;
using Bro.Common.Interface;
+using Bro.Common.Base;
+using Bro.Common.Model;
namespace Bro.UI.Device.Winform
{
- public partial class CtrlMotionCardRunBase : UserControl
+ public partial class CtrlMotionCardRunBase : UserControl, IRunCtrl
{
public CtrlMotionCardRunBase()
{
@@ -21,20 +23,47 @@
public CtrlMotionCardRunBase(IDevice device)
{
InitializeComponent();
+ Device = device;
- //CvImage = new Canvas();
- //CvImage.IsShowElementList = false;
- //CvImage.IsShowROITool = false;
- //CvImage.Dock = DockStyle.Fill;
- //Controls.Add(CvImage);
-
- //Device = device;
-
- //Camera.OnImageUpdated += Camera_UpdateShowImage;
- //Camera.OnElementsUpdated += Camera_OnElementsUpdated;
- //Camera.OnCameraOpModeChanged += Camera_OnCameraOpModeChanged;
-
- //InitialToolBarVisible();
+ 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();
+ //}
+
+ private void InitialLayout()
+ {
+ foreach (var axisConfig in MotionCard.IConfig.AxisSettings.FindAll(u => u.IsAxisEnabled))
+ {
+ var axisMovingStatus = MotionCard.AxisStatusList.FirstOrDefault(u => u.AxisIndex == axisConfig.AxisIndex);
+ if (axisMovingStatus == null)
+ {
+ axisMovingStatus = new AxisMovingStatus();
+ }
+ CtrlMotionCardAxisStatus ctrlMotionCardAxisStatus = new CtrlMotionCardAxisStatus(axisMovingStatus);
+ flowLayoutPanel1.Controls.Add(ctrlMotionCardAxisStatus);
+ }
+
+ CtrlMotionCardIOStatus ctrlMotionCardIOStatus = new CtrlMotionCardIOStatus(Device, MotionCard.MonitorValues);
+ flowLayoutPanel2.Controls.Add(ctrlMotionCardIOStatus);
+ }
+
+
+
+ private void buttonMotionCardOperation_Click(object sender, EventArgs e)
+ {
+ FrmMotionCardOperationBase motionCardOperationBase = new FrmMotionCardOperationBase(Device);
+ motionCardOperationBase.Show();
+ }
+
}
}
--
Gitblit v1.8.0