From e1ac4d0e483426d5a410b6b4ae04e819f59b621e Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期五, 03 七月 2020 10:48:30 +0800
Subject: [PATCH] 基类+板卡驱动修改
---
src/Bro.Common.Model/Model/MonitorSet.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/Bro.Common.Model/Model/MonitorSet.cs b/src/Bro.Common.Model/Model/MonitorSet.cs
index 50f977a..ce109aa 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()
{
@@ -180,7 +180,7 @@
/// <summary>
/// 杩愬姩鏉垮崱鐩戝惉閰嶇疆瀵硅薄
/// </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>
/// 鐩戝惉鍦板潃绱㈠紩
--
Gitblit v1.8.0