From eafdcc5ad6a55d3dfdec6c4787c3f3a9f32efc7f Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期二, 29 九月 2020 13:27:50 +0800
Subject: [PATCH] 1. M071B机台配置 2. GTS板卡添加回原点捕获模式和输入信号模式 3. CameraBase使用Dictionary类型做图片缓存 4. M071流程显式Copy，原来是为了避免内存泄漏，但目前来看不是这方面原因 5. Gocator驱动添加GoDataSet之类KObject资源显式回收，怀疑其中也有非托管对象资源，测试确实起到内存回收作用
---
src/Bro.Common.Model/Model/IOItem.cs | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/Bro.Common.Model/Model/IOItem.cs b/src/Bro.Common.Model/Model/IOItem.cs
index 653cdb2..5610aaf 100644
--- a/src/Bro.Common.Model/Model/IOItem.cs
+++ b/src/Bro.Common.Model/Model/IOItem.cs
@@ -109,11 +109,14 @@
Dictionary<IODefinition, string> itemDict = new Dictionary<IODefinition, string>();
public override StandardValuesCollection GetStandardValues(ITypeDescriptorContext context)
{
+ itemDict.Clear();
if (context.Instance is IORefrenceItem item)
{
item.IOItemSource.ForEach(i =>
{
- itemDict[i] = i.IODesc + "-" + i.IOType.GetEnumDescription() + "-" + i.IONum;
+ IODefinition temp = new IODefinition();
+ temp.DataFrom(i);
+ itemDict[temp] = (string.IsNullOrWhiteSpace(i.IODesc) ? i.IOPreStatement.GetEnumDescription() : i.IODesc) + "|" + i.IOType.GetEnumDescription() + "|" + i.IONum;
});
return new StandardValuesCollection(itemDict.Keys);
@@ -158,7 +161,7 @@
/// <returns></returns>
public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
{
- var s = value.ToString().Split(new char[] { '-' }, StringSplitOptions.RemoveEmptyEntries);
+ var s = value.ToString().Split(new char[] { '|' });
if (s.Length == 3)
{
--
Gitblit v1.8.0