From 428f24065159010fa1dfa3c7165c21d2f88391d7 Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期三, 01 七月 2020 17:57:46 +0800
Subject: [PATCH] 命名优化
---
src/Bro.Common.Model/Model/MonitorSet.cs | 10 +++++-----
src/Bro.Common.Model/Model/WarningSet.cs | 2 +-
src/Bro.Process/ProcessConfig.cs | 2 +-
src/Bro.Common.Device/DeviceBase/PLCBase.cs | 18 +++++++++---------
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/Bro.Common.Device/DeviceBase/PLCBase.cs b/src/Bro.Common.Device/DeviceBase/PLCBase.cs
index 0f56fbb..fca8154 100644
--- a/src/Bro.Common.Device/DeviceBase/PLCBase.cs
+++ b/src/Bro.Common.Device/DeviceBase/PLCBase.cs
@@ -122,7 +122,7 @@
//PLCIConfig.MonitorSetCollection.ForEach(set =>
Parallel.ForEach(PLCIConfig.MonitorSetCollection, set =>
{
- MonitorSet monitorSet = set as MonitorSet;
+ PLCMonitorSet monitorSet = set as PLCMonitorSet;
if (monitorSet.TriggerIndex < 0 || monitorSet.TriggerIndex >= tempNew.Count)
{
return;
@@ -153,7 +153,7 @@
private void OnMethodInvoked(IAsyncResult ar)
{
- MonitorSet monitorSet = ar.AsyncState as MonitorSet;
+ PLCMonitorSet monitorSet = ar.AsyncState as PLCMonitorSet;
ProcessResponse resValues = monitorSet.Response;
@@ -211,7 +211,7 @@
}
object _alarmLock = new object();
- private async void SaveAlarmCSVAsync(DateTime now, string plcName, WarningSet ws)
+ private async void SaveAlarmCSVAsync(DateTime now, string plcName, PLCWarningSet ws)
{
await Task.Run(() =>
{
@@ -309,14 +309,14 @@
[DisplayName("璀︽姤閰嶇疆")]
[TypeConverter(typeof(CollectionCountConvert))]
[Editor(typeof(WarningSetsEditor), typeof(UITypeEditor))]
- public List<WarningSet> WarningSetCollection { get; set; } = new List<WarningSet>();
+ public List<PLCWarningSet> WarningSetCollection { get; set; } = new List<PLCWarningSet>();
#region IMonitorConfig
[Category("鐩戝惉璁剧疆")]
[Description("鐩戝惉鎿嶄綔閰嶇疆闆嗗悎")]
[DisplayName("鐩戝惉閰嶇疆")]
[TypeConverter(typeof(CollectionCountConvert))]
- [Editor(typeof(ComplexCollectionEditor<MonitorSet>), typeof(UITypeEditor))]
+ [Editor(typeof(ComplexCollectionEditor<PLCMonitorSet>), typeof(UITypeEditor))]
public List<IMonitorSet> MonitorSetCollection { get; set; } = new List<IMonitorSet>();
[Category("鐩戝惉璁剧疆")]
@@ -481,9 +481,9 @@
}
}
- private List<WarningSet> GetWarningSets()
+ private List<PLCWarningSet> GetWarningSets()
{
- List<WarningSet> wsList = new List<WarningSet>();
+ List<PLCWarningSet> wsList = new List<PLCWarningSet>();
OpenFileDialog ofd = new OpenFileDialog();
ofd.Multiselect = false;
@@ -500,7 +500,7 @@
if (!string.IsNullOrWhiteSpace(list[1]))
{
- WarningSet ws = new WarningSet();
+ PLCWarningSet ws = new PLCWarningSet();
ws.WarningCode = list[0];
ws.WarningDescription = list[1];
@@ -536,7 +536,7 @@
/// <returns></returns>
protected override Type CreateCollectionItemType()
{
- return typeof(WarningSet);
+ return typeof(PLCWarningSet);
}
protected override string GetDisplayText(object value)
diff --git a/src/Bro.Common.Model/Model/MonitorSet.cs b/src/Bro.Common.Model/Model/MonitorSet.cs
index 50f977a..9635218 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>
/// 鐩戝惉绫诲瀷
diff --git a/src/Bro.Common.Model/Model/WarningSet.cs b/src/Bro.Common.Model/Model/WarningSet.cs
index a57dbab..b453235 100644
--- a/src/Bro.Common.Model/Model/WarningSet.cs
+++ b/src/Bro.Common.Model/Model/WarningSet.cs
@@ -10,7 +10,7 @@
/// <summary>
/// PLC璀︽姤閰嶇疆
/// </summary>
- public class WarningSet : IComplexDisplay, IWarningSet
+ public class PLCWarningSet : IComplexDisplay, IWarningSet
{
[Category("绱㈠紩璁剧疆")]
[Description("PLC璀︽姤绱㈠紩鈥斺�斿瓧绱㈠紩")]
diff --git a/src/Bro.Process/ProcessConfig.cs b/src/Bro.Process/ProcessConfig.cs
index ff3918d..1dc98f4 100644
--- a/src/Bro.Process/ProcessConfig.cs
+++ b/src/Bro.Process/ProcessConfig.cs
@@ -66,7 +66,7 @@
[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()
--
Gitblit v1.8.0