From d511823e84953e616da9a24484d730c49c457c08 Mon Sep 17 00:00:00 2001 From: xcd <834800634@qq.com> Date: 星期二, 14 七月 2020 08:54:16 +0800 Subject: [PATCH] 更改M071主界面按钮鼠标样式 --- src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.cs | 38 ++++++++++++++++++++++++-------------- 1 files changed, 24 insertions(+), 14 deletions(-) diff --git a/src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.cs b/src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.cs index fd2a2f0..b26aa01 100644 --- a/src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.cs +++ b/src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.cs @@ -17,7 +17,7 @@ public IDevice Device { get; set; } - public MotionCardOperationConfigBase MotionCardOperationConfig { get; set; } + public MovingOption MotionCardMovingOption { get; set; } = new MovingOption(); /// <summary> /// 褰撳墠鏉垮崱瀹炰緥 @@ -39,44 +39,54 @@ { 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); - } + CtrlMotionCardAxisOperation axisOperation = new CtrlMotionCardAxisOperation(Device, axisConfig.AxisIndex, axisConfig.AxisName); + //axisOperation.Dock = DockStyle.Fill; + flowLayoutPanel1.Controls.Add(axisOperation); + } + + MotionCardMovingOption.SetAxisSetting(MotionCard.IConfig.AxisSettings); + propGrid.SelectedObject = MotionCardMovingOption; } private void buttonClearStatus_Click(object sender, EventArgs e) { - + MotionCard.ClearStatus(1, MotionCard.IConfig.AxisSettings.FindAll(u => u.IsAxisEnabled).Count); } private void buttonServoEnable_Click(object sender, EventArgs e) { - + int sts = MotionCard.GetAxisStatus(MotionCardMovingOption.AxisIndex); + if ((sts & 0x200) == 0)//鍏抽棴鐘舵�� + { + MotionCard.AxisOnAsync(MotionCardMovingOption.AxisIndex); + buttonServoEnable.Text = "浼烘湇宸插紑鍚�"; + } + else + { + MotionCard.AxisOffAsync(MotionCardMovingOption.AxisIndex); + buttonServoEnable.Text = "浼烘湇宸插叧闂�"; + } } private void buttonPositionReset_Click(object sender, EventArgs e) { - + var res = MotionCard.PositionReset(MotionCardMovingOption.AxisIndex, 1); } private void btnStart_Click(object sender, EventArgs e) { - + MotionCard.SingleAxisMoving(MotionCardMovingOption); } private void buttonSmoothStop_Click(object sender, EventArgs e) { - + MotionCard.MoveStop(MotionCardMovingOption.AxisIndex, 0); } private void buttonEmergencyStop_Click(object sender, EventArgs e) { - + MotionCard.MoveStop(MotionCardMovingOption.AxisIndex, 1); } } -- Gitblit v1.8.0