From 3cba54c4ee8d29d33ed21a2c749a9d2f2d03e22d Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期五, 03 七月 2020 18:33:30 +0800
Subject: [PATCH] 板卡IO定义修改。板卡预定义操作功能实现
---
src/Bro.Common.Model/Model/IOItem.cs | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/Bro.Common.Model/Model/IOItem.cs b/src/Bro.Common.Model/Model/IOItem.cs
index 147880e..653cdb2 100644
--- a/src/Bro.Common.Model/Model/IOItem.cs
+++ b/src/Bro.Common.Model/Model/IOItem.cs
@@ -22,8 +22,9 @@
/// IO鐐圭殑鍊�
/// </summary>
[Category("IO閰嶇疆")]
- [Description("IO鏁板��")]
- public virtual int Value { get; set; }
+ [Description("IO鐘舵��")]
+ [TypeConverter(typeof(EnumDescriptionConverter<IOValue>))]
+ public virtual IOValue Value { get; set; }
/// <summary>
/// IO鐐规槸in杩樻槸out
@@ -44,7 +45,7 @@
public virtual string GetDisplayText()
{
- return $"{IOType.GetEnumDescription()}-{IONum}-{Value}";
+ return $"{IOType.GetEnumDescription()}-{IONum}-{Value.GetEnumDescription()}";
}
public int GetHashCode(object obj)
@@ -70,7 +71,7 @@
[Browsable(false)]
[JsonIgnore]
- public override int Value { get; set; }
+ public override IOValue Value { get; set; }
public override string GetDisplayText()
{
@@ -86,8 +87,8 @@
public IODefinition IOItem { get; set; } = new IODefinition();
[Category("IO鎿嶄綔閰嶇疆")]
- [Description("闇�瑕佹搷浣滅殑IO鐨勬暟鍊�")]
- public int CheckValue
+ [Description("闇�瑕佹搷浣滅殑IO鐨勭姸鎬�")]
+ public IOValue CheckValue
{
get => IOItem.Value;
set => IOItem.Value = value;
@@ -99,7 +100,7 @@
public string GetDisplayText()
{
- return IOItem.IODesc + "-" + CheckValue;
+ return IOItem.IODesc + "-" + CheckValue.GetEnumDescription();
}
}
--
Gitblit v1.8.0