From 9e49f7a2615286eaad7e8549bb79bae5c10c900f Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期六, 11 七月 2020 10:21:27 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.Common.Model/Model/MonitorSet.cs | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/src/Bro.Common.Model/Model/MonitorSet.cs b/src/Bro.Common.Model/Model/MonitorSet.cs
index 50f977a..985da90 100644
--- a/src/Bro.Common.Model/Model/MonitorSet.cs
+++ b/src/Bro.Common.Model/Model/MonitorSet.cs
@@ -15,7 +15,7 @@
namespace Bro.Common.Model
{
- public class SimpleMonitorSet : IMonitorSet, IComplexDisplay
+ public class MonitorSetBase : IMonitorSet, IComplexDisplay
{
[Browsable(false)]
public string Id { get; set; } = Guid.NewGuid().ToString();
@@ -76,7 +76,7 @@
}
}
- public SimpleMonitorSet() { }
+ public MonitorSetBase() { }
public virtual string GetDisplayText()
{
@@ -122,7 +122,7 @@
/// <summary>
/// PLC鐩戝惉璁剧疆
/// </summary>
- public class MonitorSet : SimpleMonitorSet
+ public class PLCMonitorSet : MonitorSetBase
{
/// <summary>
/// 鐩戝惉鍦板潃绱㈠紩 鎸夌収鐩戝惉鍦板潃浠�0寮�濮嬬殑绱㈠紩
@@ -165,7 +165,7 @@
[DisplayName("閫氱煡鍦板潃")]
public int NoticeAddress { get; set; } = -1;
- public MonitorSet() { }
+ public PLCMonitorSet() { }
public override string GetDisplayText()
{
@@ -178,9 +178,9 @@
}
/// <summary>
- /// 杩愬姩鏉垮崱鐩戝惉閰嶇疆瀵硅薄
+ /// 杩愬姩鏉垮崱IO鐩戝惉閰嶇疆瀵硅薄
/// </summary>
- public class MotionCardMonitorSet : SimpleMonitorSet
+ public class MotionCardMonitorSet : MonitorSetBase
{
/// <summary>
/// 鐩戝惉绫诲瀷
@@ -188,7 +188,7 @@
[Category("鐩戝惉璁剧疆")]
[DisplayName("鐩戝惉绫诲瀷")]
[Description("鐩戝惉杩愬姩鏉垮崱 IO 绫诲瀷锛圛N OUT锛�")]
- public IOModel MonitorIOModel { get; set; }
+ public IOType MonitorIOModel { get; set; }
/// <summary>
/// 鐩戝惉鍦板潃绱㈠紩
@@ -207,14 +207,23 @@
public int TriggerValue { get; set; } = -1;
/// <summary>
+ /// 浼犲叆鏁版嵁鍦板潃鐨勭储寮� 鎸夌収鐩戝惉鍦板潃浠�0寮�濮嬬殑绱㈠紩闆嗗悎
+ /// </summary>
+ [Category("鐩戝惉璁剧疆")]
+ [Description("浼犲叆鏁版嵁鍦板潃鐨勭储寮� 鎸夌収鐩戝惉鍦板潃浠�0寮�濮嬬殑绱㈠紩")]
+ [DisplayName("浼犲叆鏁版嵁绱㈠紩")]
+ [TypeConverter(typeof(SimpleCollectionConvert<int>))]
+ public List<int> InputDataIndex { get; set; } = new List<int>();
+
+ /// <summary>
/// 鐩戝惉鍥炰紶
/// </summary>
- [Category("鍥炰紶璁剧疆")]
- [DisplayName("鐩戝惉鍥炰紶")]
- [Description("鐩戝惉杩愬姩鏉垮崱锛屽苟寰�鎸囧畾鐨処O鍐欏叆鏁版嵁")]
- [TypeConverter(typeof(CollectionCountConvert))]
- [Editor(typeof(IOItem), typeof(UITypeEditor))]
- public List<IOItem> ReplyIODatas { get; set; } = new List<IOItem>();
+ //[Category("鍥炰紶璁剧疆")]
+ //[DisplayName("鐩戝惉鍥炰紶")]
+ //[Description("鐩戝惉杩愬姩鏉垮崱锛屽苟寰�鎸囧畾鐨処O鍐欏叆鏁版嵁")]
+ //[TypeConverter(typeof(CollectionCountConvert))]
+ //[Editor(typeof(ComplexCollectionEditor<IOItem>), typeof(UITypeEditor))]
+ //public List<IOItem> ReplyIODatas { get; set; } = new List<IOItem>();
}
public class IOperationConfigEditor : UITypeEditor
--
Gitblit v1.8.0