From 424ac5b575538f5b4b83a3927ab56d66eb83be4b Mon Sep 17 00:00:00 2001
From: SL <123@123.com>
Date: Tue, 23 Apr 2024 23:26:54 +0800
Subject: [PATCH] =?UTF-8?q?fix(PMHeaterView):=20=E4=BF=AE=E6=AD=A3PMHeater?=
 =?UTF-8?q?View=E8=A7=86=E5=9B=BE=E4=B8=ADPID=E9=99=90=E5=B9=85=E5=80=BC?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E7=BB=91=E5=AE=9A=E9=94=99=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PID限幅值输入框绑定的PIDLimitLowerSP等属性类型更改为string。
SetPIDLimits方法中转化PIDLimitLowerSP等属性为double。
---
 .../CenterViews/Modules/PM/PMHeaterView.xaml  | 10 ++++--
 .../Modules/PM/PMHeaterViewModel.cs           | 16 +++++-----
 .../Converters/DoubleToStringConverter.cs     | 31 +++++++++++++++++++
 .../MECF.Framework.UI.Core.csproj             |  1 +
 4 files changed, 47 insertions(+), 11 deletions(-)
 create mode 100644 MECF.Framework.UI.Core/Converters/DoubleToStringConverter.cs

diff --git a/MECF.Framework.UI.Client/CenterViews/Modules/PM/PMHeaterView.xaml b/MECF.Framework.UI.Client/CenterViews/Modules/PM/PMHeaterView.xaml
index 0c29788..d54e2b7 100644
--- a/MECF.Framework.UI.Client/CenterViews/Modules/PM/PMHeaterView.xaml
+++ b/MECF.Framework.UI.Client/CenterViews/Modules/PM/PMHeaterView.xaml
@@ -25,7 +25,7 @@
     SnapsToDevicePixels="True">
     
     <UserControl.Resources>
-        <converters:StringToDoubleConverter x:Key="StringToDoubleConverter"/>
+        <converters:DoubleToStringConverter x:Key="DoubleToStringConverter"/>
         <converters:EnumDisplayConverter x:Key="EnumDisplayConverter"/>
         <ObjectDataProvider x:Key="EnumHeatStrategy" MethodName="GetValues"
                             ObjectType="{x:Type sys:Enum}">
@@ -1470,7 +1470,9 @@
                             <controls:TextBoxEx
                                 FontFamily="Arial"
                                 FontSize="14"
-                                Text="{Binding PIDLimitLowerSP, Mode=OneWayToSource}" />
+                                EditBoxMode="Decimal"
+                                Text="{Binding PIDLimitLowerSP, 
+                                Mode=OneWayToSource}" />
                         </Border>
 
                         <Border
@@ -1504,6 +1506,7 @@
                             BorderBrush="{DynamicResource Table_BD}"
                             BorderThickness="0,0,1,1">
                             <controls:TextBoxEx
+                                EditBoxMode="Decimal"
                                 FontFamily="Arial"
                                 FontSize="14"
                                 Text="{Binding PIDLimitUpperSP, Mode=OneWayToSource}" />
@@ -1540,6 +1543,7 @@
                             BorderBrush="{DynamicResource Table_BD}"
                             BorderThickness="0,0,1,1">
                             <controls:TextBoxEx
+                                EditBoxMode="Decimal"
                                 FontFamily="Arial"
                                 FontSize="14"
                                 Text="{Binding PIDRateLimitSP, Mode=OneWayToSource}" />
@@ -1678,7 +1682,7 @@
 
                     <Grid Grid.Row="1" Grid.Column="0">
                         <Label
-                            Margin="22,13,-22.5,-12.5"
+                            Margin="22,-120,-22.5,0"
                             Content="{lex:Loc ID_TXT_Confinement_Must_In_Up_State}"
                             FontSize="30"
                             FontWeight="Bold"
