Browse Source

Change cast way by Enum Name for SEPMView.

zhouhr 1 year ago
parent
commit
e8e04e07b5

+ 17 - 1
Venus/Venus_MainPages/ViewModels/OverVenusSEViewModel.cs

@@ -1177,7 +1177,7 @@ namespace Venus_MainPages.ViewModels
             CommonValveControl commonValveControl = (CommonValveControl)obj;
             CommonValveControl commonValveControl = (CommonValveControl)obj;
             if (commonValveControl.IsCanEdit == true)
             if (commonValveControl.IsCanEdit == true)
             {
             {
-                InvokeClient.Instance.Service.DoOperation($"{ModuleName}.ControlValve", Convert.ToInt32(commonValveControl.Tag.ToString()), !commonValveControl.Status);
+                InvokeClient.Instance.Service.DoOperation($"{ModuleName}.ControlValve", commonValveControl.Tag.ToString(), !commonValveControl.Status);
             }
             }
         }
         }
         private void OnPMInit()
         private void OnPMInit()
@@ -1846,6 +1846,22 @@ namespace Venus_MainPages.ViewModels
             m_RtDataKeys.Add($"{ModuleName}.ValvePV32.IsOpen");
             m_RtDataKeys.Add($"{ModuleName}.ValvePV32.IsOpen");
             m_RtDataKeys.Add($"{ModuleName}.ValvePV41.IsOpen");
             m_RtDataKeys.Add($"{ModuleName}.ValvePV41.IsOpen");
             m_RtDataKeys.Add($"{ModuleName}.ValvePV42.IsOpen");
             m_RtDataKeys.Add($"{ModuleName}.ValvePV42.IsOpen");
+            m_RtDataKeys.Add($"{ModuleName}.ValvePV51.IsOpen");
+            m_RtDataKeys.Add($"{ModuleName}.ValvePV52.IsOpen");
+            m_RtDataKeys.Add($"{ModuleName}.ValvePV61.IsOpen");
+            m_RtDataKeys.Add($"{ModuleName}.ValvePV62.IsOpen");
+            m_RtDataKeys.Add($"{ModuleName}.ValvePV71.IsOpen");
+            m_RtDataKeys.Add($"{ModuleName}.ValvePV72.IsOpen");
+            m_RtDataKeys.Add($"{ModuleName}.ValvePV81.IsOpen");
+            m_RtDataKeys.Add($"{ModuleName}.ValvePV82.IsOpen");
+            m_RtDataKeys.Add($"{ModuleName}.ValvePV91.IsOpen");
+            m_RtDataKeys.Add($"{ModuleName}.ValvePV92.IsOpen");
+            m_RtDataKeys.Add($"{ModuleName}.ValvePVA1.IsOpen");
+            m_RtDataKeys.Add($"{ModuleName}.ValvePVA2.IsOpen");
+            m_RtDataKeys.Add($"{ModuleName}.ValvePVB1.IsOpen");
+            m_RtDataKeys.Add($"{ModuleName}.ValvePVB2.IsOpen");
+            m_RtDataKeys.Add($"{ModuleName}.ValvePVC1.IsOpen");
+            m_RtDataKeys.Add($"{ModuleName}.ValvePVC2.IsOpen");
             m_RtDataKeys.Add($"{ModuleName}.ValveMfc1.IsOpen");
             m_RtDataKeys.Add($"{ModuleName}.ValveMfc1.IsOpen");
             m_RtDataKeys.Add($"{ModuleName}.ValveMfc2.IsOpen");
             m_RtDataKeys.Add($"{ModuleName}.ValveMfc2.IsOpen");
             m_RtDataKeys.Add($"{ModuleName}.ValveMfc3.IsOpen");
             m_RtDataKeys.Add($"{ModuleName}.ValveMfc3.IsOpen");

+ 49 - 49
Venus/Venus_MainPages/Views/OverVenusSEView.xaml

@@ -107,7 +107,7 @@
             </ctrls:FlowPipe>
             </ctrls:FlowPipe>
             <TextBlock Text="Vent Valve" Canvas.Left="416" Canvas.Top="90"/>
             <TextBlock Text="Vent Valve" Canvas.Left="416" Canvas.Top="90"/>
 
 
-            <customControls:CommonValveControl Status="{Binding N2ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="436" Canvas.Top="114" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="10" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}"/>
+            <customControls:CommonValveControl Status="{Binding N2ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="436" Canvas.Top="114" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="N2" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}"/>
 
 
             <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>
@@ -121,7 +121,7 @@
             </ctrls:FlowPipe>
             </ctrls:FlowPipe>
 
 
             <TextBlock Text="VN22" Canvas.Left="280" Canvas.Top="90"/>
             <TextBlock Text="VN22" Canvas.Left="280" Canvas.Top="90"/>
-            <customControls:CommonValveControl Status="{Binding PVN22ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20" Canvas.Left="288" Canvas.Top="114" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="1" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}"/>
+            <customControls:CommonValveControl Status="{Binding PVN22ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20" Canvas.Left="288" Canvas.Top="114" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="PVN22" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}"/>
 
 
 
 
 
 
@@ -133,7 +133,7 @@
 
 
             <TextBlock Text="V1" Canvas.Left="438" Canvas.Top="140" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V1" Canvas.Left="438" Canvas.Top="140" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
