From b83a01eec16b236d099dcea3e7a5051c8cae9c6c Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期五, 03 七月 2020 10:48:37 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardOperationBase.cs | 70 ++++++++++++-----------------------
1 files changed, 24 insertions(+), 46 deletions(-)
diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardOperationBase.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardOperationBase.cs
index 2d90199..2b8d8dd 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,43 +47,22 @@
{
}
#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);
+ movingConfig = MotionCardOperationConfig.MovingOps.FirstOrDefault(u => u.MoveMode == EnumHelper.MotorMoveMode.Normal);
}
else if (radioJog.Checked)
{
- movingConfig = GTSCardOperationConfig.MovingOps.FirstOrDefault(u => u.MoveMode == EnumHelper.MotorMoveMode.Jog);
+ movingConfig = MotionCardOperationConfig.MovingOps.FirstOrDefault(u => u.MoveMode == EnumHelper.MotorMoveMode.Jog);
}
else if (radioGoHome.Checked)
{
- movingConfig = GTSCardOperationConfig.MovingOps.FirstOrDefault(u => u.MoveMode == EnumHelper.MotorMoveMode.FindOri);
+ movingConfig = MotionCardOperationConfig.MovingOps.FirstOrDefault(u => u.MoveMode == EnumHelper.MotorMoveMode.FindOri);
}
propGrid.SelectedObject = movingConfig;
--
Gitblit v1.8.0