From 0d10528b430721512e0e93e0d455fcec44207ec9 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期二, 14 七月 2020 18:27:10 +0800
Subject: [PATCH] 1. 板卡驱动实现运动暂停/继续功能，板卡动作衔接实现暂停/继续 2. 修复部分调试bug 3. 安全光幕/安全门功能调整
---
src/Bro.Common.Model/Forms/FrmDeviceOpConfigEditor.cs | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/Bro.Common.Model/Forms/FrmDeviceOpConfigEditor.cs b/src/Bro.Common.Model/Forms/FrmDeviceOpConfigEditor.cs
index bb4b9a7..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)
{
@@ -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