From a6f2ba736d1ac63d8fe33c71dfc3a578b1702b95 Mon Sep 17 00:00:00 2001 From: xcd <834800634@qq.com> Date: 星期一, 06 七月 2020 11:27:08 +0800 Subject: [PATCH] 三色灯和蜂鸣器逻辑实现 --- src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardOperationBase.cs | 88 ++++++++++++++++--------------------------- 1 files changed, 33 insertions(+), 55 deletions(-) diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardOperationBase.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardOperationBase.cs index 2d90199..0552bb9 100644 --- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardOperationBase.cs +++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardOperationBase.cs @@ -1,9 +1,9 @@ -锘縰sing Bro.Common.Helper; +锘縰sing Bro.Common.Base; +using Bro.Common.Helper; using Bro.Common.Interface; +using Bro.Common.Model; using Bro.Device.GTSCard; using System; -using System.Collections.Generic; -using System.Data; using System.Linq; using System.Windows.Forms; @@ -14,32 +14,31 @@ public CtrlMotionCardOperationBase() { InitializeComponent(); - GTSCardOperationConfig = new GTSCardOperationConfig(); } public IDevice Device { get; set; } - //protected CameraBase Camera - //{ - // get => Device as CameraBase; - //} + public MotionCardOperationConfigBase MotionCardOperationConfig { get; set; } - GTSCardOperationConfig GTSCardOperationConfig = null; - MovingOption movingConfig = null; - - private IProcess process = null; - public IProcess Process + /// <summary> + /// 褰撳墠鏉垮崱瀹炰緥 + /// </summary> + protected MotionCardBase MotionCard { - get => process; - set - { - if (process != value) - { - process = value; - OnProcessUpdated(); - } - } + get => Device as MotionCardBase; } + + + public CtrlMotionCardOperationBase(IDevice device) + { + InitializeComponent(); + + Device = device; + MotionCardOperationConfig = new MotionCardOperationConfigBase(); + + } + + MovingOption movingConfig = null; #region ILogoutput public Action<LogMsg> OnLogMsgOutput { get; set; } @@ -48,44 +47,23 @@ { } #endregion - public void DownloadProcess(IProcess process) - { - throw new NotImplementedException(); - } - public void OnProcessUpdated() - { - if (InvokeRequired) - { - Invoke(new Action(() => OnProcessUpdated())); - } - else - { - if (Process != null) - { - //_avaiableMethods = Process.ProcessMethodCollection.Where(u => u.InvokeType == _invokeType).Select(u => u.MethodCode).ToList(); - - //LoadDevices(); - //LoadProcessMethods(); - } - } - } private void RadioButton_CheckedChanged(object sender, EventArgs e) { //鍔犺浇瀵瑰簲杩愬姩鐨� movingConfig - if (radioP2P.Checked) - { - movingConfig = GTSCardOperationConfig.MovingOps.FirstOrDefault(u => u.MoveMode == EnumHelper.MotorMoveMode.Normal); - } - else if (radioJog.Checked) - { - movingConfig = GTSCardOperationConfig.MovingOps.FirstOrDefault(u => u.MoveMode == EnumHelper.MotorMoveMode.Jog); - } - else if (radioGoHome.Checked) - { - movingConfig = GTSCardOperationConfig.MovingOps.FirstOrDefault(u => u.MoveMode == EnumHelper.MotorMoveMode.FindOri); - } + //if (radioP2P.Checked) + //{ + // movingConfig = MotionCardOperationConfig.MovingOps.FirstOrDefault(u => u.MoveMode == EnumHelper.MotorMoveMode.Normal); + //} + //else if (radioJog.Checked) + //{ + // movingConfig = MotionCardOperationConfig.MovingOps.FirstOrDefault(u => u.MoveMode == EnumHelper.MotorMoveMode.Jog); + //} + //else if (radioGoHome.Checked) + //{ + // movingConfig = MotionCardOperationConfig.MovingOps.FirstOrDefault(u => u.MoveMode == EnumHelper.MotorMoveMode.FindOri); + //} propGrid.SelectedObject = movingConfig; } -- Gitblit v1.8.0