From d06507ffdbad5db95156e114d5e8a0f89672529a Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期二, 02 二月 2021 08:43:07 +0800
Subject: [PATCH] MES上传数据checkTime参数更改为DateTime类型
---
src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardRunBase.cs | 53 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 39 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..6da479f 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,43 @@
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))
+ {
+ 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