From e06be53dff56744de8db2a2aec136d494cc187bf Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期二, 07 十一月 2023 16:47:02 +0800 Subject: [PATCH] Merge branch 'Dev-Branch' of http://59.41.255.150:6688/r/~wxr/OnPro into Dev-Branch --- HDL_ON/Entity/Function/AC.cs | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/HDL_ON/Entity/Function/AC.cs b/HDL_ON/Entity/Function/AC.cs index bc31208..8a8db35 100644 --- a/HDL_ON/Entity/Function/AC.cs +++ b/HDL_ON/Entity/Function/AC.cs @@ -12,24 +12,28 @@ public string GetTempUnitString(Function function) { //var attr = function.GetAttribute(FunctionAttributeKey.TempType) - var tt = function.GetAttrState(FunctionAttributeKey.TempType); - if (tt == "0") + var tt = function.GetAttribute(FunctionAttributeKey.TempType); + if(tt == null) + { + return "掳C"; + } + if (tt.unit == string.Empty) { return "掳C"; } else { - if (tt == "C") + if (tt.unit == "C") { return "掳C"; } - else if (tt == "F") + else if (tt.unit == "F") { return "掳F"; } else { - return tt; + return tt.unit; } } } -- Gitblit v1.8.0