From 5b6ffebeeee53e375cf8f8d5c30c51f03ad1d96e Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期四, 09 七月 2020 19:12:42 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.cs | 51 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 36 insertions(+), 15 deletions(-)
diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.cs
index 488561c..f6ab955 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.cs
@@ -37,21 +37,8 @@
groupBoxAxisOperration.Text = $"杩愬姩杞达細{axisIndex}-{axisName}";
}
- private void buttonPositive_Click(object sender, EventArgs e)
- {
- var opConfig = new MotionOperationCollection();
- MovingOption movingOption = new MovingOption();
- movingOption.AxisIndex = _axisIndex;
- movingOption.MoveMode = MotionMode.Jog;
- movingOption.VelocityPara.Acc = Convert.ToDouble(textBoxJogAcc.Text);
- movingOption.VelocityPara.Dec = Convert.ToDouble(textBoxJogDec.Text);
- movingOption.VelocityPara.Velocity= Convert.ToDouble(textBoxJogVel.Text);
- opConfig.MovingOps.Add(movingOption);
- MotionCard.MoveToPoint(opConfig);
- }
-
- private void buttonNegative_Click(object sender, EventArgs e)
+ private void buttonPositive_MouseDown(object sender, MouseEventArgs e)
{
var opConfig = new MotionOperationCollection();
MovingOption movingOption = new MovingOption();
@@ -63,6 +50,40 @@
opConfig.MovingOps.Add(movingOption);
MotionCard.MoveToPoint(opConfig);
+ }
+
+ private void buttonPositive_MouseUp(object sender, MouseEventArgs e)
+ {
+ MotionCard.MoveStop(_axisIndex, 0);
+ }
+
+ private void buttonNegative_MouseUp(object sender, MouseEventArgs e)
+ {
+ MotionCard.MoveStop(_axisIndex, 0);
+ }
+
+ private void buttonNegative_MouseDown(object sender, MouseEventArgs e)
+ {
+ var opConfig = new MotionOperationCollection();
+ MovingOption movingOption = new MovingOption();
+ movingOption.AxisIndex = _axisIndex;
+ movingOption.MoveMode = MotionMode.Jog;
+ movingOption.VelocityPara.Acc = Convert.ToDouble(textBoxJogAcc.Text);
+ movingOption.VelocityPara.Dec = Convert.ToDouble(textBoxJogDec.Text);
+ movingOption.VelocityPara.Velocity = -Convert.ToDouble(textBoxJogVel.Text);
+
+ opConfig.MovingOps.Add(movingOption);
+ MotionCard.MoveToPoint(opConfig);
+ }
+
+ private void buttonPositive_Click(object sender, EventArgs e)
+ {
+
+ }
+
+ private void buttonNegative_Click(object sender, EventArgs e)
+ {
+
}
private void buttonStart_Click(object sender, EventArgs e)
@@ -82,7 +103,7 @@
private void buttonStop_Click(object sender, EventArgs e)
{
- MotionCard.StateChange(DeviceState.DSPause);
+ MotionCard.MoveStop(_axisIndex, 0);
}
}
}
--
Gitblit v1.8.0