From 1e12238d9d6ea02f89aa7150f8507c9d8368a429 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期四, 09 七月 2020 14:29:15 +0800
Subject: [PATCH] 板卡操作配置编辑时传递轴号和轴名称
---
src/Bro.Common.Model/Forms/FrmDeviceOpConfigEditor.cs | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/Bro.Common.Model/Forms/FrmDeviceOpConfigEditor.cs b/src/Bro.Common.Model/Forms/FrmDeviceOpConfigEditor.cs
index 10d6598..d17062c 100644
--- a/src/Bro.Common.Model/Forms/FrmDeviceOpConfigEditor.cs
+++ b/src/Bro.Common.Model/Forms/FrmDeviceOpConfigEditor.cs
@@ -70,9 +70,12 @@
}
}
+ bind.OpConfig.DeviceId = bind.Device;
+
backOpConfig.DataFrom(bind.OpConfig);
propGrid.SelectedObject = bind.OpConfig;
+
}
private void CboDevice_SelectedIndexChanged(object sender, EventArgs e)
@@ -88,7 +91,9 @@
var attr = device.GetType().GetCustomAttribute<DeviceAttribute>();
if (attr != null)
{
- propGrid.SelectedObject = ConfigFactory.GetOperationConfig(attr.TypeCode);
+ var opConfig = ConfigFactory.GetOperationConfig(attr.TypeCode);
+ opConfig.DeviceId = device.Id;
+ propGrid.SelectedObject = opConfig;
}
}
}
@@ -115,6 +120,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