Bläddra i källkod

fix bug in VenusSE PM valve.

zhouhr 1 år sedan
förälder
incheckning
904ca94945

+ 8 - 0
Venus/Venus_MainPages/Views/OverVenusSEView.xaml

@@ -317,6 +317,7 @@
             <!--Gas5-->
             <ctrls:FlowPipe   Height="8"  Width="419" Canvas.Left="64"  Canvas.Top="370" IsFlowing="{Binding MFC5ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
             <ctrls:FlowPipe   Height="8"  Width="76"  Canvas.Left="175"  Canvas.Top="399" IsFlowing="{Binding PV52ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <ctrls:FlowPipe   Height="8"  Width="112" Canvas.Left="64"  Canvas.Top="370" IsFlowing="{Binding PV51ValveIsOpen}" 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="Mfc5" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
@@ -352,6 +353,7 @@
             </ctrls:FlowPipe>
             <!--6-->
             <ctrls:FlowPipe  Height="8"  Width="419" Canvas.Left="65"  Canvas.Top="415" IsFlowing="{Binding MFC6ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <ctrls:FlowPipe   Height="8"  Width="112" Canvas.Left="64"  Canvas.Top="415" IsFlowing="{Binding PV61ValveIsOpen}" 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"/>
             <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"/>
@@ -385,6 +387,7 @@
             </ctrls:FlowPipe>
             <!--Gas7-->
             <ctrls:FlowPipe   Height="8"  Width="418" Canvas.Left="65"  Canvas.Top="458" IsFlowing="{Binding MFC7ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <ctrls:FlowPipe   Height="8"  Width="112" Canvas.Left="64"  Canvas.Top="458" IsFlowing="{Binding PV71ValveIsOpen}" 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"/>
             <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"/>
@@ -416,6 +419,7 @@
             </ctrls:FlowPipe>
             <!--Gas8-->
             <ctrls:FlowPipe  Height="8"  Width="418" Canvas.Left="65"  Canvas.Top="499" IsFlowing="{Binding MFC8ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <ctrls:FlowPipe   Height="8"  Width="112" Canvas.Left="64"  Canvas.Top="499" IsFlowing="{Binding PV81ValveIsOpen}" 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"/>
             <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"/>
@@ -445,6 +449,7 @@
             </ctrls:FlowPipe>
             <!--Gas9-->
             <ctrls:FlowPipe  Height="8"  Width="418" Canvas.Left="64"  Canvas.Top="543" IsFlowing="{Binding MFC9ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <ctrls:FlowPipe   Height="8"  Width="112" Canvas.Left="64"  Canvas.Top="543" IsFlowing="{Binding PV91ValveIsOpen}" 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"/>
             <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"/>
@@ -472,6 +477,7 @@
             </ctrls:FlowPipe>
             <!--Gas10-->
             <ctrls:FlowPipe  Height="8"  Width="418" Canvas.Left="64"  Canvas.Top="588" IsFlowing="{Binding MFC10ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <ctrls:FlowPipe   Height="8"  Width="112" Canvas.Left="64"  Canvas.Top="588" IsFlowing="{Binding PVA1ValveIsOpen}" 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"/>
             <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"/>
@@ -497,6 +503,7 @@
             </ctrls:FlowPipe>
             <!--Gas11-->
             <ctrls:FlowPipe  Height="8"  Width="418" Canvas.Left="65"  Canvas.Top="634" IsFlowing="{Binding MFC11ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <ctrls:FlowPipe   Height="8"  Width="112" Canvas.Left="64"  Canvas.Top="634" IsFlowing="{Binding PVB1ValveIsOpen}" 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"/>
             <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"/>
@@ -520,6 +527,7 @@
             </ctrls:FlowPipe>
             <!--Gas12-->
             <ctrls:FlowPipe  Height="8"  Width="415" Canvas.Left="65"  Canvas.Top="679" IsFlowing="{Binding MFC12ValveIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <ctrls:FlowPipe   Height="8"  Width="112" Canvas.Left="64"  Canvas.Top="679" IsFlowing="{Binding PVC1ValveIsOpen}" 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"/>
             <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"/>

+ 1 - 1
Venus/Venus_RT/Config/PM/VenusSE/VenusSEDeviceModel.xml

@@ -27,7 +27,7 @@
 		<IoValve id="ValvePV52" display="PV52 Valve" schematicId="PV52" unit="" isNc="true"
 				isDefaultOpen="false" diOpen="" doOpen="DO_PV52" diCloseSensor="" diOpenSensor="" />
 		<IoValve id="ValvePV61" display="PV61 Valve" schematicId="PV61" unit="" isNc="true"
-		isDefaultOpen="false" diOpen="" doOpen="DO_PV41" diCloseSensor="" diOpenSensor="" />
+		isDefaultOpen="false" diOpen="" doOpen="DO_PV61" diCloseSensor="" diOpenSensor="" />
 		<IoValve id="ValvePV62" display="PV62 Valve" schematicId="PV62" unit="" isNc="true"
 				isDefaultOpen="false" diOpen="" doOpen="DO_PV62" diCloseSensor="" diOpenSensor="" />
 		<IoValve id="ValvePV71" display="PV71 Valve" schematicId="PV71" unit="" isNc="true"