From 4823d6031b6081c4c25c2ada5e477a9118c549bf Mon Sep 17 00:00:00 2001 From: wells.liu <wells.liu@broconcentric.com> Date: 星期一, 06 七月 2020 17:42:17 +0800 Subject: [PATCH] 板卡操作及运行界面 --- src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.cs | 43 +++++++++++++------------------------------ 1 files changed, 13 insertions(+), 30 deletions(-) diff --git a/src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.cs b/src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.cs index cfe0328..fd2a2f0 100644 --- a/src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.cs +++ b/src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.cs @@ -3,6 +3,7 @@ using Bro.Common.Interface; using Bro.Common.Model; using System; +using System.Linq; using System.Windows.Forms; namespace Bro.UI.Device.Winform @@ -32,38 +33,20 @@ InitializeComponent(); Device = device; - MotionCardOperationConfig = new MotionCardOperationConfigBase(); - + InitialLayout(); } - - MovingOption movingConfig = null; - - #region ILogoutput - public Action<LogMsg> OnLogMsgOutput { get; set; } - - public void LogDisplay(LogMsg msg) + private void InitialLayout() { - } - #endregion - - - private void RadioButton_CheckedChanged(object sender, EventArgs e) - { - //鍔犺浇瀵瑰簲杩愬姩鐨� movingConfig - //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; + foreach (var axisConfig in MotionCard.IConfig.AxisSettings.FindAll(u => u.IsAxisEnabled)) + { + var axisMovingStatus = MotionCard.AxisMovingOptionValues.FirstOrDefault(u => u.AxisIndex == axisConfig.AxisIndex); + if (axisMovingStatus != null) + { + CtrlMotionCardAxisOperation axisOperation = new CtrlMotionCardAxisOperation(axisMovingStatus.AxisIndex, axisMovingStatus.AxisName); + axisOperation.Dock = DockStyle.Fill; + flowLayoutPanel1.Controls.Add(axisOperation); + } + } } private void buttonClearStatus_Click(object sender, EventArgs e) -- Gitblit v1.8.0