From 2edc3c54ba7a42d5e9bb9120b9881d418e6bd408 Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期五, 13 八月 2021 09:38:29 +0800
Subject: [PATCH] 1. GTS回原点修改,避免来回 2. 添加单键测量结果补偿 3. 部分条件限制,日志修改 4. 来料检debug,添加退出条件判断

---
 src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.cs |   16 +++-------------
 1 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.cs
index fcc0e33..2613cbf 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();
@@ -74,16 +74,6 @@
 
             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)
@@ -103,7 +93,7 @@
 
         private void buttonStop_Click(object sender, EventArgs e)
         {
-            MotionCard.StateChange(DeviceState.DSPause);
+            MotionCard.MoveStop(_axisIndex, 0);
         }
     }
 }

--
Gitblit v1.8.0