diff --git a/MECF.Framework.UI.Client/CenterViews/Modules/PM/PMHeaterViewModel.cs b/MECF.Framework.UI.Client/CenterViews/Modules/PM/PMHeaterViewModel.cs
index 6aef943..2d0ead8 100644
--- a/MECF.Framework.UI.Client/CenterViews/Modules/PM/PMHeaterViewModel.cs
+++ b/MECF.Framework.UI.Client/CenterViews/Modules/PM/PMHeaterViewModel.cs
@@ -1065,25 +1065,25 @@ namespace MECF.Framework.UI.Client.CenterViews.Modules.PM
         [Subscription("TC1.PIDRateLimit")]
         public double PIDRateLimitFB { get; set; }
 
-        public double PIDLimitLowerSP { get; set; }
+        public string PIDLimitLowerSP { get; set; }
 
-        public double PIDLimitUpperSP { get; set; }
+        public string PIDLimitUpperSP { get; set; }
 
-        public double PIDRateLimitSP { get; set; }
+        public string PIDRateLimitSP { get; set; }
 
         public void SetPIDLimits()
         {
-            if (PIDLimitLowerSP is < 0 or > 100)
+            if (double.TryParse(PIDLimitLowerSP, out var lower) && lower is < 0 or > 100)
                 DialogBox.ShowError("PID Limit Lower(%) is out of range 0% ~ 100%.");
-            else if (PIDLimitUpperSP is < 0 or > 100)
+            else if (double.TryParse(PIDLimitUpperSP, out var upper) && upper is < 0 or > 100)
                 DialogBox.ShowError("PID Limit Upper(%) is out of range 0% ~ 100%.");
-            else if (PIDRateLimitSP is < 0 or > 100)
+            else if (double.TryParse(PIDRateLimitSP, out var rate) && rate is < 0 or > 100)
                 DialogBox.ShowError("PID Limit Upper(%) is out of range 0% ~ 100%.");
-            else if (PIDLimitLowerSP >= PIDLimitUpperSP)
+            else if (lower >= upper)
                 DialogBox.ShowError("PID Limit Lower(%) can not be greater than Upper(%).");
             else
                 InvokeClient.Instance.Service.DoOperation($"{SystemName}.{TCUnits.TC1}.SetPIDLimit",
-                    PIDLimitLowerSP, PIDLimitUpperSP, PIDRateLimitSP);
+                    lower, upper, rate);
         }
 
         #endregion
diff --git a/MECF.Framework.UI.Core/Converters/DoubleToStringConverter.cs b/MECF.Framework.UI.Core/Converters/DoubleToStringConverter.cs
new file mode 100644
index 0000000..403535b
--- /dev/null
+++ b/MECF.Framework.UI.Core/Converters/DoubleToStringConverter.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace MECF.Framework.UI.Core.Converters
+{
+    public class DoubleToStringConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value == null)
+                return "";
+
+            if(value is double dbl)
+                return dbl.ToString(CultureInfo.InvariantCulture);
+
+            return value.ToString();
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if(value == null)
+                return double.NaN;
+
+            if (double.TryParse(value.ToString(), out var dbl))
+                return dbl;
+
+            return double.NaN;
+        }
+    }
+}
diff --git a/MECF.Framework.UI.Core/MECF.Framework.UI.Core.csproj b/MECF.Framework.UI.Core/MECF.Framework.UI.Core.csproj
index fc0062e..6c54393 100644
--- a/MECF.Framework.UI.Core/MECF.Framework.UI.Core.csproj
+++ b/MECF.Framework.UI.Core/MECF.Framework.UI.Core.csproj
@@ -292,6 +292,7 @@
     <Compile Include="Converters\CenterBorderGapMaskConverter.cs" />
     <Compile Include="Converters\ColorConverter_IsTestOK.cs" />
     <Compile Include="Converters\ColorToBrushConverter.cs" />
+    <Compile Include="Converters\DoubleToStringConverter.cs" />
     <Compile Include="Converters\EnumDescriptionConverter.cs" />
     <Compile Include="Converters\EnumDisplayConverter.cs" />
     <Compile Include="Converters\GeneralConverter.cs" />