update UI展示

Furnace/FurnaceRT/Equipments/PMs/PMN2Purge.cs

@@ -36,7 +36,7 @@ namespace FurnaceRT.Equipments.PMs
             DATA.Subscribe($"{Module}.CheckO2Location", () => GetCheckO2Location(), SubscriptionAttribute.FLAG.IgnoreSaveDB);
             DATA.Subscribe($"{Module}.O2SetCheckSetPoint", () => GetO2SetCheckSetPoint(), SubscriptionAttribute.FLAG.IgnoreSaveDB);
 
-            DATA.Subscribe($"{Module}.N2PurgeMode", () => SC.ContainsItem("PM1.SelectN2PurgeMode") ? SC.GetStringValue("PM1.SelectN2PurgeMode") : ""); 
+            DATA.Subscribe($"{Module}.N2PurgeMode", () => SC.ContainsItem("PM1.SelectN2PurgeMode") ? SC.GetStringValue("PM1.SelectN2PurgeMode") : "");
         }
         private void InitN2PurgeConfigData()
         {
@@ -121,7 +121,7 @@ namespace FurnaceRT.Equipments.PMs
                 if (operateItem.Item1 is IoMFC)
                 {
                     var ioMFc = (operateItem.Item1 as IoMFC);
-                    ioMFc.SetPoint = float.Parse(operateItem.Item2.ToString());
+                    { ioMFc.SetMfcValue(out _, 0, new object[] { float.Parse(operateItem.Item2.ToString()) }); }
                 }
 
                 if (operateItem.Item1 is IoValve)

Furnace/FurnaceUI/Views/Operations/PressureDetailView.xaml

@@ -176,14 +176,14 @@
                                         <Border>
                                             <Label Content="Press1"/>
                                         </Border>
-                                         <TextBox  Tag="None"  IsReadOnly="True"    Margin="0,0,1,0" Text="{Binding APCData.Pressure1Feedback, StringFormat={}{0:f3}, Mode=OneWay}"     />
+                                        <TextBox  Tag="None"  IsReadOnly="True"    Margin="0,0,1,0" Text="{Binding Pressure1Feedback, StringFormat={}{0:f3}, Mode=OneWay}"     />
                                          <TextBox  Tag="None"  IsReadOnly="True"    Width="40"  Text="{Binding DefaultUnit}"     />
                                     </StackPanel>
                                     <StackPanel Orientation="Horizontal">
                                         <Border>
                                             <Label Content="Press2"/>
                                         </Border>
-                                         <TextBox  Tag="None"  IsReadOnly="True"    Margin="0,0,1,0" Text="{Binding APCData.Pressure2Feedback, StringFormat={}{0:f1}, Mode=OneWay}"     />
+                                        <TextBox  Tag="None"  IsReadOnly="True"    Margin="0,0,1,0" Text="{Binding Pressure2Feedback, StringFormat={}{0:f1}, Mode=OneWay}"     />
                                          <TextBox  Tag="None"  IsReadOnly="True"    Width="40"   Text="{Binding DefaultUnit}"     />
                                     </StackPanel>
                                 </StackPanel>
@@ -289,7 +289,7 @@
                                     <StackPanel Orientation="Vertical">
                                         <StackPanel Orientation="Horizontal">
                                             <Border>
-                                                <Label Content="PH(Pa):" Width="130"/>
+                                                <Label Content="PH(Torr):" Width="130"/>
                                             </Border>
                                              <TextBox  Tag="None"  IsReadOnly="True"     Text="{Binding LeakCheckHighLimit ,UpdateSourceTrigger=PropertyChanged}" Width="235"/>
                                         </StackPanel>
@@ -310,7 +310,7 @@
                                     <StackPanel Orientation="Vertical">
                                         <StackPanel Orientation="Horizontal">
                                             <Border>
-                                                <Label Content="PL(Pa):" Width="130"/>
+                                                <Label Content="PL(Torr):" Width="130"/>
                                             </Border>
                                              <TextBox  Tag="None"  IsReadOnly="True"     Text="{Binding LeakCheckLowLimit ,UpdateSourceTrigger=PropertyChanged}" Width="235"/>
                                         </StackPanel>
@@ -330,7 +330,7 @@
                                     <StackPanel Orientation="Vertical">
                                         <StackPanel Orientation="Horizontal">
                                             <Border>
-                                                <Label Content="BP(Pa):" Width="130"/>
+                                                <Label Content="BP(Torr):" Width="130"/>
                                             </Border>
                                              <TextBox  Tag="None"  IsReadOnly="True"    Text="{Binding LeakCheckBasePressure ,UpdateSourceTrigger=PropertyChanged}" Width="235"/>
                                         </StackPanel>
@@ -345,7 +345,7 @@
                                     <StackPanel Orientation="Vertical">
                                         <StackPanel Orientation="Horizontal">
                                             <Border>
-                                                <Label Content="BPLimit(Pa):" Width="130"/>
+                                                <Label Content="BPLimit(Torr):" Width="130"/>
                                             </Border>
                                              <TextBox  Tag="None"  IsReadOnly="True"    Text="{Binding LeakCheckBasePressureLimit ,UpdateSourceTrigger=PropertyChanged}" Width="235"/>
                                         </StackPanel>
@@ -380,14 +380,14 @@
 
                                 <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
                                     <Border>
-                                        <Label Content="Monitor Pressure(Pa):" Width="160" />
+                                        <Label Content="Monitor Pressure(Torr):" Width="170" />
                                     </Border>
                                      <TextBox  Tag="None"  IsReadOnly="True"    Text="{Binding LeakCheckDelayMonitorPressure ,UpdateSourceTrigger=PropertyChanged}" Width="220" Margin="0"/>
                                 </StackPanel>
 
                                 <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
                                     <Border>
-                                        <Label Content="Start Pressure(Pa):" Width="160" />
+                                        <Label Content="Start Pressure(Torr):" Width="170" />
                                     </Border>
                                      <TextBox  Tag="None"  IsReadOnly="True"    Text="{Binding LeakCheckDelayStartPressure ,UpdateSourceTrigger=PropertyChanged}" Width="220" Margin="0"/>
                                 </StackPanel>
@@ -416,7 +416,7 @@
                                     <StackPanel Orientation="Vertical">
                                         <StackPanel Orientation="Horizontal">
                                             <Border>
-                                                <Label Content="Leak Limit(Pa):" Width="130"/>
+                                                <Label Content="Leak Limit(Torr):" Width="130"/>
                                             </Border>
                                              <TextBox  Tag="None"  IsReadOnly="True"    Text="{Binding LeakCheckLeakLimit ,UpdateSourceTrigger=PropertyChanged}" Width="235"/>
                                         </StackPanel>
@@ -432,21 +432,21 @@
 
                                 <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
                                     <Border>
-                                        <Label Content="Actual(Pa):" Width="160" />
+                                        <Label Content="Actual(Torr):" Width="160" />
                                     </Border>
                                      <TextBox  Tag="None"  IsReadOnly="True"    Text="{Binding LeakCheckActualLeak ,UpdateSourceTrigger=PropertyChanged}" Width="220" Margin="0"/>
                                 </StackPanel>
 
                                 <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
                                     <Border>
-                                        <Label Content="Monitor Pressure(Pa):" Width="160" />
+                                        <Label Content="Monitor Pressure(Torr):" Width="160" />
                                     </Border>
                                      <TextBox  Tag="None"  IsReadOnly="True"    Text="{Binding LeakCheckMonitorPressure ,UpdateSourceTrigger=PropertyChanged}"  Width="220" Margin="0"/>
                                 </StackPanel>
 
                                 <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
                                     <Border>
-                                        <Label Content="Start Pressure(Pa):" Width="160" />
+                                        <Label Content="Start Pressure(Torr):" Width="160" />
                                     </Border>
                                      <TextBox  Tag="None"  IsReadOnly="True"    Text="{Binding LeakCheckStartPressure ,UpdateSourceTrigger=PropertyChanged}" Width="220" Margin="0"/>
                                 </StackPanel>

Furnace/FurnaceUI/Views/Operations/PressureDetailViewModel.cs

@@ -53,7 +53,10 @@ namespace FurnaceUI.Views.Operations
 
         [Subscription("PM1.APC.DeviceData")]
         public AITAPCData APCData { get; set; }
-
+        [Subscription("PM1.APC.Pressure1Feedback")]
+        public float Pressure1Feedback { get; set; }
+        [Subscription("PM1.APC.Pressure2Feedback")]
+        public float Pressure2Feedback { get; set; }
         public PressureDetailViewModel()
         {
             DefaultUnit = (string)QueryDataClient.Instance.Service.GetConfig($"PM1.APC.PressureUnit");