From 78584911d0457ad9fc26d9dfc6f374b7ef531c0f Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期日, 22 十一月 2020 13:45:09 +0800
Subject: [PATCH] 1. 添加操作员输入和界面显示 2. 添加通过输入窗体 3. 添加webservice调用帮助类 4. M071添加MES数据检查和数据上传功能，添加相关界面显示和流程控制
---
src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.cs | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.cs b/src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.cs
index 6118331..b26aa01 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/FrmMotionCardOperationBase.cs
@@ -40,11 +40,12 @@
foreach (var axisConfig in MotionCard.IConfig.AxisSettings.FindAll(u => u.IsAxisEnabled))
{
CtrlMotionCardAxisOperation axisOperation = new CtrlMotionCardAxisOperation(Device, axisConfig.AxisIndex, axisConfig.AxisName);
- axisOperation.Dock = DockStyle.Fill;
+ //axisOperation.Dock = DockStyle.Fill;
flowLayoutPanel1.Controls.Add(axisOperation);
}
+ MotionCardMovingOption.SetAxisSetting(MotionCard.IConfig.AxisSettings);
propGrid.SelectedObject = MotionCardMovingOption;
}
@@ -58,12 +59,12 @@
int sts = MotionCard.GetAxisStatus(MotionCardMovingOption.AxisIndex);
if ((sts & 0x200) == 0)//鍏抽棴鐘舵��
{
- MotionCard.AxisOnAsync(MotionCardMovingOption.AxisIndex).GetAwaiter().GetResult();
+ MotionCard.AxisOnAsync(MotionCardMovingOption.AxisIndex);
buttonServoEnable.Text = "浼烘湇宸插紑鍚�";
}
else
{
- MotionCard.AxisOffAsync(MotionCardMovingOption.AxisIndex).GetAwaiter().GetResult();
+ MotionCard.AxisOffAsync(MotionCardMovingOption.AxisIndex);
buttonServoEnable.Text = "浼烘湇宸插叧闂�";
}
}
@@ -75,17 +76,17 @@
private void btnStart_Click(object sender, EventArgs e)
{
- MotionCard.SingleAxisMoving(MotionCardMovingOption).GetAwaiter().GetResult();
+ MotionCard.SingleAxisMoving(MotionCardMovingOption);
}
private void buttonSmoothStop_Click(object sender, EventArgs e)
{
- MotionCard.MoveStop(MotionCardMovingOption.AxisIndex, 0).GetAwaiter().GetResult();
+ MotionCard.MoveStop(MotionCardMovingOption.AxisIndex, 0);
}
private void buttonEmergencyStop_Click(object sender, EventArgs e)
{
- MotionCard.MoveStop(MotionCardMovingOption.AxisIndex, 1).GetAwaiter().GetResult();
+ MotionCard.MoveStop(MotionCardMovingOption.AxisIndex, 1);
}
}
--
Gitblit v1.8.0