Browse Source

将钟摆阀最大值设到1000

lixiang 2 years ago
parent
commit
7c817b8450

+ 1 - 5
Venus/Venus_MainPages/ViewModels/ButterflyValveViewModel.cs

@@ -73,10 +73,6 @@ namespace Venus_MainPages.ViewModels
             timer.Start();
             timer.Start();
         }
         }
 
 
-        ~ButterflyValveViewModel()
-        {
-
-        }
         #region 命令方法
         #region 命令方法
         private void OnSet()
         private void OnSet()
         {
         {
@@ -97,7 +93,7 @@ namespace Venus_MainPages.ViewModels
             if (IsPositionMode == true)
             if (IsPositionMode == true)
             {
             {
                 FeedBackValue = (int)RtDataValues[$"{ModuleName}.PendulumValve.Position"];
                 FeedBackValue = (int)RtDataValues[$"{ModuleName}.PendulumValve.Position"];
-                SetValue = SetValue > 100 ? 100 : SetValue;
+                SetValue = (SetValue > 1000||SetValue<0) ? 0 : SetValue;
             }
             }
             else
             else
             { 
             { 

+ 4 - 4
Venus/Venus_MainPages/ViewModels/OverViewModel.cs

@@ -60,8 +60,6 @@ namespace Venus_MainPages.ViewModels
         private float m_BRFFwdPowerSetpoint;
         private float m_BRFFwdPowerSetpoint;
 
 
 
 
-        //ValveTurboPumpPumping
-        //m_RtDataKeys.Add($"{ModuleName}.PVHe1Valve.IsOpen");
 
 
 
 
 
 
@@ -702,7 +700,7 @@ namespace Venus_MainPages.ViewModels
             SRFIsOn = (bool)RtDataValues[$"{ModuleName}.SRfIsOn"];
             SRFIsOn = (bool)RtDataValues[$"{ModuleName}.SRfIsOn"];
 
 
 
 
-            PositionValue = -((int)(((int)RtDataValues[$"{ModuleName}.GetPVPosition"]) * 0.9));
+            PositionValue = -((int)(((int)RtDataValues[$"{ModuleName}.GetPVPosition"]) * 0.09));
 
 
 
 
 
 
@@ -748,7 +746,9 @@ namespace Venus_MainPages.ViewModels
 
 
 
 
             m_RtDataKeys.Add($"{ModuleName}.ForelinePressure");
             m_RtDataKeys.Add($"{ModuleName}.ForelinePressure");
-            m_RtDataKeys.Add($"{ModuleName}.ProcessPressure");
+            m_RtDataKeys.Add($"{ModuleName}.ProcessHighPressure");
+            m_RtDataKeys.Add($"{ModuleName}.ProcessLowPressure");
+
             m_RtDataKeys.Add($"{ModuleName}.ChamberPressure");
             m_RtDataKeys.Add($"{ModuleName}.ChamberPressure");
             m_RtDataKeys.Add($"{ModuleName}.ESCHePressure");
             m_RtDataKeys.Add($"{ModuleName}.ESCHePressure");
 
 

+ 1 - 1
Venus/Venus_MainPages/Views/ButterflyValveView.xaml

@@ -56,7 +56,7 @@
         <Label Grid.Row="3" Grid.Column="2" VerticalContentAlignment="Bottom" Content="{Binding FeedBackValue}"   Width="150"  FontSize="13" FontFamily="Arial,SimSun" Height="28" BorderThickness="0,0,0,1" BorderBrush="Black"/>
         <Label Grid.Row="3" Grid.Column="2" VerticalContentAlignment="Bottom" Content="{Binding FeedBackValue}"   Width="150"  FontSize="13" FontFamily="Arial,SimSun" Height="28" BorderThickness="0,0,0,1" BorderBrush="Black"/>
 
 
         <!--<TextBox Grid.Row="5" Grid.Column="2" x:Name="inputBoxPosition" BorderBrush="Green" BorderThickness="0,0,0,1"  Width="150" HorizontalAlignment="Left" FontSize="13" FontFamily="Arial,SimSun" Height="30" VerticalContentAlignment="Center"/>-->
         <!--<TextBox Grid.Row="5" Grid.Column="2" x:Name="inputBoxPosition" BorderBrush="Green" BorderThickness="0,0,0,1"  Width="150" HorizontalAlignment="Left" FontSize="13" FontFamily="Arial,SimSun" Height="30" VerticalContentAlignment="Center"/>-->
-        <TextBox Grid.Row="4" Grid.Column="2"   Text="{Binding SetValue,UpdateSourceTrigger=PropertyChanged}" Width="150" HorizontalAlignment="Left" FontSize="13" FontFamily="Arial,SimSun" Height="30" VerticalContentAlignment="Center" BorderThickness="0,0,0,1" BorderBrush="Black"/>
+        <TextBox Grid.Row="4" Grid.Column="2"   Text="{Binding SetValue,UpdateSourceTrigger=PropertyChanged}" Width="150" HorizontalAlignment="Left" FontSize="13" FontFamily="Arial,SimSun" Height="30" VerticalContentAlignment="Top"  BorderThickness="0,0,0,1" BorderBrush="Black"/>
 
 
         <Button Grid.Row="5" Grid.Column="1"  Content="Set" x:Name="buttonSet" Width="80" Height="26" VerticalAlignment="Top"  Margin="5,3,0,0" Command="{Binding SetCommand}"/>
         <Button Grid.Row="5" Grid.Column="1"  Content="Set" x:Name="buttonSet" Width="80" Height="26" VerticalAlignment="Top"  Margin="5,3,0,0" Command="{Binding SetCommand}"/>
         <Button Grid.Row="5" Grid.Column="2" Content="Cancel"  Width="80" Height="26" VerticalAlignment="Top" Margin="44,3,0,0" />
         <Button Grid.Row="5" Grid.Column="2" Content="Cancel"  Width="80" Height="26" VerticalAlignment="Top" Margin="44,3,0,0" />

+ 40 - 82
Venus/Venus_MainPages/Views/OverView.xaml

@@ -44,12 +44,10 @@
                 </MultiBinding>
                 </MultiBinding>
             </ctrls:FlowPipe.IsFlowing>
             </ctrls:FlowPipe.IsFlowing>
         </ctrls:FlowPipe>
         </ctrls:FlowPipe>
-        <TextBlock Text="Vent Valve" Canvas.Left="410" Canvas.Top="98"/>
+        <TextBlock Text="Vent Valve" Canvas.Left="416" Canvas.Top="98"/>
 
 
         <customControls:CommonValveControl Status="{Binding N2ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="436" Canvas.Top="114"/>
         <customControls:CommonValveControl Status="{Binding N2ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="436" Canvas.Top="114"/>
 
 
-        <!--<ctrls:Pipe3 Canvas.Left="477.5" Canvas.Top="120" RotateTransformValue="-90" />-->
-
         <ctrls:FlowPipe x:Name="N2Pipe1"  Height="8"  Width="193" Canvas.Left="64"  Canvas.Top="120">
         <ctrls:FlowPipe x:Name="N2Pipe1"  Height="8"  Width="193" Canvas.Left="64"  Canvas.Top="120">
             <ctrls:FlowPipe.IsFlowing>
             <ctrls:FlowPipe.IsFlowing>
                 <MultiBinding Converter="{StaticResource toBoolMultiValueConverter3}">
                 <MultiBinding Converter="{StaticResource toBoolMultiValueConverter3}">
@@ -71,15 +69,15 @@
 
 
 
 
 
 
-        <ctrls:FlowPipe Name="f9"  Height="8"  Width="308" Canvas.Left="176" Canvas.Top="230" IsFlowing="{Binding MFC1ValveIsOpen}"/>
+        <ctrls:FlowPipe   Height="8"  Width="308" Canvas.Left="176" Canvas.Top="230" IsFlowing="{Binding MFC1ValveIsOpen}"/>
 
 
         <TextBlock Text="V1" Canvas.Left="438" Canvas.Top="208"/>
         <TextBlock Text="V1" Canvas.Left="438" Canvas.Top="208"/>
 
 
         <customControls:CommonValveControl Status="{Binding MFC1ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="436" Canvas.Top="224"/>
         <customControls:CommonValveControl Status="{Binding MFC1ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="436" Canvas.Top="224"/>
 
 
 
 
-        <ctrls:FlowPipe  Name="Gas1Pipe1" Height="8"  Width="114" Canvas.Left="64"  Canvas.Top="230" IsFlowing="{Binding PV11ValveIsOpen}"/>
-        <!--<ctrls:Pipe3 Canvas.Left="197" Canvas.Top="230" RotateTransformValue="-90"/>-->
+        <ctrls:FlowPipe   Height="8"  Width="114" Canvas.Left="64"  Canvas.Top="230" IsFlowing="{Binding PV11ValveIsOpen}"/>
+       
         <ctrls:FlowPipe   Height="8"  Width="86" Canvas.Left="171"  Canvas.Top="266" IsFlowing="{Binding PV12ValveIsOpen}"/>
         <ctrls:FlowPipe   Height="8"  Width="86" Canvas.Left="171"  Canvas.Top="266" IsFlowing="{Binding PV12ValveIsOpen}"/>
         <!--<ctrls:Pipe2 Canvas.Left="214" Canvas.Top="274" RotateTransformValue="-180"/>-->
         <!--<ctrls:Pipe2 Canvas.Left="214" Canvas.Top="274" RotateTransformValue="-180"/>-->
         <ctrls:FlowPipe   Height="8"  Width="35" Canvas.Left="178"  Canvas.Top="236" RotateTransformValue="90" IsFlowing="{Binding PV12ValveIsOpen}"/>
         <ctrls:FlowPipe   Height="8"  Width="35" Canvas.Left="178"  Canvas.Top="236" RotateTransformValue="90" IsFlowing="{Binding PV12ValveIsOpen}"/>
@@ -95,13 +93,13 @@
         </ctrls:FlowPipe>
         </ctrls:FlowPipe>
 
 
         <!--SF6-->
         <!--SF6-->
-        <ctrls:FlowPipe Name="f2"  Height="8"  Width="310" Canvas.Left="174"  Canvas.Top="286" IsFlowing="{Binding MFC2ValveIsOpen}"/>
+        <ctrls:FlowPipe   Height="8"  Width="310" Canvas.Left="174"  Canvas.Top="286" IsFlowing="{Binding MFC2ValveIsOpen}"/>
         <TextBlock Text="V2" Canvas.Left="438" Canvas.Top="264"/>
         <TextBlock Text="V2" Canvas.Left="438" Canvas.Top="264"/>
 
 
         <customControls:CommonValveControl Status="{Binding MFC2ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="436" Canvas.Top="280"/>
         <customControls:CommonValveControl Status="{Binding MFC2ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="436" Canvas.Top="280"/>
 
 
 
 
-        <ctrls:FlowPipe x:Name="Gas2Pipe1"  Height="8"  Width="112" Canvas.Left="64"  Canvas.Top="286" IsFlowing="{Binding PV21ValveIsOpen}"/>
+        <ctrls:FlowPipe   Height="8"  Width="112" Canvas.Left="64"  Canvas.Top="286" IsFlowing="{Binding PV21ValveIsOpen}"/>
 
 
         <ctrls:FlowPipe   Height="8"  Width="86" Canvas.Left="171"  Canvas.Top="322" IsFlowing="{Binding PV22ValveIsOpen}"/>
         <ctrls:FlowPipe   Height="8"  Width="86" Canvas.Left="171"  Canvas.Top="322" IsFlowing="{Binding PV22ValveIsOpen}"/>
 
 
@@ -117,14 +115,14 @@
         </ctrls:FlowPipe>
         </ctrls:FlowPipe>
 
 
         <!--Gas3-->
         <!--Gas3-->
-        <ctrls:FlowPipe Name="f3"  Height="8"  Width="310" Canvas.Left="174"  Canvas.Top="342" IsFlowing="{Binding MFC3ValveIsOpen}"/>
+        <ctrls:FlowPipe  Height="8"  Width="310" Canvas.Left="174"  Canvas.Top="342" IsFlowing="{Binding MFC3ValveIsOpen}"/>
 
 
         <TextBlock Text="V3" Canvas.Left="436" Canvas.Top="320"/>
         <TextBlock Text="V3" Canvas.Left="436" Canvas.Top="320"/>
 
 
         <customControls:CommonValveControl Status="{Binding MFC3ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="436" Canvas.Top="336"/>
         <customControls:CommonValveControl Status="{Binding MFC3ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="436" Canvas.Top="336"/>
 
 
 
 
-        <ctrls:FlowPipe x:Name="Gas3Pipe1"  Height="8"  Width="112" Canvas.Left="64"  Canvas.Top="342" IsFlowing="{Binding PV31ValveIsOpen}"/>
+        <ctrls:FlowPipe   Height="8"  Width="112" Canvas.Left="64"  Canvas.Top="342" IsFlowing="{Binding PV31ValveIsOpen}"/>
 
 
         <ctrls:FlowPipe   Height="8"  Width="86" Canvas.Left="171"  Canvas.Top="378" IsFlowing="{Binding PV32ValveIsOpen}"/>
         <ctrls:FlowPipe   Height="8"  Width="86" Canvas.Left="171"  Canvas.Top="378" IsFlowing="{Binding PV32ValveIsOpen}"/>
         <ctrls:FlowPipe   Height="8"  Width="35" Canvas.Left="178"  Canvas.Top="348" RotateTransformValue="90" IsFlowing="{Binding PV32ValveIsOpen}"/>
         <ctrls:FlowPipe   Height="8"  Width="35" Canvas.Left="178"  Canvas.Top="348" RotateTransformValue="90" IsFlowing="{Binding PV32ValveIsOpen}"/>
@@ -141,17 +139,13 @@
 
 
 
 
         <!--Gas4-->
         <!--Gas4-->
-        <ctrls:FlowPipe x:Name="Gas4Pipe1"  Height="8"  Width="112" Canvas.Left="64"  Canvas.Top="396" IsFlowing="{Binding PV41ValveIsOpen}"/>
-        <!--<ctrls:Pipe3 Canvas.Left="197" Canvas.Top="396" RotateTransformValue="-90"/>-->
-        <!--<ctrls:Pipe2 Canvas.Left="214" Canvas.Top="436" RotateTransformValue="-180"/>-->
+        <ctrls:FlowPipe   Height="8"  Width="112" Canvas.Left="64"  Canvas.Top="396" IsFlowing="{Binding PV41ValveIsOpen}"/>
         <ctrls:FlowPipe   Height="8"  Width="86" Canvas.Left="171"  Canvas.Top="428" IsFlowing="{Binding PV42ValveIsOpen}"/>
         <ctrls:FlowPipe   Height="8"  Width="86" Canvas.Left="171"  Canvas.Top="428" IsFlowing="{Binding PV42ValveIsOpen}"/>
-        <!--<ctrls:Pipe2 Canvas.Left="257" Canvas.Top="423" RotateTransformValue="90"/>-->
-        <ctrls:FlowPipe Name="f4"  Height="8"  Width="310" Canvas.Left="174"  Canvas.Top="396" IsFlowing="{Binding MFC4ValveIsOpen}"/>
+        <ctrls:FlowPipe   Height="8"  Width="310" Canvas.Left="174"  Canvas.Top="396" IsFlowing="{Binding MFC4ValveIsOpen}"/>
 
 
         <TextBlock Text="V4" Canvas.Left="436" Canvas.Top="374"/>
         <TextBlock Text="V4" Canvas.Left="436" Canvas.Top="374"/>
         <customControls:CommonValveControl Status="{Binding MFC4ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"   Canvas.Left="436" Canvas.Top="390"/>
         <customControls:CommonValveControl Status="{Binding MFC4ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"   Canvas.Left="436" Canvas.Top="390"/>
 
 
-        <!--<ctrls:Pipe3 Canvas.Left="474" Canvas.Top="392" />-->
         <ctrls:FlowPipe   Height="8"  Width="54" Canvas.Left="257"  Canvas.Top="380" RotateTransformValue="90" IsReverse="True">
         <ctrls:FlowPipe   Height="8"  Width="54" Canvas.Left="257"  Canvas.Top="380" RotateTransformValue="90" IsReverse="True">
             <ctrls:FlowPipe.IsFlowing>
             <ctrls:FlowPipe.IsFlowing>
                 <MultiBinding Converter="{StaticResource toBoolMultiValueConverter2}">
                 <MultiBinding Converter="{StaticResource toBoolMultiValueConverter2}">
@@ -163,26 +157,26 @@
 
 
 
 
         <!--Gas5-->
         <!--Gas5-->
-        <ctrls:FlowPipe Name="f5"  Height="8"  Width="419" Canvas.Left="64"  Canvas.Top="452" IsFlowing="{Binding MFC5ValveIsOpen}"/>
+        <ctrls:FlowPipe   Height="8"  Width="419" Canvas.Left="64"  Canvas.Top="452" IsFlowing="{Binding MFC5ValveIsOpen}"/>
         <TextBlock Text="V5" Canvas.Left="438" Canvas.Top="430"/>
         <TextBlock Text="V5" Canvas.Left="438" Canvas.Top="430"/>
         <customControls:CommonValveControl Status="{Binding MFC5ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"   Canvas.Left="436" Canvas.Top="446"/>
         <customControls:CommonValveControl Status="{Binding MFC5ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"   Canvas.Left="436" Canvas.Top="446"/>
 
 
 
 
         <!--O2-->
         <!--O2-->
-        <ctrls:FlowPipe Name="f6"  Height="8"  Width="419" Canvas.Left="65"  Canvas.Top="507" IsFlowing="{Binding MFC6ValveIsOpen}"/>
+        <ctrls:FlowPipe  Height="8"  Width="419" Canvas.Left="65"  Canvas.Top="507" IsFlowing="{Binding MFC6ValveIsOpen}"/>
         <TextBlock Text="V6" Canvas.Left="438" Canvas.Top="485"/>
         <TextBlock Text="V6" Canvas.Left="438" Canvas.Top="485"/>
         <customControls:CommonValveControl Status="{Binding MFC6ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"   Canvas.Left="436" Canvas.Top="501"/>
         <customControls:CommonValveControl Status="{Binding MFC6ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"   Canvas.Left="436" Canvas.Top="501"/>
 
 
      
      
 
 
         <!--Gas7-->
         <!--Gas7-->
-        <ctrls:FlowPipe Name="f7"  Height="8"  Width="418" Canvas.Left="65"  Canvas.Top="563" IsFlowing="{Binding MFC7ValveIsOpen}"/>
+        <ctrls:FlowPipe   Height="8"  Width="418" Canvas.Left="65"  Canvas.Top="563" IsFlowing="{Binding MFC7ValveIsOpen}"/>
         <TextBlock Text="V7" Canvas.Left="438" Canvas.Top="541"/>
         <TextBlock Text="V7" Canvas.Left="438" Canvas.Top="541"/>
         <customControls:CommonValveControl Status="{Binding MFC7ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="436" Canvas.Top="557"/>
         <customControls:CommonValveControl Status="{Binding MFC7ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="436" Canvas.Top="557"/>
 
 
 
 
         <!--Gas8-->
         <!--Gas8-->
-        <ctrls:FlowPipe Name="f8"  Height="8"  Width="412" Canvas.Left="68"  Canvas.Top="620" IsFlowing="{Binding MFC8ValveIsOpen}"/>
+        <ctrls:FlowPipe  Height="8"  Width="412" Canvas.Left="68"  Canvas.Top="620" IsFlowing="{Binding MFC8ValveIsOpen}"/>
         <TextBlock Text="V8" Canvas.Left="438" Canvas.Top="598"/>
         <TextBlock Text="V8" Canvas.Left="438" Canvas.Top="598"/>
         <customControls:CommonValveControl Status="{Binding MFC8ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="436" Canvas.Top="614"/>
         <customControls:CommonValveControl Status="{Binding MFC8ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="436" Canvas.Top="614"/>
 
 
@@ -192,7 +186,7 @@
 
 
 
 
         <!--与chamber上方连接的管道-->
         <!--与chamber上方连接的管道-->
-        <ctrls:FlowPipe Name="finalPipe1" Height="8"  Width="664" Canvas.Left="482" Canvas.Top="120">
+        <ctrls:FlowPipe  Height="8"  Width="664" Canvas.Left="482" Canvas.Top="120">
             <ctrls:FlowPipe.IsFlowing>
             <ctrls:FlowPipe.IsFlowing>
                 <MultiBinding Converter="{StaticResource toBoolMultiValueConverter4}">
                 <MultiBinding Converter="{StaticResource toBoolMultiValueConverter4}">
                     <Binding Path="GasFinalValveIsOpen"/>
                     <Binding Path="GasFinalValveIsOpen"/>
@@ -208,41 +202,24 @@
                 </MultiBinding>
                 </MultiBinding>
             </ctrls:FlowPipe.IsFlowing>
             </ctrls:FlowPipe.IsFlowing>
         </ctrls:FlowPipe>
         </ctrls:FlowPipe>
-        <!--<ctrls:FlowPipeValve x:Name="GasFinalValve"  Height="20" Width="24" Canvas.Left="1086" Canvas.Top="110" IsOpen="{Binding GasFinalValveIsOpen,Mode=TwoWay}"/>-->
+       
         <TextBlock Text="Gas Final" Canvas.Left="1064" Canvas.Top="96" FontSize="15"/>
         <TextBlock Text="Gas Final" Canvas.Left="1064" Canvas.Top="96" FontSize="15"/>
         <customControls:CommonValveControl Status="{Binding GasFinalValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20" Canvas.Left="1086" Canvas.Top="114"/>
         <customControls:CommonValveControl Status="{Binding GasFinalValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20" Canvas.Left="1086" Canvas.Top="114"/>
 
 
         <ctrls:Pipe2    Canvas.Left="1144" Canvas.Top="120" HorizontalAlignment="Left" VerticalAlignment="Top"  />
         <ctrls:Pipe2    Canvas.Left="1144" Canvas.Top="120" HorizontalAlignment="Left" VerticalAlignment="Top"  />
 
 
-
-
-        <!--<ctrls:CustomSwitch    Height="20" Value="  SRF ON/OFF  " Canvas.Left="500" Canvas.Top="325" />-->
         <Ellipse Width="20" Height="20" Fill="{Binding SRFIsOn,Converter={StaticResource boolToColor}}"  Canvas.Left="500" Canvas.Top="325"/>
         <Ellipse Width="20" Height="20" Fill="{Binding SRFIsOn,Converter={StaticResource boolToColor}}"  Canvas.Left="500" Canvas.Top="325"/>
         <Button Height="20" Width="100" Content="SRF ON/OFF" Canvas.Left="530" Canvas.Top="325" Command="{Binding SetSRfCommand}"  Background="Gray"/>
         <Button Height="20" Width="100" Content="SRF ON/OFF" Canvas.Left="530" Canvas.Top="325" Command="{Binding SetSRfCommand}"  Background="Gray"/>
-        <!--<ctrls:CustomSwitch   Height="20" Value="  BRF ON/OFF  " Canvas.Left="671" Canvas.Top="325" />-->
         <Ellipse Width="20" Height="20" Fill="{Binding BRFIsOn,Converter={StaticResource boolToColor}}"  Canvas.Left="650" Canvas.Top="325"/>
         <Ellipse Width="20" Height="20" Fill="{Binding BRFIsOn,Converter={StaticResource boolToColor}}"  Canvas.Left="650" Canvas.Top="325"/>
         <Button Height="20" Width="100" Content="BRF ON/OFF" Canvas.Left="680" Canvas.Top="325" Command="{Binding SetBRfCommand}"  Background="Gray"/>
         <Button Height="20" Width="100" Content="BRF ON/OFF" Canvas.Left="680" Canvas.Top="325" Command="{Binding SetBRfCommand}"  Background="Gray"/>
-        <!--<ctrls:CustomSwitch   Height="20" Value="  Gas ON/OFF  " Canvas.Left="500" Canvas.Top="590" />-->
         <Button Content="Gas SetPoint" Canvas.Left="510" Canvas.Top="590" Background="Gray" Command="{Binding GasSetPointCommand}"/>
         <Button Content="Gas SetPoint" Canvas.Left="510" Canvas.Top="590" Background="Gray" Command="{Binding GasSetPointCommand}"/>
-        <!--<ctrls:CustomSwitch   Height="20" Value="   HV ON/OFF   " Canvas.Left="1280" Canvas.Top="316" />-->
-        <Button Height="20" Width="60" Content="HV Set" Canvas.Left="1300" Canvas.Top="316" Command="{Binding HVSetCommand}"  Background="Gray"/>
-
+        <Button Height="20"  Content="HV SetPoint" Canvas.Left="1290" Canvas.Top="316" Command="{Binding HVSetCommand}"  Background="Gray"/>
         <Ellipse Width="20" Height="20" Fill="{Binding HVIsOn,Converter={StaticResource boolToColor}}"  Canvas.Left="1380" Canvas.Top="316"/>
         <Ellipse Width="20" Height="20" Fill="{Binding HVIsOn,Converter={StaticResource boolToColor}}"  Canvas.Left="1380" Canvas.Top="316"/>
         <Button Height="20" Width="100" Content="HV ON/OFF" Canvas.Left="1410" Canvas.Top="316" Command="{Binding HVCommand}" CommandParameter="True" Background="Gray"/>
         <Button Height="20" Width="100" Content="HV ON/OFF" Canvas.Left="1410" Canvas.Top="316" Command="{Binding HVCommand}" CommandParameter="True" Background="Gray"/>
-        <!--<ctrls:CustomSwitch  IsOpen="{Binding RtDataValues[PMA.LiftPinIsUp]}"  Height="20" Value="    Pin Up     " Canvas.Left="1080" Canvas.Top="466"  />-->
         <Ellipse Width="20" Height="20" Fill="{Binding RtDataValues[PMA.LiftPinIsUp],Converter={StaticResource boolToColor}}"  Canvas.Left="1065" Canvas.Top="466"/>
         <Ellipse Width="20" Height="20" Fill="{Binding RtDataValues[PMA.LiftPinIsUp],Converter={StaticResource boolToColor}}"  Canvas.Left="1065" Canvas.Top="466"/>
         <Button Height="20" Width="100" Content="Pin Up" Canvas.Left="1100" Canvas.Top="466" Command="{Binding PinUpDownCommand}" CommandParameter="True" Background="Gray"/>
         <Button Height="20" Width="100" Content="Pin Up" Canvas.Left="1100" Canvas.Top="466" Command="{Binding PinUpDownCommand}" CommandParameter="True" Background="Gray"/>
-        <!--<ctrls:CustomSwitch  IsOpen="{Binding RtDataValues[PMA.LiftPinIsDown]}"  Height="20" Value="  Pin Down  " Canvas.Left="1080" Canvas.Top="490" />-->
         <Ellipse Width="20" Height="20" Fill="{Binding RtDataValues[PMA.LiftPinIsDown],Converter={StaticResource boolToColor}}" Canvas.Left="1065" Canvas.Top="490"/>
         <Ellipse Width="20" Height="20" Fill="{Binding RtDataValues[PMA.LiftPinIsDown],Converter={StaticResource boolToColor}}" Canvas.Left="1065" Canvas.Top="490"/>
         <Button Height="20" Width="100" Content="Pin Down" Canvas.Left="1100" Canvas.Top="490" Command="{Binding PinUpDownCommand}" CommandParameter="False" Background="Gray"/>
         <Button Height="20" Width="100" Content="Pin Down" Canvas.Left="1100" Canvas.Top="490" Command="{Binding PinUpDownCommand}" CommandParameter="False" Background="Gray"/>
-
-
-
-
-
-
-
-
         <ctrls:FlowPipe Name="l8" Height="8"  Width="56" Canvas.Left="490" Canvas.Top="126"  RotateTransformValue="90" IsReverse="True">
         <ctrls:FlowPipe Name="l8" Height="8"  Width="56" Canvas.Left="490" Canvas.Top="126"  RotateTransformValue="90" IsReverse="True">
             <ctrls:FlowPipe.IsFlowing>
             <ctrls:FlowPipe.IsFlowing>
                 <MultiBinding Converter="{StaticResource toBoolMultiValueConverter2}">
                 <MultiBinding Converter="{StaticResource toBoolMultiValueConverter2}">
@@ -257,7 +234,7 @@
                 </MultiBinding>
                 </MultiBinding>
             </ctrls:FlowPipe.IsFlowing>
             </ctrls:FlowPipe.IsFlowing>
         </ctrls:FlowPipe>
         </ctrls:FlowPipe>
-        <ctrls:FlowPipe Name="l1" Height="8"  Width="56" Canvas.Left="490" Canvas.Top="180"  RotateTransformValue="90" IsReverse="True">
+        <ctrls:FlowPipe  Height="8"  Width="56" Canvas.Left="490" Canvas.Top="180"  RotateTransformValue="90" IsReverse="True">
             <ctrls:FlowPipe.IsFlowing>
             <ctrls:FlowPipe.IsFlowing>
                 <MultiBinding Converter="{StaticResource toBoolMultiValueConverter2}">
                 <MultiBinding Converter="{StaticResource toBoolMultiValueConverter2}">
                     <Binding Path="MFC1ValveIsOpen"/>
                     <Binding Path="MFC1ValveIsOpen"/>
@@ -271,7 +248,7 @@
                 </MultiBinding>
                 </MultiBinding>
             </ctrls:FlowPipe.IsFlowing>
             </ctrls:FlowPipe.IsFlowing>
         </ctrls:FlowPipe>
         </ctrls:FlowPipe>
-        <ctrls:FlowPipe Name="l9" Height="8"  Width="58" Canvas.Left="490" Canvas.Top="234"  RotateTransformValue="90" IsReverse="True">
+        <ctrls:FlowPipe  Height="8"  Width="58" Canvas.Left="490" Canvas.Top="234"  RotateTransformValue="90" IsReverse="True">
             <ctrls:FlowPipe.IsFlowing>
             <ctrls:FlowPipe.IsFlowing>
                 <MultiBinding Converter="{StaticResource toBoolMultiValueConverter2}">
                 <MultiBinding Converter="{StaticResource toBoolMultiValueConverter2}">
                     <Binding Path="MFC2ValveIsOpen"/>
                     <Binding Path="MFC2ValveIsOpen"/>
@@ -284,7 +261,7 @@
                 </MultiBinding>
                 </MultiBinding>
             </ctrls:FlowPipe.IsFlowing>
             </ctrls:FlowPipe.IsFlowing>
         </ctrls:FlowPipe>
         </ctrls:FlowPipe>
-        <ctrls:FlowPipe Name="l2" Height="8"  Width="56" Canvas.Left="490" Canvas.Top="290"  RotateTransformValue="90" IsReverse="True">
+        <ctrls:FlowPipe  Height="8"  Width="56" Canvas.Left="490" Canvas.Top="290"  RotateTransformValue="90" IsReverse="True">
             <ctrls:FlowPipe.IsFlowing>
             <ctrls:FlowPipe.IsFlowing>
                 <MultiBinding Converter="{StaticResource toBoolMultiValueConverter2}">
                 <MultiBinding Converter="{StaticResource toBoolMultiValueConverter2}">
                     <Binding Path="MFC3ValveIsOpen"/>
                     <Binding Path="MFC3ValveIsOpen"/>
@@ -296,7 +273,7 @@
                 </MultiBinding>
                 </MultiBinding>
             </ctrls:FlowPipe.IsFlowing>
             </ctrls:FlowPipe.IsFlowing>
         </ctrls:FlowPipe>
         </ctrls:FlowPipe>
-        <ctrls:FlowPipe Name="l3" Height="8"  Width="58" Canvas.Left="490" Canvas.Top="344" RotateTransformValue="90" IsReverse="True">
+        <ctrls:FlowPipe  Height="8"  Width="58" Canvas.Left="490" Canvas.Top="344" RotateTransformValue="90" IsReverse="True">
             <ctrls:FlowPipe.IsFlowing>
             <ctrls:FlowPipe.IsFlowing>
                 <MultiBinding Converter="{StaticResource toBoolMultiValueConverter2}">
                 <MultiBinding Converter="{StaticResource toBoolMultiValueConverter2}">
                     <Binding Path="MFC4ValveIsOpen"/>
                     <Binding Path="MFC4ValveIsOpen"/>
@@ -307,7 +284,7 @@
                 </MultiBinding>
                 </MultiBinding>
             </ctrls:FlowPipe.IsFlowing>
             </ctrls:FlowPipe.IsFlowing>
         </ctrls:FlowPipe>
         </ctrls:FlowPipe>
-        <ctrls:FlowPipe Name="l4" Height="8"  Width="58" Canvas.Left="490" Canvas.Top="400" RotateTransformValue="90" IsReverse="True">
+        <ctrls:FlowPipe  Height="8"  Width="58" Canvas.Left="490" Canvas.Top="400" RotateTransformValue="90" IsReverse="True">
             <ctrls:FlowPipe.IsFlowing>
             <ctrls:FlowPipe.IsFlowing>
                 <MultiBinding Converter="{StaticResource toBoolMultiValueConverter2}">
                 <MultiBinding Converter="{StaticResource toBoolMultiValueConverter2}">
                     <Binding Path="MFC5ValveIsOpen"/>
                     <Binding Path="MFC5ValveIsOpen"/>
@@ -317,7 +294,7 @@
                 </MultiBinding>
                 </MultiBinding>
             </ctrls:FlowPipe.IsFlowing>
             </ctrls:FlowPipe.IsFlowing>
         </ctrls:FlowPipe>
         </ctrls:FlowPipe>
-        <ctrls:FlowPipe Name="l5" Height="8"  Width="58" Canvas.Left="490" Canvas.Top="456" RotateTransformValue="90" IsReverse="True">
+        <ctrls:FlowPipe  Height="8"  Width="58" Canvas.Left="490" Canvas.Top="456" RotateTransformValue="90" IsReverse="True">
             <ctrls:FlowPipe.IsFlowing>
             <ctrls:FlowPipe.IsFlowing>
                 <MultiBinding Converter="{StaticResource toBoolMultiValueConverter2}">
                 <MultiBinding Converter="{StaticResource toBoolMultiValueConverter2}">
                     <Binding Path="MFC6ValveIsOpen"/>
                     <Binding Path="MFC6ValveIsOpen"/>
@@ -326,7 +303,7 @@
                 </MultiBinding>
                 </MultiBinding>
             </ctrls:FlowPipe.IsFlowing>
             </ctrls:FlowPipe.IsFlowing>
         </ctrls:FlowPipe>
         </ctrls:FlowPipe>
-        <ctrls:FlowPipe Name="l6" Height="8"  Width="58" Canvas.Left="490" Canvas.Top="512" RotateTransformValue="90" IsReverse="True">
+        <ctrls:FlowPipe  Height="8"  Width="58" Canvas.Left="490" Canvas.Top="512" RotateTransformValue="90" IsReverse="True">
             <ctrls:FlowPipe.IsFlowing>
             <ctrls:FlowPipe.IsFlowing>
                 <MultiBinding Converter="{StaticResource toBoolMultiValueConverter2}">
                 <MultiBinding Converter="{StaticResource toBoolMultiValueConverter2}">
                     <Binding Path="MFC7ValveIsOpen"/>
                     <Binding Path="MFC7ValveIsOpen"/>
@@ -334,14 +311,14 @@
                 </MultiBinding>
                 </MultiBinding>
             </ctrls:FlowPipe.IsFlowing>
             </ctrls:FlowPipe.IsFlowing>
         </ctrls:FlowPipe>
         </ctrls:FlowPipe>
-        <ctrls:FlowPipe Name="l7" Height="8"  Width="48" Canvas.Left="490" Canvas.Top="568" RotateTransformValue="90" IsReverse="True">
+        <ctrls:FlowPipe  Height="8"  Width="48" Canvas.Left="490" Canvas.Top="568" RotateTransformValue="90" IsReverse="True">
             <ctrls:FlowPipe.IsFlowing>
             <ctrls:FlowPipe.IsFlowing>
                 <MultiBinding Converter="{StaticResource toBoolMultiValueConverter2}">
                 <MultiBinding Converter="{StaticResource toBoolMultiValueConverter2}">
                     <Binding Path="MFC8ValveIsOpen"/>
                     <Binding Path="MFC8ValveIsOpen"/>
                 </MultiBinding>
                 </MultiBinding>
             </ctrls:FlowPipe.IsFlowing>
             </ctrls:FlowPipe.IsFlowing>
         </ctrls:FlowPipe>
         </ctrls:FlowPipe>
-        <ctrls:FlowPipe Name="finalPipe2" Height="8"  Width="70" Canvas.Left="1157" Canvas.Top="129" RotateTransformValue="90">
+        <ctrls:FlowPipe  Height="8"  Width="70" Canvas.Left="1157" Canvas.Top="129" RotateTransformValue="90">
             <ctrls:FlowPipe.IsFlowing>
             <ctrls:FlowPipe.IsFlowing>
                 <MultiBinding Converter="{StaticResource toBoolMultiValueConverter4}">
                 <MultiBinding Converter="{StaticResource toBoolMultiValueConverter4}">
                     <Binding Path="GasFinalValveIsOpen"/>
                     <Binding Path="GasFinalValveIsOpen"/>
@@ -358,13 +335,10 @@
             </ctrls:FlowPipe.IsFlowing>
             </ctrls:FlowPipe.IsFlowing>
         </ctrls:FlowPipe>
         </ctrls:FlowPipe>
 
 
-        <!--pump-->
-        <!--<deviceControl:AITPump Canvas.Top="698" DeviceData="{Binding MainPumpData}" EnableControl="True" IsShowSensor="False" Canvas.Left="1054" />-->
+       
         <ctrls:Pump Canvas.Top="700"  Canvas.Left="1244" Width="35" Height="35" IsOpen="{Binding PumpIsOpen,Mode=TwoWay}">
         <ctrls:Pump Canvas.Top="700"  Canvas.Left="1244" Width="35" Height="35" IsOpen="{Binding PumpIsOpen,Mode=TwoWay}">
             <ctrls:Pump.ContextMenu>
             <ctrls:Pump.ContextMenu>
                 <ContextMenu>
                 <ContextMenu>
-                    <!--<RadioButton Content="Open" Command="{Binding OpenPumpCommand}"     IsChecked="{Binding PumpIsOpen,Mode=OneWay}"/>
-                    <RadioButton Content="Close" Command="{Binding ClosePumpCommand}"   IsChecked="{Binding PumpIsOpen,Converter={StaticResource BoolToBool},Mode=OneWay}"/>-->
                     <MenuItem Header="ON"  Command="{Binding OpenPumpCommand}" IsChecked="{Binding PumpIsOpen,Mode=OneWay}" IsEnabled="{Binding PumpIsOpen,Converter={StaticResource BoolToBool},Mode=OneWay}"/>
                     <MenuItem Header="ON"  Command="{Binding OpenPumpCommand}" IsChecked="{Binding PumpIsOpen,Mode=OneWay}" IsEnabled="{Binding PumpIsOpen,Converter={StaticResource BoolToBool},Mode=OneWay}"/>
                     <MenuItem Header="OFF" Command="{Binding ClosePumpCommand}" IsChecked="{Binding PumpIsOpen,Converter={StaticResource BoolToBool},Mode=OneWay}" IsEnabled="{Binding PumpIsOpen,Mode=OneWay}"/>
                     <MenuItem Header="OFF" Command="{Binding ClosePumpCommand}" IsChecked="{Binding PumpIsOpen,Converter={StaticResource BoolToBool},Mode=OneWay}" IsEnabled="{Binding PumpIsOpen,Mode=OneWay}"/>
                 </ContextMenu>
                 </ContextMenu>
@@ -388,7 +362,6 @@
         <TextBlock Text="V11" Canvas.Left="128" Canvas.Top="208"/>
         <TextBlock Text="V11" Canvas.Left="128" Canvas.Top="208"/>
         <customControls:CommonValveControl Status="{Binding PV11ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="127" Canvas.Top="224"/>
         <customControls:CommonValveControl Status="{Binding PV11ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="127" Canvas.Top="224"/>
 
 
-        <ctrls:FlowPipeValve  x:Name="pumpValve1"  Height="20" Width="24" Canvas.Left="127" Canvas.Top="163" Visibility="Hidden" />
 
 
         <TextBlock Text="V12" Canvas.Left="200" Canvas.Top="243"/>
         <TextBlock Text="V12" Canvas.Left="200" Canvas.Top="243"/>
 
 
@@ -459,8 +432,7 @@
         <ctrls:FlowPipe   Height="8"  Width="198" Canvas.Left="1055"  Canvas.Top="463" RotateTransformValue="90"/>
         <ctrls:FlowPipe   Height="8"  Width="198" Canvas.Left="1055"  Canvas.Top="463" RotateTransformValue="90"/>
         <ctrls:FlowPipe   Height="8"  Width="17"  Canvas.Left="1055"  Canvas.Top="659" RotateTransformValue="90" />
         <ctrls:FlowPipe   Height="8"  Width="17"  Canvas.Left="1055"  Canvas.Top="659" RotateTransformValue="90" />
         <ctrls:FlowPipe   Height="8"  Width="208" Canvas.Left="1057"  Canvas.Top="680" />
         <ctrls:FlowPipe   Height="8"  Width="208" Canvas.Left="1057"  Canvas.Top="680" />
-        <!--<ctrls:FlowPipe   Height="8"  Width="20" Canvas.Left="1246"  Canvas.Top="592" RotateTransformValue="90"/>-->
-        <ctrls:FlowPipe x:Name="roughPumpPipe1"  Height="8"  Width="20" Canvas.Left="1266"  Canvas.Top="682" RotateTransformValue="90">
+        <ctrls:FlowPipe   Height="8"  Width="20" Canvas.Left="1266"  Canvas.Top="682" RotateTransformValue="90">
             <ctrls:FlowPipe.IsFlowing>
             <ctrls:FlowPipe.IsFlowing>
                 <MultiBinding Converter="{StaticResource toBoolMultiValueConverter2}">
                 <MultiBinding Converter="{StaticResource toBoolMultiValueConverter2}">
                     <Binding Path="SoftPumpValveIsOpen"/>
                     <Binding Path="SoftPumpValveIsOpen"/>
@@ -469,11 +441,10 @@
             </ctrls:FlowPipe.IsFlowing>
             </ctrls:FlowPipe.IsFlowing>
         </ctrls:FlowPipe>
         </ctrls:FlowPipe>
         <ctrls:FlowPipe   Height="8"  Width="40" Canvas.Left="1265"  Canvas.Top="658" />
         <ctrls:FlowPipe   Height="8"  Width="40" Canvas.Left="1265"  Canvas.Top="658" />
-        <!--<ctrls:FlowPipe   Height="8"  Width="24" Canvas.Left="1266"  Canvas.Top="658" RotateTransformValue="90"/>-->
-        <ctrls:FlowPipe x:Name="TurboPipe"  Height="8"  Width="178" Canvas.Left="1266"  Canvas.Top="464" RotateTransformValue="90" IsFlowing="{Binding TurboPumpPumpingValveIsOpen}">
+        <ctrls:FlowPipe   Height="8"  Width="178" Canvas.Left="1266"  Canvas.Top="464" RotateTransformValue="90" IsFlowing="{Binding TurboPumpPumpingValveIsOpen}">
             
             
         </ctrls:FlowPipe>
         </ctrls:FlowPipe>
-        <ctrls:FlowPipe x:Name="roughPumpPipe2"  Height="8"  Width="45" Canvas.Left="1266"  Canvas.Top="638" RotateTransformValue="90" >
+        <ctrls:FlowPipe   Height="8"  Width="45" Canvas.Left="1266"  Canvas.Top="638" RotateTransformValue="90" >
             <ctrls:FlowPipe.IsFlowing>
             <ctrls:FlowPipe.IsFlowing>
                 <MultiBinding Converter="{StaticResource toBoolMultiValueConverter2}">
                 <MultiBinding Converter="{StaticResource toBoolMultiValueConverter2}">
                     <Binding Path="SoftPumpValveIsOpen"/>
                     <Binding Path="SoftPumpValveIsOpen"/>
@@ -485,7 +456,7 @@
 
 
         <ctrls:Pipe2    Canvas.Left="1060"  Canvas.Top="688" HorizontalAlignment="Left" VerticalAlignment="Top" RotateTransformValue="-180" />
         <ctrls:Pipe2    Canvas.Left="1060"  Canvas.Top="688" HorizontalAlignment="Left" VerticalAlignment="Top" RotateTransformValue="-180" />
 
 
-        <ctrls:FlowPipe x:Name="roughPumpPipe3"  Height="8"  Width="45" Canvas.Left="1213"  Canvas.Top="635"  >
+        <ctrls:FlowPipe   Height="8"  Width="45" Canvas.Left="1213"  Canvas.Top="635"  >
             <ctrls:FlowPipe.IsFlowing>
             <ctrls:FlowPipe.IsFlowing>
                 <MultiBinding Converter="{StaticResource toBoolMultiValueConverter2}">
                 <MultiBinding Converter="{StaticResource toBoolMultiValueConverter2}">
                     <Binding Path="SoftPumpValveIsOpen"/>
                     <Binding Path="SoftPumpValveIsOpen"/>
@@ -494,10 +465,10 @@
             </ctrls:FlowPipe.IsFlowing>
             </ctrls:FlowPipe.IsFlowing>
         </ctrls:FlowPipe>
         </ctrls:FlowPipe>
         <ctrls:FlowPipe   Height="8"  Width="52" Canvas.Left="1163"  Canvas.Top="635" IsFlowing="{Binding SoftPumpValveIsOpen}" />
         <ctrls:FlowPipe   Height="8"  Width="52" Canvas.Left="1163"  Canvas.Top="635" IsFlowing="{Binding SoftPumpValveIsOpen}" />
-        <ctrls:FlowPipe x:Name="fastPumpPipe"  Height="8"  Width="125" Canvas.Left="1219"  Canvas.Top="512" RotateTransformValue="90" IsFlowing="{Binding FastPumpValveIsOpen}"/>
-        <ctrls:FlowPipe x:Name="softPumpPipe"  Height="8"  Width="125" Canvas.Left="1168"  Canvas.Top="514" RotateTransformValue="90" IsFlowing="{Binding SoftPumpValveIsOpen}"/>
+        <ctrls:FlowPipe  Height="8"  Width="125" Canvas.Left="1219"  Canvas.Top="512" RotateTransformValue="90" IsFlowing="{Binding FastPumpValveIsOpen}"/>
+        <ctrls:FlowPipe  Height="8"  Width="125" Canvas.Left="1168"  Canvas.Top="514" RotateTransformValue="90" IsFlowing="{Binding SoftPumpValveIsOpen}"/>
         <ctrls:FlowPipe   Height="8"  Width="50" Canvas.Left="1163"  Canvas.Top="512" HorizontalAlignment="Left" VerticalAlignment="Center" IsReverse="True" IsFlowing="{Binding SoftPumpValveIsOpen}"  />
         <ctrls:FlowPipe   Height="8"  Width="50" Canvas.Left="1163"  Canvas.Top="512" HorizontalAlignment="Left" VerticalAlignment="Center" IsReverse="True" IsFlowing="{Binding SoftPumpValveIsOpen}"  />
-        <ctrls:FlowPipe x:Name="finalPumpPipe"   Height="8"  Width="50" Canvas.Left="1219"  Canvas.Top="463" RotateTransformValue="90">
+        <ctrls:FlowPipe   Height="8"  Width="50" Canvas.Left="1219"  Canvas.Top="463" RotateTransformValue="90">
             <ctrls:FlowPipe.IsFlowing>
             <ctrls:FlowPipe.IsFlowing>
                 <MultiBinding Converter="{StaticResource toBoolMultiValueConverter2}">
                 <MultiBinding Converter="{StaticResource toBoolMultiValueConverter2}">
                     <Binding Path="SoftPumpValveIsOpen"/>
                     <Binding Path="SoftPumpValveIsOpen"/>
@@ -509,10 +480,10 @@
         <TextBlock Canvas.Left="1130"  Canvas.Top="558" Text="Soft"/>
         <TextBlock Canvas.Left="1130"  Canvas.Top="558" Text="Soft"/>
         <TextBlock Canvas.Left="1178"  Canvas.Top="558" Text="Fast"/>
         <TextBlock Canvas.Left="1178"  Canvas.Top="558" Text="Fast"/>
 
 
-        <ctrls:FlowPipe  x:Name="purgeFlow1" Height="8"  Width="194" Canvas.Left="1246"  Canvas.Top="535" IsReverse="True" IsFlowing="{Binding TurboPumpPurgeValveIsOpen,Mode=TwoWay}" >
+        <ctrls:FlowPipe  Height="8"  Width="194" Canvas.Left="1246"  Canvas.Top="535" IsReverse="True" IsFlowing="{Binding TurboPumpPurgeValveIsOpen,Mode=TwoWay}" >
 
 
         </ctrls:FlowPipe>
         </ctrls:FlowPipe>
-        <ctrls:FlowPipe  x:Name="purgeFlow2" ToolTip="123"   Height="8"  Width="142" Canvas.Left="1448"  Canvas.Top="542" RotateTransformValue="90" IsReverse="True" IsFlowing="{Binding TurboPumpPurgeValveIsOpen}"/>
+        <ctrls:FlowPipe  ToolTip="123"   Height="8"  Width="142" Canvas.Left="1448"  Canvas.Top="542" RotateTransformValue="90" IsReverse="True" IsFlowing="{Binding TurboPumpPurgeValveIsOpen}"/>
         <ctrls:Pipe2    Canvas.Left="1435"  Canvas.Top="535" HorizontalAlignment="Left" VerticalAlignment="Top"  />
         <ctrls:Pipe2    Canvas.Left="1435"  Canvas.Top="535" HorizontalAlignment="Left" VerticalAlignment="Top"  />
         <!--<ctrls:FlowPipeValve x:Name="purgevalve"   Height="20" Width="24" Canvas.Left="1458"  Canvas.Top="610" RotateTransformValue="90" IsOpen="{Binding TurboPumpPumpingValveIsOpen,Mode=TwoWay}"/>-->
         <!--<ctrls:FlowPipeValve x:Name="purgevalve"   Height="20" Width="24" Canvas.Left="1458"  Canvas.Top="610" RotateTransformValue="90" IsOpen="{Binding TurboPumpPumpingValveIsOpen,Mode=TwoWay}"/>-->
         <customControls:CommonValveControl Status="{Binding TurboPumpPurgeValveIsOpen,Mode=TwoWay}"  ValveOrientation="Vertical"  Height="20" Width="20"  Canvas.Left="1434"  Canvas.Top="610"/>
         <customControls:CommonValveControl Status="{Binding TurboPumpPurgeValveIsOpen,Mode=TwoWay}"  ValveOrientation="Vertical"  Height="20" Width="20"  Canvas.Left="1434"  Canvas.Top="610"/>
@@ -525,19 +496,8 @@
         <TextBlock Text="VHe2" Canvas.Top="658" Canvas.Left="1094"/>
         <TextBlock Text="VHe2" Canvas.Top="658" Canvas.Left="1094"/>
 
 
         <customControls:CommonValveControl   ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Top="674" Canvas.Left="1100" Status="{Binding PVHe2ValveIsOpen,Mode=TwoWay}"/>
         <customControls:CommonValveControl   ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Top="674" Canvas.Left="1100" Status="{Binding PVHe2ValveIsOpen,Mode=TwoWay}"/>
-
-
-        <!--<ctrls:FlowPipeValve x:Name="SoftPumpValve" ToolTip="Soft"  Canvas.Top="555" Canvas.Left="1178"  Height="20" Width="20" RotateTransformValue="90" IsOpen="{Binding SoftPumpValveIsOpen,Mode=TwoWay}" />-->
         <customControls:CommonValveControl Status="{Binding SoftPumpValveIsOpen,Mode=TwoWay}"  ValveOrientation="Vertical"  Height="20" Width="20"  Canvas.Top="555" Canvas.Left="1154"/>
         <customControls:CommonValveControl Status="{Binding SoftPumpValveIsOpen,Mode=TwoWay}"  ValveOrientation="Vertical"  Height="20" Width="20"  Canvas.Top="555" Canvas.Left="1154"/>
-
-
-        <!--<ctrls:FlowPipeValve x:Name="FastPumpValve" ToolTip="Fast"   Canvas.Top="555" Canvas.Left="1229"  Height="20" Width="24"  RotateTransformValue="90" IsOpen="{Binding FastPumpValveIsOpen,Mode=TwoWay}"/>-->
         <customControls:CommonValveControl Status="{Binding FastPumpValveIsOpen,Mode=TwoWay}"  ValveOrientation="Vertical"  Height="20" Width="20" Canvas.Top="555" Canvas.Left="1205"/>
         <customControls:CommonValveControl Status="{Binding FastPumpValveIsOpen,Mode=TwoWay}"  ValveOrientation="Vertical"  Height="20" Width="20" Canvas.Top="555" Canvas.Left="1205"/>
-
-        <!--<ctrls:purge Name="purge" Canvas.Left="1410"  Canvas.Top="620" />-->
-
-
-        <!--<ctrls:FlowPipeValve     Canvas.Top="596" Canvas.Left="1276"  Height="20" Width="24"  RotateTransformValue="90"/>-->
         <customControls:CommonValveControl  ValveOrientation="Vertical"  Height="20" Width="20"  Canvas.Top="596" Canvas.Left="1252" Status="{Binding TurboPumpPumpingValveIsOpen,Mode=TwoWay}"/>
         <customControls:CommonValveControl  ValveOrientation="Vertical"  Height="20" Width="20"  Canvas.Top="596" Canvas.Left="1252" Status="{Binding TurboPumpPumpingValveIsOpen,Mode=TwoWay}"/>
 
 
 
 
@@ -594,16 +554,14 @@
         <ctrls:TextboxWithLabel  Canvas.Top="595" Canvas.Left="345" LabelValue="Flow" TextBoxValue="{Binding RtDataValues[PMA.MfcGas8.FeedBack],StringFormat='F1'}" TextBoxColor="#D7E4BD"/>
         <ctrls:TextboxWithLabel  Canvas.Top="595" Canvas.Left="345" LabelValue="Flow" TextBoxValue="{Binding RtDataValues[PMA.MfcGas8.FeedBack],StringFormat='F1'}" TextBoxColor="#D7E4BD"/>
 
 
         <!--chamber管道标签-->
         <!--chamber管道标签-->
-        <ctrls:TextboxWithLabel  Canvas.Top="156" Canvas.Left="1326" LabelValue="CM2(mTorr)" TextBoxValue="{Binding RtDataValues[PMA.ProcessPressure],StringFormat='F3'}" TextBoxColor="#D7E4BD"/>
-        <ctrls:TextboxWithLabel  Canvas.Top="248" Canvas.Left="1318" LabelValue="CM1(mTorr)" TextBoxValue="{Binding RtDataValues[PMA.ChamberPressure],StringFormat='F1'}" TextBoxColor="#D7E4BD"/>
+        <ctrls:TextboxWithLabel  Canvas.Top="156" Canvas.Left="1326" LabelValue="CM2(mTorr)" TextBoxValue="{Binding RtDataValues[PMA.ProcessHighPressure],StringFormat='F1'}" TextBoxColor="#D7E4BD"/>
+        <ctrls:TextboxWithLabel  Canvas.Top="248" Canvas.Left="1318" LabelValue="CM1(mTorr)" TextBoxValue="{Binding RtDataValues[PMA.ProcessLowPressure],StringFormat='F1'}" TextBoxColor="#D7E4BD"/>
         <!--<ctrls:TextboxWithLabel  Canvas.Top="633" Canvas.Left="800" LabelValue="Set(Torr)" TextBoxValue="0.0" TextBoxColor="White" />-->
         <!--<ctrls:TextboxWithLabel  Canvas.Top="633" Canvas.Left="800" LabelValue="Set(Torr)" TextBoxValue="0.0" TextBoxColor="White" />-->
         <ctrls:TextboxWithLabel  Canvas.Top="633" Canvas.Left="870" LabelValue="Flow(sccm)" TextBoxValue="{Binding RtDataValues[PMA.MfcHe.FeedBack],StringFormat='F1'}" TextBoxColor="#D7E4BD" />
         <ctrls:TextboxWithLabel  Canvas.Top="633" Canvas.Left="870" LabelValue="Flow(sccm)" TextBoxValue="{Binding RtDataValues[PMA.MfcHe.FeedBack],StringFormat='F1'}" TextBoxColor="#D7E4BD" />
-        <ctrls:TextboxWithLabel  Canvas.Top="633" Canvas.Left="1300" LabelValue="CM3(mTorr)" TextBoxValue="{Binding RtDataValues[PMA.ForelinePressure],StringFormat='F2'}" TextBoxColor="#D7E4BD" />
+        <ctrls:TextboxWithLabel  Canvas.Top="633" Canvas.Left="1300" LabelValue="CM3(mTorr)" TextBoxValue="{Binding RtDataValues[PMA.ForelinePressure],StringFormat='F1'}" TextBoxColor="#D7E4BD" />
         <ctrls:TextboxWithLabel  Canvas.Top="464" Canvas.Left="1290" LabelValue="Position(%)" TextBoxValue="{Binding RtDataValues[PMA.GetPVPosition],StringFormat='F0'}" TextBoxColor="#D7E4BD" />
         <ctrls:TextboxWithLabel  Canvas.Top="464" Canvas.Left="1290" LabelValue="Position(%)" TextBoxValue="{Binding RtDataValues[PMA.GetPVPosition],StringFormat='F0'}" TextBoxColor="#D7E4BD" />
         <ctrls:TextboxWithLabel  Canvas.Top="511" Canvas.Left="1320" LabelValue="Flow(sccm)" TextBoxValue="{Binding RtDataValues[PMA.MfcN2.FeedBack],StringFormat='F1'}" TextBoxColor="#D7E4BD" />
         <ctrls:TextboxWithLabel  Canvas.Top="511" Canvas.Left="1320" LabelValue="Flow(sccm)" TextBoxValue="{Binding RtDataValues[PMA.MfcN2.FeedBack],StringFormat='F1'}" TextBoxColor="#D7E4BD" />
-        <ctrls:TextboxWithLabel  Canvas.Top="556" Canvas.Left="926" LabelValue="Pressure(mTorr)" TextBoxValue="{Binding RtDataValues[PMA.ESCHePressure],StringFormat='F1'}" TextBoxColor="#D7E4BD">
-
-        </ctrls:TextboxWithLabel>
+        <ctrls:TextboxWithLabel  Canvas.Top="556" Canvas.Left="926" LabelValue="Pressure(mTorr)" TextBoxValue="{Binding RtDataValues[PMA.ESCHePressure],StringFormat='F1'}" TextBoxColor="#D7E4BD"/>
         <Border    BorderBrush="Gray"  BorderThickness="0"  Width="40" Height="6" Canvas.Top="581" Canvas.Left="1008">
         <Border    BorderBrush="Gray"  BorderThickness="0"  Width="40" Height="6" Canvas.Top="581" Canvas.Left="1008">
             <Border.Background>
             <Border.Background>
                 <LinearGradientBrush StartPoint="0.5 0" EndPoint="0.5 1">
                 <LinearGradientBrush StartPoint="0.5 0" EndPoint="0.5 1">

+ 1 - 123
Venus/Venus_MainPages/Views/OverView.xaml.cs

@@ -12,129 +12,7 @@ namespace Venus_MainPages.Views
         public OverView()
         public OverView()
         {
         {
             InitializeComponent();
             InitializeComponent();
-        }
-
-        private void Button_Click(object sender, RoutedEventArgs e)
-        {
-
-            //l1.IsReverse = true;
-            //l2.IsReverse = true;
-            //l3.IsReverse = true;
-            //l4.IsReverse = true;
-            //l5.IsReverse = true;
-            //l6.IsReverse = true;
-            //l7.IsReverse = true;
-            //l8.IsReverse = true;
-            //l9.IsReverse = true;
-            //finalPipe1.IsReverse = false;
-            //finalPipe2.IsReverse = false;
-            //GasFinalValve.IsOpen = !GasFinalValve.IsOpen;
-            //Gas1Valve1.IsOpen = !Gas1Valve1.IsOpen;
-            //Gas2Valve1.IsOpen = !Gas2Valve1.IsOpen;
-            //Gas3Valve1.IsOpen = !Gas3Valve1.IsOpen;
-            //Gas4Valve1.IsOpen = !Gas4Valve1.IsOpen;
-
-
-
-
-            //f2.IsFlowing = !f2.IsFlowing;
-            //f3.IsFlowing = !f3.IsFlowing;
-            //f4.IsFlowing = !f4.IsFlowing;
-            //f5.IsFlowing = !f5.IsFlowing;
-            //f6.IsFlowing = !f6.IsFlowing;
-            //f7.IsFlowing = !f7.IsFlowing;
-            //f8.IsFlowing = !f8.IsFlowing;
-            //f9.IsFlowing = !f9.IsFlowing;
-            //finalPipe1.IsFlowing = !finalPipe1.IsFlowing;
-            //Gas1Pipe1.IsFlowing = !Gas1Pipe1.IsFlowing;
-            //Gas2Pipe1.IsFlowing = !Gas2Pipe1.IsFlowing;
-            //Gas3Pipe1.IsFlowing = !Gas3Pipe1.IsFlowing;
-            //Gas4Pipe1.IsFlowing = !Gas4Pipe1.IsFlowing;
-
-
-
-            //l1.IsFlowing = !l1.IsFlowing;
-            //l2.IsFlowing = !l2.IsFlowing;
-            //l3.IsFlowing = !l3.IsFlowing;
-            //l4.IsFlowing = !l4.IsFlowing;
-            //l5.IsFlowing = !l5.IsFlowing;
-            //l6.IsFlowing = !l6.IsFlowing;
-            //l7.IsFlowing = !l7.IsFlowing;
-            //l8.IsFlowing = !l8.IsFlowing;
-            //l9.IsFlowing = !l9.IsFlowing;
-            //finalPipe2.IsFlowing = !finalPipe2.IsFlowing;
-
-
-            //valve2.IsOpen = !valve2.IsOpen;
-            //valve3.IsOpen = !valve3.IsOpen;
-            //valve4.IsOpen = !valve4.IsOpen;
-            //valve5.IsOpen = !valve5.IsOpen;
-            //valve6.IsOpen = !valve6.IsOpen;
-            //valve7.IsOpen = !valve7.IsOpen;
-            //valve8.IsOpen = !valve8.IsOpen;
-            //valve9.IsOpen = !valve9.IsOpen;
-        
-
-
-        }
-
-        private void Button_Click_1(object sender, RoutedEventArgs e)
-        {
-            //finalPipe1.IsReverse = true;
-            //finalPipe2.IsReverse = true;
-            //f1.IsReverse = true;
-            //l8.IsReverse = false;
-
-            ////pump1.IsOpen = !pump1.IsOpen;
-            //l8.IsFlowing = !l8.IsFlowing;
-            //f1.IsFlowing = !f1.IsFlowing;
-          
-            //valve10.IsOpen = !valve10.IsOpen;
-            //GasFinalValve.IsOpen= !GasFinalValve.IsOpen;
-            //finalPipe1.IsFlowing= !finalPipe1.IsFlowing;
-            //finalPipe2.IsFlowing = !finalPipe2.IsFlowing;
-            //pumpValve1.IsOpen= !pumpValve1.IsOpen;
-
-
-            //FastPumpValve.IsOpen = !FastPumpValve.IsOpen;
-            ////roughPumpPipe3.IsReverse = true;
-            //finalPumpPipe.IsFlowing = !finalPumpPipe.IsFlowing;
-            //fastPumpPipe.IsFlowing= !fastPumpPipe.IsFlowing;
-            //roughPumpPipe3.IsFlowing = !roughPumpPipe3.IsFlowing;
-            //roughPumpPipe2.IsFlowing = !roughPumpPipe2.IsFlowing;
-            //roughPumpPipe1.IsFlowing = !roughPumpPipe1.IsFlowing;
-        }
-
-        private void Button_Click_2(object sender, RoutedEventArgs e)
-        {
-            //finalPipe1.IsReverse = false;
-            //finalPipe2.IsReverse = false;
-
-
-            //N2Pipe1.IsFlowing =! N2Pipe1.IsFlowing;
-            //N2Pipe2.IsFlowing = !N2Pipe2.IsFlowing;
-
-            //finalPipe1.IsFlowing = !finalPipe1.IsFlowing;
-            //VN22.IsOpen = !VN22.IsOpen;
-            //VentValve.IsOpen = !VentValve.IsOpen;
-
-            //finalPipe2.IsFlowing= !finalPipe2.IsFlowing;
-            
-
-            //GasFinalValve.IsOpen = !GasFinalValve.IsOpen;
-
-        }
-        private void Button_Click_3(object sender, RoutedEventArgs e)
-        {
-
-            //purgeFlow1.IsReverse = true;
-            //purgeFlow2.IsReverse = true;
-
-            //purgeFlow1.IsFlowing = !purgeFlow1.IsFlowing;
-            //purgeFlow2.IsFlowing = !purgeFlow2.IsFlowing;
-            //purgevalve.IsOpen = !purgevalve.IsOpen;
-
-        }
+        }      
 
 
     }
     }
 }
 }

