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.Common.Model/Forms/FrmDeviceOpConfigEditor.cs | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/Bro.Common.Model/Forms/FrmDeviceOpConfigEditor.cs b/src/Bro.Common.Model/Forms/FrmDeviceOpConfigEditor.cs
index 26b8303..4ae9e2e 100644
--- a/src/Bro.Common.Model/Forms/FrmDeviceOpConfigEditor.cs
+++ b/src/Bro.Common.Model/Forms/FrmDeviceOpConfigEditor.cs
@@ -29,7 +29,7 @@
IOperationConfig backOpConfig = new OperationConfigBase();
List<IDevice> deviceList = null;
IDevice currentDevice = null;
- public FrmDeviceOpConfigEditor(DeviceOpBind bind)
+ public FrmDeviceOpConfigEditor(DeviceOpBind bind, bool isEnableSelectDevice = true)
{
InitializeComponent();
@@ -56,7 +56,15 @@
cboDevice.SelectedIndex = 0;
}
- cboDevice.SelectedIndexChanged += CboDevice_SelectedIndexChanged;
+ if (isEnableSelectDevice)
+ {
+ cboDevice.Enabled = true;
+ cboDevice.SelectedIndexChanged += CboDevice_SelectedIndexChanged;
+ }
+ else
+ {
+ cboDevice.Enabled = false;
+ }
if (bind.OpConfig == null)
{
@@ -91,7 +99,7 @@
var attr = device.GetType().GetCustomAttribute<DeviceAttribute>();
if (attr != null)
{
- var opConfig= ConfigFactory.GetOperationConfig(attr.TypeCode);
+ var opConfig = ConfigFactory.GetOperationConfig(attr.TypeCode);
opConfig.DeviceId = device.Id;
propGrid.SelectedObject = opConfig;
}
@@ -120,6 +128,7 @@
{
Bind.Device = cboDevice.SelectedValue.ToString();
Bind.OpConfig = propGrid.SelectedObject as IOperationConfig;
+ Bind.OpConfig.DeviceId = Bind.Device;
this.DialogResult = DialogResult.OK;
}
--
Gitblit v1.8.0