From a332decd68d6d8bb5678d8ec95e6c65e0ccf9f33 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期四, 02 七月 2020 17:14:45 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardOperationBase.cs | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardOperation.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardOperationBase.cs
similarity index 64%
rename from src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardOperation.cs
rename to src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardOperationBase.cs
index 248d18f..2d90199 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardOperation.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardOperationBase.cs
@@ -1,5 +1,6 @@
锘縰sing Bro.Common.Helper;
using Bro.Common.Interface;
+using Bro.Device.GTSCard;
using System;
using System.Collections.Generic;
using System.Data;
@@ -8,14 +9,23 @@
namespace Bro.UI.Device.Winform
{
- public partial class CtrlMotionCardOperation : UserControl, IProcessObserver, ILogOutput
+ public partial class CtrlMotionCardOperationBase : UserControl, IRunCtrl
{
- public CtrlMotionCardOperation()
+ public CtrlMotionCardOperationBase()
{
InitializeComponent();
+ GTSCardOperationConfig = new GTSCardOperationConfig();
}
- List<string> _avaiableMethods { get; set; } = new List<string>();
+ public IDevice Device { get; set; }
+
+ //protected CameraBase Camera
+ //{
+ // get => Device as CameraBase;
+ //}
+
+ GTSCardOperationConfig GTSCardOperationConfig = null;
+ MovingOption movingConfig = null;
private IProcess process = null;
public IProcess Process
@@ -63,7 +73,21 @@
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);
+ }
+ propGrid.SelectedObject = movingConfig;
}
private void buttonClearStatus_Click(object sender, EventArgs e)
--
Gitblit v1.8.0