From c01cce7ac1dc691c6b667b298ce0637b924102ea Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期二, 14 七月 2020 16:29:09 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.Process/ProcessConfig.cs | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/Bro.Process/ProcessConfig.cs b/src/Bro.Process/ProcessConfig.cs
index dcff227..e718679 100644
--- a/src/Bro.Process/ProcessConfig.cs
+++ b/src/Bro.Process/ProcessConfig.cs
@@ -7,6 +7,7 @@
using System.ComponentModel;
using System.Drawing.Design;
using System.Linq;
+using System.Runtime.CompilerServices;
namespace Bro.Process
{
@@ -66,15 +67,16 @@
[Description("榛樿鎿嶄綔閰嶇疆闆嗗悎")]
[DisplayName("榛樿鎿嶄綔閰嶇疆")]
[TypeConverter(typeof(CollectionCountConvert))]
- [Editor(typeof(ComplexCollectionEditor<SimpleMonitorSet>), typeof(UITypeEditor))]
+ [Editor(typeof(ComplexCollectionEditor<MonitorSetBase>), typeof(UITypeEditor))]
public List<IMonitorSet> MonitorSetCollection { get; set; } = new List<IMonitorSet>();
-
+
public virtual List<IInitialConfig> GetAllDeviceInitialConfigs()
{
List<IInitialConfig> configs = new List<IInitialConfig>();
configs.AddRange(CameraConfigCollection);
configs.AddRange(PLCConfigCollection);
+ configs.AddRange(DeviceConfigs);
return configs;
}
@@ -106,5 +108,19 @@
return list;
}
+
+
+ #region IPropertyChanged
+ public event PropertyChangedEventHandler PropertyChanged;
+
+ public virtual void Set<T>(ref T field, T newValue, [CallerMemberName] string propName = null)
+ {
+ if (!field.Equals(newValue))
+ {
+ field = newValue;
+ PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propName));
+ }
+ }
+ #endregion
}
}
--
Gitblit v1.8.0