M071.git - Gitblit

			@@ -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 类型（IN OUT）")]
			public IOModel MonitorIOModel { get; set; }
			public IOType MonitorIOModel { get; set; }

			/// <summary>
			/// 监听地址索引
			@@ -209,12 +209,12 @@
			/// <summary>
			/// 监听回传
			/// </summary>
			[Category("回传设置")]
			[DisplayName("监听回传")]
			[Description("监听运动板卡，并往指定的IO写入数据")]
			[TypeConverter(typeof(CollectionCountConvert))]
			[Editor(typeof(IOItem), typeof(UITypeEditor))]
			public List<IOItem> ReplyIODatas { get; set; } = new List<IOItem>();
			//[Category("回传设置")]
			//[DisplayName("监听回传")]
			//[Description("监听运动板卡，并往指定的IO写入数据")]
			//[TypeConverter(typeof(CollectionCountConvert))]
			//[Editor(typeof(ComplexCollectionEditor<IOItem>), typeof(UITypeEditor))]
			//public List<IOItem> ReplyIODatas { get; set; } = new List<IOItem>();
			}

			public class IOperationConfigEditor : UITypeEditor