-            <customControls:CommonValveControl Status="{Binding MFC1ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="436" Canvas.Top="156" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="11" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <customControls:CommonValveControl Status="{Binding MFC1ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="436" Canvas.Top="156" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="Mfc1" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
 
 
             <ctrls:FlowPipe   Height="8"  Width="114" Canvas.Left="64"  Canvas.Top="162" IsFlowing="{Binding PV11ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="114" Canvas.Left="64"  Canvas.Top="162" IsFlowing="{Binding PV11ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
@@ -183,7 +183,7 @@
             <ctrls:FlowPipe   Height="8"  Width="310" Canvas.Left="174"  Canvas.Top="218" IsFlowing="{Binding MFC2ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="310" Canvas.Left="174"  Canvas.Top="218" IsFlowing="{Binding MFC2ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V2" Canvas.Left="438" Canvas.Top="196" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V2" Canvas.Left="438" Canvas.Top="196" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
-            <customControls:CommonValveControl Status="{Binding MFC2ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="436" Canvas.Top="212" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="12" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <customControls:CommonValveControl Status="{Binding MFC2ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="436" Canvas.Top="212" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="Mfc2" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
 
 
             <ctrls:FlowPipe   Height="8"  Width="112" Canvas.Left="64"  Canvas.Top="218" IsFlowing="{Binding PV21ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="112" Canvas.Left="64"  Canvas.Top="218" IsFlowing="{Binding PV21ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
@@ -234,7 +234,7 @@
 
 
             <TextBlock Text="V3" Canvas.Left="438" Canvas.Top="252" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V3" Canvas.Left="438" Canvas.Top="252" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
-            <customControls:CommonValveControl Status="{Binding MFC3ValveIsOpen,Mode=TwoWay}"   ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="436" Canvas.Top="268" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="13" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <customControls:CommonValveControl Status="{Binding MFC3ValveIsOpen,Mode=TwoWay}"   ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="436" Canvas.Top="268" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="Mfc3" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
 
 
             <ctrls:FlowPipe   Height="8"  Width="112" Canvas.Left="64"  Canvas.Top="274" IsFlowing="{Binding PV31ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="112" Canvas.Left="64"  Canvas.Top="274" IsFlowing="{Binding PV31ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
@@ -280,7 +280,7 @@
             <ctrls:FlowPipe   Height="8"  Width="310" Canvas.Left="174"  Canvas.Top="328" IsFlowing="{Binding MFC4ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="310" Canvas.Left="174"  Canvas.Top="328" IsFlowing="{Binding MFC4ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
             <TextBlock Text="V4" Canvas.Left="438" Canvas.Top="306" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V4" Canvas.Left="438" Canvas.Top="306" HorizontalAlignment="Center" VerticalAlignment="Top"/>
-            <customControls:CommonValveControl Status="{Binding MFC4ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"   Canvas.Left="436" Canvas.Top="322" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="14" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <customControls:CommonValveControl Status="{Binding MFC4ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"   Canvas.Left="436" Canvas.Top="322" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="Mfc4" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="22" Canvas.Left="178"  Canvas.Top="335" RotateTransformValue="90" IsFlowing="{Binding PV42ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="22" Canvas.Left="178"  Canvas.Top="335" RotateTransformValue="90" IsFlowing="{Binding PV42ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:Pipe2     Canvas.Left="183"  Canvas.Top="364" HorizontalAlignment="Center" VerticalAlignment="Top" RotateTransformValue="-180" />
             <ctrls:Pipe2     Canvas.Left="183"  Canvas.Top="364" HorizontalAlignment="Center" VerticalAlignment="Top" RotateTransformValue="-180" />
 
 
@@ -319,7 +319,7 @@
             <ctrls:FlowPipe   Height="8"  Width="76"  Canvas.Left="175"  Canvas.Top="399" IsFlowing="{Binding PV52ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="76"  Canvas.Left="175"  Canvas.Top="399" IsFlowing="{Binding PV52ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
             <TextBlock Text="V5" Canvas.Left="438" Canvas.Top="349" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V5" Canvas.Left="438" Canvas.Top="349" HorizontalAlignment="Center" VerticalAlignment="Top"/>
-            <customControls:CommonValveControl Status="{Binding MFC5ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"   Canvas.Left="436" Canvas.Top="364" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="15" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <customControls:CommonValveControl Status="{Binding MFC5ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"   Canvas.Left="436" Canvas.Top="364" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="Mfc5" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="22" Canvas.Left="178"  Canvas.Top="377" RotateTransformValue="90" IsFlowing="{Binding PV52ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="22" Canvas.Left="178"  Canvas.Top="377" RotateTransformValue="90" IsFlowing="{Binding PV52ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:Pipe2     Canvas.Left="183"  Canvas.Top="407" HorizontalAlignment="Center" VerticalAlignment="Top" RotateTransformValue="-180" />
             <ctrls:Pipe2     Canvas.Left="183"  Canvas.Top="407" HorizontalAlignment="Center" VerticalAlignment="Top" RotateTransformValue="-180" />
             <ctrls:FlowPipe   Height="8"  Width="46" Canvas.Left="257"  Canvas.Top="361" RotateTransformValue="90" IsReverse="True" HorizontalAlignment="Center" VerticalAlignment="Top">
             <ctrls:FlowPipe   Height="8"  Width="46" Canvas.Left="257"  Canvas.Top="361" RotateTransformValue="90" IsReverse="True" HorizontalAlignment="Center" VerticalAlignment="Top">
@@ -354,7 +354,7 @@
             <ctrls:FlowPipe  Height="8"  Width="419" Canvas.Left="65"  Canvas.Top="415" IsFlowing="{Binding MFC6ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe  Height="8"  Width="419" Canvas.Left="65"  Canvas.Top="415" IsFlowing="{Binding MFC6ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="76"  Canvas.Left="175"  Canvas.Top="441" IsFlowing="{Binding PV62ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="76"  Canvas.Left="175"  Canvas.Top="441" IsFlowing="{Binding PV62ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V6" Canvas.Left="438" Canvas.Top="393" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V6" Canvas.Left="438" Canvas.Top="393" HorizontalAlignment="Center" VerticalAlignment="Top"/>
-            <customControls:CommonValveControl Status="{Binding MFC6ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"   Canvas.Left="436" Canvas.Top="409" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="16" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <customControls:CommonValveControl Status="{Binding MFC6ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"   Canvas.Left="436" Canvas.Top="409" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="Mfc6" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="22" Canvas.Left="178"  Canvas.Top="422" RotateTransformValue="90" IsFlowing="{Binding PV62ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="22" Canvas.Left="178"  Canvas.Top="422" RotateTransformValue="90" IsFlowing="{Binding PV62ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:Pipe2     Canvas.Left="183"  Canvas.Top="449" HorizontalAlignment="Center" VerticalAlignment="Top" RotateTransformValue="-180" />
             <ctrls:Pipe2     Canvas.Left="183"  Canvas.Top="449" HorizontalAlignment="Center" VerticalAlignment="Top" RotateTransformValue="-180" />
             <ctrls:FlowPipe   Height="8"  Width="46" Canvas.Left="257"  Canvas.Top="403" RotateTransformValue="90" IsReverse="True" HorizontalAlignment="Center" VerticalAlignment="Top">
             <ctrls:FlowPipe   Height="8"  Width="46" Canvas.Left="257"  Canvas.Top="403" RotateTransformValue="90" IsReverse="True" HorizontalAlignment="Center" VerticalAlignment="Top">
@@ -387,7 +387,7 @@
             <ctrls:FlowPipe   Height="8"  Width="418" Canvas.Left="65"  Canvas.Top="458" IsFlowing="{Binding MFC7ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="418" Canvas.Left="65"  Canvas.Top="458" IsFlowing="{Binding MFC7ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="76"  Canvas.Left="175"  Canvas.Top="484" IsFlowing="{Binding PV72ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="76"  Canvas.Left="175"  Canvas.Top="484" IsFlowing="{Binding PV72ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V7" Canvas.Left="438" Canvas.Top="436" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V7" Canvas.Left="438" Canvas.Top="436" HorizontalAlignment="Center" VerticalAlignment="Top"/>
-            <customControls:CommonValveControl Status="{Binding MFC7ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="436" Canvas.Top="452" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="17" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <customControls:CommonValveControl Status="{Binding MFC7ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="436" Canvas.Top="452" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="Mfc7" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="22" Canvas.Left="178"  Canvas.Top="465" RotateTransformValue="90" IsFlowing="{Binding PV72ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="22" Canvas.Left="178"  Canvas.Top="465" RotateTransformValue="90" IsFlowing="{Binding PV72ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:Pipe2     Canvas.Left="183"  Canvas.Top="492" HorizontalAlignment="Center" VerticalAlignment="Top" RotateTransformValue="-180" />
             <ctrls:Pipe2     Canvas.Left="183"  Canvas.Top="492" HorizontalAlignment="Center" VerticalAlignment="Top" RotateTransformValue="-180" />
             <ctrls:FlowPipe   Height="8"  Width="46" Canvas.Left="257"  Canvas.Top="446" RotateTransformValue="90" IsReverse="True" HorizontalAlignment="Center" VerticalAlignment="Top">
             <ctrls:FlowPipe   Height="8"  Width="46" Canvas.Left="257"  Canvas.Top="446" RotateTransformValue="90" IsReverse="True" HorizontalAlignment="Center" VerticalAlignment="Top">
@@ -418,7 +418,7 @@
             <ctrls:FlowPipe  Height="8"  Width="418" Canvas.Left="65"  Canvas.Top="499" IsFlowing="{Binding MFC8ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe  Height="8"  Width="418" Canvas.Left="65"  Canvas.Top="499" IsFlowing="{Binding MFC8ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="76"  Canvas.Left="175"  Canvas.Top="527" IsFlowing="{Binding PV82ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="76"  Canvas.Left="175"  Canvas.Top="527" IsFlowing="{Binding PV82ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V8" Canvas.Left="438" Canvas.Top="477" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V8" Canvas.Left="438" Canvas.Top="477" HorizontalAlignment="Center" VerticalAlignment="Top"/>
-            <customControls:CommonValveControl Status="{Binding MFC8ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="436" Canvas.Top="493" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="18" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <customControls:CommonValveControl Status="{Binding MFC8ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="436" Canvas.Top="493" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="Mfc8" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="22" Canvas.Left="178"  Canvas.Top="505" RotateTransformValue="90" IsFlowing="{Binding PV82ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="22" Canvas.Left="178"  Canvas.Top="505" RotateTransformValue="90" IsFlowing="{Binding PV82ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:Pipe2     Canvas.Left="183"  Canvas.Top="535" HorizontalAlignment="Center" VerticalAlignment="Top" RotateTransformValue="-180" />
             <ctrls:Pipe2     Canvas.Left="183"  Canvas.Top="535" HorizontalAlignment="Center" VerticalAlignment="Top" RotateTransformValue="-180" />
             <ctrls:FlowPipe   Height="8"  Width="46" Canvas.Left="257"  Canvas.Top="489" RotateTransformValue="90" IsReverse="True" HorizontalAlignment="Center" VerticalAlignment="Top">
             <ctrls:FlowPipe   Height="8"  Width="46" Canvas.Left="257"  Canvas.Top="489" RotateTransformValue="90" IsReverse="True" HorizontalAlignment="Center" VerticalAlignment="Top">
@@ -447,7 +447,7 @@
             <ctrls:FlowPipe  Height="8"  Width="418" Canvas.Left="64"  Canvas.Top="543" IsFlowing="{Binding MFC9ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe  Height="8"  Width="418" Canvas.Left="64"  Canvas.Top="543" IsFlowing="{Binding MFC9ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="76"  Canvas.Left="175"  Canvas.Top="569" IsFlowing="{Binding PV92ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="76"  Canvas.Left="175"  Canvas.Top="569" IsFlowing="{Binding PV92ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V9" Canvas.Left="440" Canvas.Top="520" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V9" Canvas.Left="440" Canvas.Top="520" HorizontalAlignment="Center" VerticalAlignment="Top"/>
-            <customControls:CommonValveControl Status="{Binding MFC9ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="436" Canvas.Top="536" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="18" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <customControls:CommonValveControl Status="{Binding MFC9ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="436" Canvas.Top="536" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="Mfc9" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="22" Canvas.Left="178"  Canvas.Top="550" RotateTransformValue="90" IsFlowing="{Binding PV92ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="22" Canvas.Left="178"  Canvas.Top="550" RotateTransformValue="90" IsFlowing="{Binding PV92ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:Pipe2     Canvas.Left="183"  Canvas.Top="577" HorizontalAlignment="Center" VerticalAlignment="Top" RotateTransformValue="-180" />
             <ctrls:Pipe2     Canvas.Left="183"  Canvas.Top="577" HorizontalAlignment="Center" VerticalAlignment="Top" RotateTransformValue="-180" />
             <ctrls:FlowPipe   Height="8"  Width="46" Canvas.Left="257"  Canvas.Top="531" RotateTransformValue="90" IsReverse="True" HorizontalAlignment="Center" VerticalAlignment="Top">
             <ctrls:FlowPipe   Height="8"  Width="46" Canvas.Left="257"  Canvas.Top="531" RotateTransformValue="90" IsReverse="True" HorizontalAlignment="Center" VerticalAlignment="Top">
@@ -474,7 +474,7 @@
             <ctrls:FlowPipe  Height="8"  Width="418" Canvas.Left="64"  Canvas.Top="588" IsFlowing="{Binding MFC10ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe  Height="8"  Width="418" Canvas.Left="64"  Canvas.Top="588" IsFlowing="{Binding MFC10ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="76"  Canvas.Left="175"  Canvas.Top="615" IsFlowing="{Binding PVA2ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="76"  Canvas.Left="175"  Canvas.Top="615" IsFlowing="{Binding PVA2ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V10" Canvas.Left="436" Canvas.Top="567" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V10" Canvas.Left="436" Canvas.Top="567" HorizontalAlignment="Center" VerticalAlignment="Top"/>
-            <customControls:CommonValveControl Status="{Binding MFC10ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="436" Canvas.Top="582" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="18" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <customControls:CommonValveControl Status="{Binding MFC10ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="436" Canvas.Top="582" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="Mfc10" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="22" Canvas.Left="178"  Canvas.Top="595" RotateTransformValue="90" IsFlowing="{Binding PVA2ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="22" Canvas.Left="178"  Canvas.Top="595" RotateTransformValue="90" IsFlowing="{Binding PVA2ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:Pipe2     Canvas.Left="183"  Canvas.Top="623" HorizontalAlignment="Center" VerticalAlignment="Top" RotateTransformValue="-180" />
             <ctrls:Pipe2     Canvas.Left="183"  Canvas.Top="623" HorizontalAlignment="Center" VerticalAlignment="Top" RotateTransformValue="-180" />
             <ctrls:FlowPipe   Height="8"  Width="48" Canvas.Left="257"  Canvas.Top="575" RotateTransformValue="90" IsReverse="True" HorizontalAlignment="Center" VerticalAlignment="Top">
             <ctrls:FlowPipe   Height="8"  Width="48" Canvas.Left="257"  Canvas.Top="575" RotateTransformValue="90" IsReverse="True" HorizontalAlignment="Center" VerticalAlignment="Top">
@@ -499,7 +499,7 @@
             <ctrls:FlowPipe  Height="8"  Width="418" Canvas.Left="65"  Canvas.Top="634" IsFlowing="{Binding MFC11ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe  Height="8"  Width="418" Canvas.Left="65"  Canvas.Top="634" IsFlowing="{Binding MFC11ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="76"  Canvas.Left="175"  Canvas.Top="661" IsFlowing="{Binding PVB2ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="76"  Canvas.Left="175"  Canvas.Top="661" IsFlowing="{Binding PVB2ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V11" Canvas.Left="436" Canvas.Top="612" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V11" Canvas.Left="436" Canvas.Top="612" HorizontalAlignment="Center" VerticalAlignment="Top"/>
-            <customControls:CommonValveControl Status="{Binding MFC11ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="436" Canvas.Top="627" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="18" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <customControls:CommonValveControl Status="{Binding MFC11ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="436" Canvas.Top="627" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="Mfc11" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="22" Canvas.Left="178"  Canvas.Top="640" RotateTransformValue="90" IsFlowing="{Binding PVB2ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="22" Canvas.Left="178"  Canvas.Top="640" RotateTransformValue="90" IsFlowing="{Binding PVB2ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:Pipe2     Canvas.Left="183"  Canvas.Top="669" HorizontalAlignment="Center" VerticalAlignment="Top" RotateTransformValue="-180" />
             <ctrls:Pipe2     Canvas.Left="183"  Canvas.Top="669" HorizontalAlignment="Center" VerticalAlignment="Top" RotateTransformValue="-180" />
             <ctrls:FlowPipe   Height="8"  Width="49" Canvas.Left="257"  Canvas.Top="620" RotateTransformValue="90" IsReverse="True" HorizontalAlignment="Center" VerticalAlignment="Top">
             <ctrls:FlowPipe   Height="8"  Width="49" Canvas.Left="257"  Canvas.Top="620" RotateTransformValue="90" IsReverse="True" HorizontalAlignment="Center" VerticalAlignment="Top">
@@ -522,7 +522,7 @@
             <ctrls:FlowPipe  Height="8"  Width="415" Canvas.Left="65"  Canvas.Top="679" IsFlowing="{Binding MFC12ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe  Height="8"  Width="415" Canvas.Left="65"  Canvas.Top="679" IsFlowing="{Binding MFC12ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="76"  Canvas.Left="175"  Canvas.Top="709" IsFlowing="{Binding PVC2ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="76"  Canvas.Left="175"  Canvas.Top="709" IsFlowing="{Binding PVC2ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V12" Canvas.Left="436" Canvas.Top="658" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V12" Canvas.Left="436" Canvas.Top="658" HorizontalAlignment="Center" VerticalAlignment="Top"/>
-            <customControls:CommonValveControl Status="{Binding MFC12ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="436" Canvas.Top="673" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="18" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <customControls:CommonValveControl Status="{Binding MFC12ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="436" Canvas.Top="673" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="Mfc12" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="22" Canvas.Left="178"  Canvas.Top="685" RotateTransformValue="90" IsFlowing="{Binding PVC2ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="22" Canvas.Left="178"  Canvas.Top="685" RotateTransformValue="90" IsFlowing="{Binding PVC2ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:Pipe2     Canvas.Left="183"  Canvas.Top="717" HorizontalAlignment="Center" VerticalAlignment="Top" RotateTransformValue="-180" />
             <ctrls:Pipe2     Canvas.Left="183"  Canvas.Top="717" HorizontalAlignment="Center" VerticalAlignment="Top" RotateTransformValue="-180" />
             <ctrls:FlowPipe   Height="8"  Width="46" Canvas.Left="257"  Canvas.Top="664" RotateTransformValue="90" IsReverse="True" HorizontalAlignment="Center" VerticalAlignment="Top">
             <ctrls:FlowPipe   Height="8"  Width="46" Canvas.Left="257"  Canvas.Top="664" RotateTransformValue="90" IsReverse="True" HorizontalAlignment="Center" VerticalAlignment="Top">
@@ -581,7 +581,7 @@
             </ctrls:FlowPipe>
             </ctrls:FlowPipe>
 
 
             <TextBlock Text="Gas Final" Canvas.Left="900" Canvas.Top="90" FontSize="15"/>
             <TextBlock Text="Gas Final" Canvas.Left="900" Canvas.Top="90" FontSize="15"/>
-            <customControls:CommonValveControl Status="{Binding GasFinalValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20" Canvas.Left="922" Canvas.Top="114" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="21" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}"/>
+            <customControls:CommonValveControl Status="{Binding GasFinalValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20" Canvas.Left="922" Canvas.Top="114" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="GasFinal" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}"/>
 
 
             <ctrls:Pipe2    Canvas.Left="1000" Canvas.Top="120" HorizontalAlignment="Left" VerticalAlignment="Top"  />
             <ctrls:Pipe2    Canvas.Left="1000" Canvas.Top="120" HorizontalAlignment="Left" VerticalAlignment="Top"  />
             <ctrls:FlowPipe  Height="8"  Width="120" Canvas.Left="1013" Canvas.Top="129" RotateTransformValue="90">
             <ctrls:FlowPipe  Height="8"  Width="120" Canvas.Left="1013" Canvas.Top="129" RotateTransformValue="90">
@@ -610,99 +610,99 @@
 
 
             <!--阀-->
             <!--阀-->
             <TextBlock Text="VC1" Canvas.Left="126" Canvas.Top="659" HorizontalAlignment="Left" VerticalAlignment="Center"/>
             <TextBlock Text="VC1" Canvas.Left="126" Canvas.Top="659" HorizontalAlignment="Left" VerticalAlignment="Center"/>
-            <customControls:CommonValveControl Status="{Binding PVC1ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="127" Canvas.Top="673" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="8" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <customControls:CommonValveControl Status="{Binding PVC1ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="127" Canvas.Top="673" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="PVC1" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
             <TextBlock Text="VB1" Canvas.Left="126" Canvas.Top="611" HorizontalAlignment="Left" VerticalAlignment="Center"/>
             <TextBlock Text="VB1" Canvas.Left="126" Canvas.Top="611" HorizontalAlignment="Left" VerticalAlignment="Center"/>
-            <customControls:CommonValveControl Status="{Binding PVB1ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="127" Canvas.Top="628" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="8" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <customControls:CommonValveControl Status="{Binding PVB1ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="127" Canvas.Top="628" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="PVB1" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
             <TextBlock Text="VA1" Canvas.Left="127" Canvas.Top="566" HorizontalAlignment="Left" VerticalAlignment="Center"/>
             <TextBlock Text="VA1" Canvas.Left="127" Canvas.Top="566" HorizontalAlignment="Left" VerticalAlignment="Center"/>
-            <customControls:CommonValveControl Status="{Binding PVA1ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="127" Canvas.Top="582" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="8" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <customControls:CommonValveControl Status="{Binding PVA1ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="127" Canvas.Top="582" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="PVA1" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
             <TextBlock Text="V91" Canvas.Left="128" Canvas.Top="522" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V91" Canvas.Left="128" Canvas.Top="522" HorizontalAlignment="Center" VerticalAlignment="Top"/>
-            <customControls:CommonValveControl Status="{Binding PV91ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="127" Canvas.Top="537" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="8" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+            <customControls:CommonValveControl Status="{Binding PV91ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="127" Canvas.Top="537" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="PV91" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
 
 
             <TextBlock Text="V81" Canvas.Left="128" Canvas.Top="476" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V81" Canvas.Left="128" Canvas.Top="476" HorizontalAlignment="Center" VerticalAlignment="Top"/>
-            <customControls:CommonValveControl Status="{Binding PV81ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="127" Canvas.Top="493" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="8" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <customControls:CommonValveControl Status="{Binding PV81ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="127" Canvas.Top="493" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="PV81" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
             <TextBlock Text="V71" Canvas.Left="128" Canvas.Top="435" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V71" Canvas.Left="128" Canvas.Top="435" HorizontalAlignment="Center" VerticalAlignment="Top"/>
-            <customControls:CommonValveControl Status="{Binding PV71ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="127" Canvas.Top="452" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="8" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <customControls:CommonValveControl Status="{Binding PV71ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="127" Canvas.Top="452" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="PV71" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
             <TextBlock Text="V61" Canvas.Left="128" Canvas.Top="393" HorizontalAlignment="Left" VerticalAlignment="Center"/>
             <TextBlock Text="V61" Canvas.Left="128" Canvas.Top="393" HorizontalAlignment="Left" VerticalAlignment="Center"/>
-            <customControls:CommonValveControl Status="{Binding PV61ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="127" Canvas.Top="409" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="8" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <customControls:CommonValveControl Status="{Binding PV61ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="127" Canvas.Top="409" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="PV61" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
             <TextBlock Text="V51" Canvas.Left="128" Canvas.Top="348" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V51" Canvas.Left="128" Canvas.Top="348" HorizontalAlignment="Center" VerticalAlignment="Top"/>
-            <customControls:CommonValveControl Status="{Binding PV51ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="127" Canvas.Top="364" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="8" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <customControls:CommonValveControl Status="{Binding PV51ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="127" Canvas.Top="364" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="PV51" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
             <TextBlock Text="V41" Canvas.Left="128" Canvas.Top="306" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V41" Canvas.Left="128" Canvas.Top="306" HorizontalAlignment="Center" VerticalAlignment="Top"/>
-            <customControls:CommonValveControl Status="{Binding PV41ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="127" Canvas.Top="322" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="8" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <customControls:CommonValveControl Status="{Binding PV41ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="127" Canvas.Top="322" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="PV41" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
             <TextBlock Text="V31" Canvas.Left="128" Canvas.Top="252" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V31" Canvas.Left="128" Canvas.Top="252" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
-            <customControls:CommonValveControl Status="{Binding PV31ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"   Canvas.Left="127" Canvas.Top="268" Tag="6" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"  Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <customControls:CommonValveControl Status="{Binding PV31ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"   Canvas.Left="127" Canvas.Top="268" Tag="PV31" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"  Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
             <TextBlock Text="V21" Canvas.Left="128" Canvas.Top="198" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V21" Canvas.Left="128" Canvas.Top="198" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
-            <customControls:CommonValveControl Status="{Binding PV21ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="127" Canvas.Top="212" Tag="4" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"  Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <customControls:CommonValveControl Status="{Binding PV21ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="127" Canvas.Top="212" Tag="PV21" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"  Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
             <TextBlock Text="V11" Canvas.Left="128" Canvas.Top="140" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V11" Canvas.Left="128" Canvas.Top="140" HorizontalAlignment="Center" VerticalAlignment="Top"/>
-            <customControls:CommonValveControl Status="{Binding PV11ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="127" Canvas.Top="156" Tag="2" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"  Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <customControls:CommonValveControl Status="{Binding PV11ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="127" Canvas.Top="156" Tag="PV11" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"  Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
 
 
 
 
             <TextBlock Text="V12" Canvas.Left="200" Canvas.Top="175" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V12" Canvas.Left="200" Canvas.Top="175" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
-            <customControls:CommonValveControl Status="{Binding PV12ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="200" Canvas.Top="191" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="3" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <customControls:CommonValveControl Status="{Binding PV12ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="200" Canvas.Top="191" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="PV12" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
             <TextBlock Text="V22" Canvas.Left="200" Canvas.Top="232" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V22" Canvas.Left="200" Canvas.Top="232" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
-            <customControls:CommonValveControl Status="{Binding PV22ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="200" Canvas.Top="247" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="5" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <customControls:CommonValveControl Status="{Binding PV22ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="200" Canvas.Top="247" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="PV22" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
             <TextBlock Text="V32" Canvas.Left="200" Canvas.Top="287" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V32" Canvas.Left="200" Canvas.Top="287" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
-            <customControls:CommonValveControl Status="{Binding PV32ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20" Canvas.Left="200" Canvas.Top="303" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="7" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <customControls:CommonValveControl Status="{Binding PV32ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20" Canvas.Left="200" Canvas.Top="303" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="PV32" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
             <TextBlock Text="V42" Canvas.Left="199" Canvas.Top="336" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V42" Canvas.Left="199" Canvas.Top="336" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
-            <customControls:CommonValveControl Status="{Binding PV42ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20" Canvas.Left="200" Canvas.Top="349" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="9" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <customControls:CommonValveControl Status="{Binding PV42ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20" Canvas.Left="200" Canvas.Top="349" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="PV42" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
             <TextBlock Text="V52" Canvas.Left="199" Canvas.Top="379" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V52" Canvas.Left="199" Canvas.Top="379" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
-            <customControls:CommonValveControl Status="{Binding PV52ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20" Canvas.Left="200" Canvas.Top="393" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="9" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <customControls:CommonValveControl Status="{Binding PV52ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20" Canvas.Left="200" Canvas.Top="393" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="PV52" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
             <TextBlock Text="V62" Canvas.Left="199" Canvas.Top="422" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V62" Canvas.Left="199" Canvas.Top="422" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
-            <customControls:CommonValveControl Status="{Binding PV62ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20" Canvas.Left="200" Canvas.Top="435" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="9" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <customControls:CommonValveControl Status="{Binding PV62ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20" Canvas.Left="200" Canvas.Top="435" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="PV62" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
             <TextBlock Text="V72" Canvas.Left="199" Canvas.Top="465" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V72" Canvas.Left="199" Canvas.Top="465" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
-            <customControls:CommonValveControl Status="{Binding PV72ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20" Canvas.Left="200" Canvas.Top="478" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="9" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <customControls:CommonValveControl Status="{Binding PV72ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20" Canvas.Left="200" Canvas.Top="478" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="PV72" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
             <TextBlock Text="V82" Canvas.Left="199" Canvas.Top="506" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V82" Canvas.Left="199" Canvas.Top="506" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
-            <customControls:CommonValveControl Status="{Binding PV82ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20" Canvas.Left="200" Canvas.Top="521" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="9" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+            <customControls:CommonValveControl Status="{Binding PV82ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20" Canvas.Left="200" Canvas.Top="521" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="PV82" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Left" VerticalAlignment="Top"/>
 
 
             <TextBlock Text="V92" Canvas.Left="200" Canvas.Top="549" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="V92" Canvas.Left="200" Canvas.Top="549" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
-            <customControls:CommonValveControl Status="{Binding PV92ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20" Canvas.Left="200" Canvas.Top="564" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="9" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Left" VerticalAlignment="Center"/>
+            <customControls:CommonValveControl Status="{Binding PV92ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20" Canvas.Left="200" Canvas.Top="564" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="PV92" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Left" VerticalAlignment="Center"/>
 
 
             <TextBlock Text="VA2" Canvas.Left="199" Canvas.Top="596" HorizontalAlignment="Left" VerticalAlignment="Center"/>
             <TextBlock Text="VA2" Canvas.Left="199" Canvas.Top="596" HorizontalAlignment="Left" VerticalAlignment="Center"/>
 
 
-            <customControls:CommonValveControl Status="{Binding PVA2ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20" Canvas.Left="200" Canvas.Top="609" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="9" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <customControls:CommonValveControl Status="{Binding PVA2ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20" Canvas.Left="200" Canvas.Top="609" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="PVA2" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
             <TextBlock Text="VB2" Canvas.Left="199" Canvas.Top="641" HorizontalAlignment="Left" VerticalAlignment="Center"/>
             <TextBlock Text="VB2" Canvas.Left="199" Canvas.Top="641" HorizontalAlignment="Left" VerticalAlignment="Center"/>
 
 
-            <customControls:CommonValveControl Status="{Binding PVB2ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20" Canvas.Left="200" Canvas.Top="655" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="9" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <customControls:CommonValveControl Status="{Binding PVB2ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20" Canvas.Left="200" Canvas.Top="655" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="PVB2" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
             <TextBlock Text="VC2" Canvas.Left="200" Canvas.Top="688" HorizontalAlignment="Left" VerticalAlignment="Center"/>
             <TextBlock Text="VC2" Canvas.Left="200" Canvas.Top="688" HorizontalAlignment="Left" VerticalAlignment="Center"/>
 
 
-            <customControls:CommonValveControl Status="{Binding PVC2ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20" Canvas.Left="200" Canvas.Top="703" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="9" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <customControls:CommonValveControl Status="{Binding PVC2ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20" Canvas.Left="200" Canvas.Top="703" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="PVC2" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
 
 
 
 
 
 
             <TextBlock Text="VN21" Canvas.Left="200" Canvas.Top="136" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <TextBlock Text="VN21" Canvas.Left="200" Canvas.Top="136" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
-            <customControls:CommonValveControl Status="{Binding PVN21ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Vertical"  Height="20" Width="20"  Canvas.Left="243" Canvas.Top="132" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="0" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <customControls:CommonValveControl Status="{Binding PVN21ValveIsOpen,Mode=TwoWay}"  ValveOrientation="Vertical"  Height="20" Width="20"  Canvas.Left="243" Canvas.Top="132" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="PVN21" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
 
             <!--左侧管道标签-->
             <!--左侧管道标签-->
             <ctrls:TextboxWithLabel TextBoxValue="{Binding MFC1SetPoint,Mode=TwoWay}" IsReadOnly="False"  Canvas.Top="137" Canvas.Left="275" LabelValue="MFC1" ToolTip="{Binding MFC1Data.SetPoint,StringFormat='F1'}" TextBoxColor="White" MaxValue="{Binding MFC1Data.Scale}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:TextboxWithLabel TextBoxValue="{Binding MFC1SetPoint,Mode=TwoWay}" IsReadOnly="False"  Canvas.Top="137" Canvas.Left="275" LabelValue="MFC1" ToolTip="{Binding MFC1Data.SetPoint,StringFormat='F1'}" TextBoxColor="White" MaxValue="{Binding MFC1Data.Scale}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
@@ -823,7 +823,7 @@
             <ctrls:FlowPipe  Height="8"  Width="70" Canvas.Left="1264" Canvas.Top="272"   />
             <ctrls:FlowPipe  Height="8"  Width="70" Canvas.Left="1264" Canvas.Top="272"   />
             <TextBlock Text="Guage" Canvas.Left="1272" Canvas.Top="248"/>
             <TextBlock Text="Guage" Canvas.Left="1272" Canvas.Top="248"/>
 
 
-            <customControls:CommonValveControl   ValveOrientation="Horizontal" Status="{Binding GuageValveIsOpen,Mode=TwoWay}" Height="20" Width="20" Canvas.Left="1280" Canvas.Top="265" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="27" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}"/>
+            <customControls:CommonValveControl   ValveOrientation="Horizontal" Status="{Binding GuageValveIsOpen,Mode=TwoWay}" Height="20" Width="20" Canvas.Left="1280" Canvas.Top="265" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="Guage" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}"/>
 
 
             <Border    BorderBrush="Gray"  BorderThickness="0"  Width="18" Height="6" Canvas.Left="1315" Canvas.Top="164" >
             <Border    BorderBrush="Gray"  BorderThickness="0"  Width="18" Height="6" Canvas.Left="1315" Canvas.Top="164" >
                 <Border.RenderTransform>
                 <Border.RenderTransform>
@@ -880,7 +880,7 @@
                 </ctrls:FlowPipe.IsFlowing>
                 </ctrls:FlowPipe.IsFlowing>
             </ctrls:FlowPipe>
             </ctrls:FlowPipe>
             <ctrls:Pipe2    Canvas.Left="1133"  Canvas.Top="610" HorizontalAlignment="Left" VerticalAlignment="Top"  />
             <ctrls:Pipe2    Canvas.Left="1133"  Canvas.Top="610" HorizontalAlignment="Left" VerticalAlignment="Top"  />
-            <customControls:CommonValveControl   ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Top="604" Canvas.Left="1066" Status="{Binding PVHe3ValveIsOpen,Mode=TwoWay}" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="30" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}"/>
+            <customControls:CommonValveControl   ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Top="604" Canvas.Left="1066" Status="{Binding PVHe3ValveIsOpen,Mode=TwoWay}" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="PVHe3" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}"/>
             <TextBlock Text="VHe3" Canvas.Top="588" Canvas.Left="1060"/>
             <TextBlock Text="VHe3" Canvas.Top="588" Canvas.Left="1060"/>
 
 
             <ctrls:ZhenValve Width="34" Height="34" Canvas.Top="585.5" Canvas.Left="1095"/>
             <ctrls:ZhenValve Width="34" Height="34" Canvas.Top="585.5" Canvas.Left="1095"/>
@@ -959,22 +959,22 @@
             <ctrls:FlowPipe  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" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="26" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}"/>
+            <customControls:CommonValveControl Status="{Binding TurboPumpPurgeValveIsOpen,Mode=TwoWay}"  ValveOrientation="Vertical"  Height="20" Width="20"  Canvas.Left="1434"  Canvas.Top="610" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="TurboPumpPurge" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}"/>
             <TextBlock Text="Turbo N2&#10;   Purge" Canvas.Left="1365"  Canvas.Top="610" FontSize="15"/>
             <TextBlock Text="Turbo N2&#10;   Purge" Canvas.Left="1365"  Canvas.Top="610" FontSize="15"/>
 
 
             <TextBlock Text="VHe1" Canvas.Top="636" Canvas.Left="985"/>
             <TextBlock Text="VHe1" Canvas.Top="636" Canvas.Left="985"/>
-            <customControls:CommonValveControl   ValveOrientation="Horizontal" Height="20" Width="20"   Canvas.Top="652" Canvas.Left="990" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Status="{Binding PVHe1ValveIsOpen,Mode=TwoWay}" Tag="19" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}"/>
+            <customControls:CommonValveControl   ValveOrientation="Horizontal" Height="20" Width="20"   Canvas.Top="652" Canvas.Left="990" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Status="{Binding PVHe1ValveIsOpen,Mode=TwoWay}" Tag="PVHe1" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}"/>
 
 
 
 
             <TextBlock Text="VHe2" Canvas.Top="658" Canvas.Left="1060"/>
             <TextBlock Text="VHe2" Canvas.Top="658" Canvas.Left="1060"/>
 
 
-            <customControls:CommonValveControl   ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Top="674" Canvas.Left="1066" Status="{Binding PVHe2ValveIsOpen,Mode=TwoWay}" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="20" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}"/>
-            <customControls:CommonValveControl Status="{Binding SoftPumpValveIsOpen,Mode=TwoWay}"  ValveOrientation="Vertical"  Height="20" Width="20"  Canvas.Top="555" Canvas.Left="1154" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="22" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}"/>
-            <customControls:CommonValveControl Status="{Binding FastPumpValveIsOpen,Mode=TwoWay}"  ValveOrientation="Vertical"  Height="20" Width="20" Canvas.Top="555" Canvas.Left="1205"  IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="23" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}"/>
-            <customControls:CommonValveControl  ValveOrientation="Vertical"  Height="20" Width="20"  Canvas.Top="596" Canvas.Left="1252" Status="{Binding TurboPumpPumpingValveIsOpen,Mode=TwoWay}" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="25" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}"/>
+            <customControls:CommonValveControl   ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Top="674" Canvas.Left="1066" Status="{Binding PVHe2ValveIsOpen,Mode=TwoWay}" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="PVHe2" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}"/>
+            <customControls:CommonValveControl Status="{Binding SoftPumpValveIsOpen,Mode=TwoWay}"  ValveOrientation="Vertical"  Height="20" Width="20"  Canvas.Top="555" Canvas.Left="1154" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="SoftPump" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}"/>
+            <customControls:CommonValveControl Status="{Binding FastPumpValveIsOpen,Mode=TwoWay}"  ValveOrientation="Vertical"  Height="20" Width="20" Canvas.Top="555" Canvas.Left="1205"  IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="FastPump" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}"/>
+            <customControls:CommonValveControl  ValveOrientation="Vertical"  Height="20" Width="20"  Canvas.Top="596" Canvas.Left="1252" Status="{Binding TurboPumpPumpingValveIsOpen,Mode=TwoWay}" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="TurboPumpPumping" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}"/>
 
 
 
 
-            <customControls:CommonValveControl  ValveOrientation="Vertical"  Height="20" Width="20"  Canvas.Top="490" Canvas.Left="1041" Status="{Binding HeISOValveIsOpen,Mode=TwoWay}" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="31" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}"/>
+            <customControls:CommonValveControl  ValveOrientation="Vertical"  Height="20" Width="20"  Canvas.Top="490" Canvas.Left="1041" Status="{Binding HeISOValveIsOpen,Mode=TwoWay}" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="HeISO" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}"/>
             <TextBlock Text=" He&#10;ISO" Canvas.Top="482" Canvas.Left="1068"/>
             <TextBlock Text=" He&#10;ISO" Canvas.Top="482" Canvas.Left="1068"/>
 
 
             <!--turbo-->
             <!--turbo-->

+ 11 - 1
Venus/Venus_RT/Devices/JetPMBase.cs

@@ -290,7 +290,17 @@ namespace Venus_RT.Devices
             });
             });
             OP.Subscribe($"{Module}.ControlValve", (cmd, args) =>
             OP.Subscribe($"{Module}.ControlValve", (cmd, args) =>
             {
             {
-                OpenValve((ValveType)((int)args[0]), (bool)args[1]);
+                if (ChamberType == JetChamber.VenusSE)
+                {
+                    if (Enum.TryParse(args[0].ToString(), out ValveType targetvalve))
+                    {
+                        OpenValve(targetvalve, (bool)args[1]);
+                    }
+                }
+                else
+                {
+                    OpenValve((ValveType)((int)args[0]), (bool)args[1]);
+                }
                 return true;
                 return true;
             });
             });
 
 

+ 1 - 1
Venus/Venus_RT/Devices/JetVenusSEPM.cs

@@ -358,7 +358,7 @@ namespace Venus_RT.Devices
                 }
                 }
                 else
                 else
                     return false;
                     return false;
-                
+
             }
             }
         }
         }