From 2d5cd35af7437ad4015d38594d8c721dc6166b11 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 29 八月 2023 09:22:38 +0800
Subject: [PATCH] Merge branch 'wjc' of http://59.41.255.150:6688/r/~wxr/OnPro into wjc
---
HDL_ON/Entity/Function/AC.cs | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/Entity/Function/AC.cs b/HDL_ON/Entity/Function/AC.cs
index 3f9a905..8a8db35 100644
--- a/HDL_ON/Entity/Function/AC.cs
+++ b/HDL_ON/Entity/Function/AC.cs
@@ -11,14 +11,30 @@
/// </summary>
public string GetTempUnitString(Function function)
{
- var tt = function.GetAttrState(FunctionAttributeKey.TempType);
- if (tt == "0")
+ //var attr = function.GetAttribute(FunctionAttributeKey.TempType)
+ var tt = function.GetAttribute(FunctionAttributeKey.TempType);
+ if(tt == null)
+ {
+ return "掳C";
+ }
+ if (tt.unit == string.Empty)
{
return "掳C";
}
else
{
- return tt;
+ if (tt.unit == "C")
+ {
+ return "掳C";
+ }
+ else if (tt.unit == "F")
+ {
+ return "掳F";
+ }
+ else
+ {
+ return tt.unit;
+ }
}
}
--
Gitblit v1.8.0