From f1a4349ec1420828a02e2fd28b02afb8519c1929 Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期四, 09 七月 2020 18:53:15 +0800
Subject: [PATCH] jog操作
---
src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.cs | 6 +++---
src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.Designer.cs | 4 ++++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.Designer.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.Designer.cs
index 1bbcd47..629efc2 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.Designer.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.Designer.cs
@@ -228,6 +228,8 @@
this.buttonNegative.Text = "璐熷悜";
this.buttonNegative.UseVisualStyleBackColor = true;
this.buttonNegative.Click += new System.EventHandler(this.buttonNegative_Click);
+ this.buttonNegative.MouseDown += new System.Windows.Forms.MouseEventHandler(this.buttonNegative_MouseDown);
+ this.buttonNegative.MouseUp += new System.Windows.Forms.MouseEventHandler(this.buttonNegative_MouseUp);
//
// textBoxJogDec
//
@@ -245,6 +247,8 @@
this.buttonPositive.Text = "姝ｅ悜";
this.buttonPositive.UseVisualStyleBackColor = true;
this.buttonPositive.Click += new System.EventHandler(this.buttonPositive_Click);
+ this.buttonPositive.MouseDown += new System.Windows.Forms.MouseEventHandler(this.buttonPositive_MouseDown);
+ this.buttonPositive.MouseUp += new System.Windows.Forms.MouseEventHandler(this.buttonPositive_MouseUp);
//
// textBoxJogAcc
//
diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.cs
index fcc0e33..f6ab955 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.cs
@@ -38,7 +38,7 @@
}
- private void buttonPositive_MouseDown(object sender, EventArgs e)
+ private void buttonPositive_MouseDown(object sender, MouseEventArgs e)
{
var opConfig = new MotionOperationCollection();
MovingOption movingOption = new MovingOption();
@@ -62,7 +62,7 @@
MotionCard.MoveStop(_axisIndex, 0);
}
- private void buttonNegative_MouseDown(object sender, EventArgs e)
+ private void buttonNegative_MouseDown(object sender, MouseEventArgs e)
{
var opConfig = new MotionOperationCollection();
MovingOption movingOption = new MovingOption();
@@ -103,7 +103,7 @@
private void buttonStop_Click(object sender, EventArgs e)
{
- MotionCard.StateChange(DeviceState.DSPause);
+ MotionCard.MoveStop(_axisIndex, 0);
}
}
}
--
Gitblit v1.8.0