BIN
Venus/Venus_RT/Config/DeviceModelVenus.xml


+ 7 - 0
Venus/Venus_RT/Devices/IODevices/IoPressureControl.cs

@@ -83,6 +83,9 @@ namespace Venus_RT.Devices
         public readonly IoPressureMeter ForelineGauge;
         public readonly IoPressureMeter ForelineGauge;
         public readonly IoPressureMeter LoadLockGauge;
         public readonly IoPressureMeter LoadLockGauge;
         public readonly IoPressureMeter ESCHeGauge;
         public readonly IoPressureMeter ESCHeGauge;
+        public readonly IoPressureMeter ProcessHigh;
+        public readonly IoPressureMeter ProcessLow;
+
 
 
         //public readonly IoBoostPump _boost;
         //public readonly IoBoostPump _boost;
         //public readonly IoPump DryPump;
         //public readonly IoPump DryPump;
@@ -129,6 +132,10 @@ namespace Venus_RT.Devices
             ForelineGauge               = ParseDeviceNode<IoPressureMeter>(Module, "forelineMeter", node);
             ForelineGauge               = ParseDeviceNode<IoPressureMeter>(Module, "forelineMeter", node);
             LoadLockGauge               = ParseDeviceNode<IoPressureMeter>(Module, "loadlockMeter", node);
             LoadLockGauge               = ParseDeviceNode<IoPressureMeter>(Module, "loadlockMeter", node);
             ESCHeGauge                  = ParseDeviceNode<IoPressureMeter>(Module, "escHeGauge", node);
             ESCHeGauge                  = ParseDeviceNode<IoPressureMeter>(Module, "escHeGauge", node);
+            ProcessHigh                 = ParseDeviceNode<IoPressureMeter>(Module, "processPressureHigh", node);
+            ProcessLow                  = ParseDeviceNode<IoPressureMeter>(Module, "processPressureLow", node);
+
+
             //DryPump                     = ParseDeviceNode<IoPump>(Module, "drypump", node);
             //DryPump                     = ParseDeviceNode<IoPump>(Module, "drypump", node);
 
 
         }
         }

+ 2 - 1
Venus/Venus_RT/Devices/JetPM.cs

@@ -413,7 +413,8 @@ namespace Venus_RT.Devices
             _epdClient = DEVICE.GetDevice<EPDClient>($"{Module}.{VenusDevice.EndPoint}");
             _epdClient = DEVICE.GetDevice<EPDClient>($"{Module}.{VenusDevice.EndPoint}");
 
 
             DATA.Subscribe($"{Name}.ForelinePressure", () => ForelinePressure);
             DATA.Subscribe($"{Name}.ForelinePressure", () => ForelinePressure);
-            DATA.Subscribe($"{Name}.ProcessPressure", () => ProcessPressure);
+            DATA.Subscribe($"{Name}.ProcessHighPressure", () => _pressureController.ProcessHigh.Value);
+            DATA.Subscribe($"{Name}.ProcessLowPressure",  () => _pressureController.ProcessLow.Value);
             DATA.Subscribe($"{Name}.ESCHePressure", () => ESCHePressure);
             DATA.Subscribe($"{Name}.ESCHePressure", () => ESCHePressure);
             DATA.Subscribe($"{Name}.LoadlockPressure", () => LoadlockPressure);
             DATA.Subscribe($"{Name}.LoadlockPressure", () => LoadlockPressure);
 
 

+ 1 - 1
Venus/Venus_Themes/Converters/BoolToColor.cs

@@ -13,7 +13,7 @@ namespace Venus_Themes.Converters
         public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         {
         {
 
 
-            return (bool)value ? new SolidColorBrush(Colors.LimeGreen) : new SolidColorBrush(Colors.Gray);
+            return (bool)value ? new SolidColorBrush(Colors.Green) : new SolidColorBrush(Colors.Gray);
         }
         }
 
 
         public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)

+ 1 - 1
Venus/Venus_Themes/Converters/BoolToColor2.cs

@@ -13,7 +13,7 @@ namespace Venus_Themes.Converters
         public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         {
         {
 
 
-            return (bool)value ?  new SolidColorBrush(Colors.Gray): new SolidColorBrush(Colors.Lime);
+            return (bool)value ?  new SolidColorBrush(Colors.Gray): new SolidColorBrush(Colors.Green);
         }
         }
 
 
         public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)