Pārlūkot izejas kodu

fix the bug in SETMOperationView as offline.

zhouhr 1 gadu atpakaļ
vecāks
revīzija
9d5c55e2d2
1 mainītis faili ar 8 papildinājumiem un 8 dzēšanām
  1. 8 8
      Venus/Venus_MainPages/Views/SETMOperationView.xaml

+ 8 - 8
Venus/Venus_MainPages/Views/SETMOperationView.xaml

@@ -159,12 +159,12 @@
                     <!-- Soft vent -->
                     <userControls:TextboxWithLabel  Canvas.Top="-106" Canvas.Left="320" TextBoxValue="{Binding RtDataValues[SETM.TM_MFC1.SetPoint],Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  IsReadOnly="False"  LabelValue="MFC"  TextBoxColor="White" HorizontalAlignment="Left" VerticalAlignment="Center" Panel.ZIndex="3" Width="74"/>
                     <userControls:TextboxWithLabel  Canvas.Top="-89" Canvas.Left="320" LabelValue="" TextBoxValue="{Binding RtDataValues[SETM.TM_MFC1.FeedBack],StringFormat='F1'}" TextBoxColor="#D7E4BD" Panel.ZIndex="3" HorizontalAlignment="Left" VerticalAlignment="Center" Width="74" Height="45" />
-                    <customControls:CommonValveControl Canvas.Left="412" Canvas.Top="-87" Status="{Binding TMSoftVentIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Tag="TMSoftVent" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" IsCanEdit="{Binding TMIsOFFline}" Panel.ZIndex="3" HorizontalAlignment="Left" VerticalAlignment="Center"/>
+                    <customControls:CommonValveControl Canvas.Left="412" Canvas.Top="-87" Status="{Binding TMSoftVentIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Tag="TMSoftVent" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" IsCanEdit="{Binding  RtDataValues[SETM.IsOffline]}" Panel.ZIndex="3" HorizontalAlignment="Left" VerticalAlignment="Center"/>
                     <userControls:FlowPipe   Height="8"  Width="120" Canvas.Left="315" Canvas.Top="-81" IsFlowing="{Binding TMSoftVentIsOpen}" HorizontalAlignment="Left" VerticalAlignment="Top"/>
                     <userControls:FlowPipe   Height="8"  Width="30" Canvas.Left="315" Canvas.Top="-110" IsFlowing="{Binding TMSoftVentIsOpen}" RotateTransformValue="90" HorizontalAlignment="Center" VerticalAlignment="Top"></userControls:FlowPipe>
                     <userControls:FlowPipe   Height="8"  Width="30" Canvas.Left="445" Canvas.Top="-110" IsFlowing="{Binding TMSoftVentIsOpen}" RotateTransformValue="90" HorizontalAlignment="Center" VerticalAlignment="Top"></userControls:FlowPipe>
                     <!-- fast vent -->
-                    <customControls:CommonValveControl Canvas.Left="365" Canvas.Top="-150" Status="{Binding TMFastVentIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Tag="TMFastVent" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" IsCanEdit="{Binding TMIsOFFline}" Panel.ZIndex="3" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+                    <customControls:CommonValveControl Canvas.Left="365" Canvas.Top="-150" Status="{Binding TMFastVentIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Tag="TMFastVent" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" IsCanEdit="{Binding  RtDataValues[SETM.IsOffline]}" Panel.ZIndex="3" HorizontalAlignment="Center" VerticalAlignment="Top"/>
                     <userControls:FlowPipe   Height="8"  Width="120" Canvas.Left="315" Canvas.Top="-144" IsFlowing="{Binding TMFastVentIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
                     <userControls:FlowPipe   Height="8"  Width="30" Canvas.Left="315" Canvas.Top="-137" IsFlowing="{Binding TMFastVentIsOpen}" RotateTransformValue="90" HorizontalAlignment="Center" VerticalAlignment="Top"></userControls:FlowPipe>
                     <userControls:FlowPipe   Height="8"  Width="30" Canvas.Left="445" Canvas.Top="-137" IsFlowing="{Binding TMFastVentIsOpen}" RotateTransformValue="90" HorizontalAlignment="Center" VerticalAlignment="Top"></userControls:FlowPipe>
@@ -181,13 +181,13 @@
 
                     <!-- vce vent -->
                     <!-- vce fast vent-->
-                    <customControls:CommonValveControl Status="{Binding VCEFastVentIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="365" Canvas.Top="197"  Tag="VCEFastVent" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" IsCanEdit="{Binding TMIsOFFline}" Panel.ZIndex="3" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+                    <customControls:CommonValveControl Status="{Binding VCEFastVentIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="365" Canvas.Top="197"  Tag="VCEFastVent" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" IsCanEdit="{Binding  RtDataValues[SETM.IsOffline]}" Panel.ZIndex="3" HorizontalAlignment="Center" VerticalAlignment="Top"/>
                     <userControls:FlowPipe   Height="8"  Width="120" Canvas.Left="315" Canvas.Top="204" IsFlowing="{Binding VCEFastVentIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
                     <userControls:FlowPipe   Height="8"  Width="30" Canvas.Left="315" Canvas.Top="214" IsFlowing="{Binding VCEFastVentIsOpen}" RotateTransformValue="90" HorizontalAlignment="Center" VerticalAlignment="Top"></userControls:FlowPipe>
                     <userControls:FlowPipe   Height="8"  Width="30" Canvas.Left="445" Canvas.Top="214" IsFlowing="{Binding VCEFastVentIsOpen}" RotateTransformValue="90" HorizontalAlignment="Center" VerticalAlignment="Top"></userControls:FlowPipe>
 
                     <!-- vce soft vent -->
-                    <customControls:CommonValveControl Status="{Binding VCESoftVentIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="365" Canvas.Top="258"  Tag="VCESoftVent" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" IsCanEdit="{Binding TMIsOFFline}" Panel.ZIndex="3" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+                    <customControls:CommonValveControl Status="{Binding VCESoftVentIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="365" Canvas.Top="258"  Tag="VCESoftVent" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" IsCanEdit="{Binding  RtDataValues[SETM.IsOffline]}" Panel.ZIndex="3" HorizontalAlignment="Center" VerticalAlignment="Top"/>
                     <userControls:FlowPipe   Height="8"  Width="120" Canvas.Left="315" Canvas.Top="264" IsFlowing="{Binding VCESoftVentIsOpen}" HorizontalAlignment="Left" VerticalAlignment="Top"/>
                     <userControls:FlowPipe   Height="8"  Width="30" Canvas.Left="315" Canvas.Top="234" IsFlowing="{Binding VCESoftVentIsOpen}" RotateTransformValue="90" HorizontalAlignment="Center" VerticalAlignment="Top"></userControls:FlowPipe>
                     <userControls:FlowPipe   Height="8"  Width="30" Canvas.Left="445" Canvas.Top="234" IsFlowing="{Binding VCESoftVentIsOpen}" RotateTransformValue="90" HorizontalAlignment="Center" VerticalAlignment="Top"></userControls:FlowPipe>
@@ -204,13 +204,13 @@
                     <userControls:TextboxWithLabel  Canvas.Left="1080" Canvas.Top="39" LabelValue="CM(Torr)" TextBoxValue="{Binding RtDataValues[SETM.TMPipelinePressure.Value],StringFormat='F1'}" TextBoxColor="#D7E4BD" Panel.ZIndex="3"/>
 
                     <!--TM fast pump-->
-                    <customControls:CommonValveControl Status="{Binding TMFastPumpIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="900" Canvas.Top="-151"  Tag="TMFastPump" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" IsCanEdit="{Binding TMIsOFFline}" Panel.ZIndex="3" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    <customControls:CommonValveControl Status="{Binding TMFastPumpIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="900" Canvas.Top="-151"  Tag="TMFastPump" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" IsCanEdit="{Binding  RtDataValues[SETM.IsOffline]}" Panel.ZIndex="3" HorizontalAlignment="Center" VerticalAlignment="Center"/>
                     <userControls:FlowPipe   Height="8"  Width="120" Canvas.Left="850" Canvas.Top="-144" IsFlowing="{Binding TMFastPumpIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
                     <userControls:FlowPipe   Height="8"  Width="30" Canvas.Left="850" Canvas.Top="-137"  IsFlowing="{Binding TMFastPumpIsOpen}" RotateTransformValue="90" HorizontalAlignment="Center" VerticalAlignment="Top"></userControls:FlowPipe>
                     <userControls:FlowPipe   Height="8"  Width="30" Canvas.Left="978" Canvas.Top="-137"  IsFlowing="{Binding TMFastPumpIsOpen}" RotateTransformValue="90" HorizontalAlignment="Center" VerticalAlignment="Top"></userControls:FlowPipe>
 
                     <!--TM soft pump-->
-                    <customControls:CommonValveControl Status="{Binding TMSoftPumpIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="900" Canvas.Top="-87"  Tag="TMSoftPump" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" IsCanEdit="{Binding TMIsOFFline}" Panel.ZIndex="3" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+                    <customControls:CommonValveControl Status="{Binding TMSoftPumpIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="900" Canvas.Top="-87"  Tag="TMSoftPump" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" IsCanEdit="{Binding  RtDataValues[SETM.IsOffline]}" Panel.ZIndex="3" HorizontalAlignment="Center" VerticalAlignment="Top"/>
                     <userControls:FlowPipe   Height="8"  Width="120" Canvas.Left="850" Canvas.Top="-81" IsFlowing="{Binding TMSoftPumpIsOpen}" HorizontalAlignment="Left" VerticalAlignment="Top"/>
                     <userControls:FlowPipe   Height="8"  Width="30" Canvas.Left="850" Canvas.Top="-110" IsFlowing="{Binding TMSoftPumpIsOpen}" RotateTransformValue="90" HorizontalAlignment="Center" VerticalAlignment="Top"></userControls:FlowPipe>
                     <userControls:FlowPipe   Height="8"  Width="30" Canvas.Left="978" Canvas.Top="-110" IsFlowing="{Binding TMSoftPumpIsOpen}" RotateTransformValue="90" HorizontalAlignment="Center" VerticalAlignment="Top"></userControls:FlowPipe>
@@ -236,13 +236,13 @@
                     <!-- vce pump-->
 
                     <!-- vce fast pump-->
-                    <customControls:CommonValveControl Status="{Binding VCESoftPumpIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="900" Canvas.Top="198"  Tag="VCESoftPump" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" IsCanEdit="{Binding TMIsOFFline}" Panel.ZIndex="3" HorizontalAlignment="Left" VerticalAlignment="Center"/>
+                    <customControls:CommonValveControl Status="{Binding VCESoftPumpIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="900" Canvas.Top="198"  Tag="VCESoftPump" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" IsCanEdit="{Binding  RtDataValues[SETM.IsOffline]}" Panel.ZIndex="3" HorizontalAlignment="Left" VerticalAlignment="Center"/>
                     <userControls:FlowPipe   Height="8"  Width="120" Canvas.Left="845" Canvas.Top="204" IsFlowing="{Binding VCESoftPumpIsOpen}" HorizontalAlignment="Center" VerticalAlignment="Top"/>
                     <userControls:FlowPipe   Height="8"  Width="30" Canvas.Left="845" Canvas.Top="214"  IsFlowing="{Binding VCESoftPumpIsOpen}" RotateTransformValue="90" HorizontalAlignment="Center" VerticalAlignment="Top"></userControls:FlowPipe>
                     <userControls:FlowPipe   Height="8"  Width="30" Canvas.Left="973" Canvas.Top="214"  IsFlowing="{Binding VCESoftPumpIsOpen}" RotateTransformValue="90" HorizontalAlignment="Center" VerticalAlignment="Top"></userControls:FlowPipe>
 
                     <!-- vce soft pump-->
-                    <customControls:CommonValveControl Status="{Binding VCEFastPumpIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="900" Canvas.Top="258"  Tag="VCEFastPump" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" IsCanEdit="{Binding TMIsOFFline}" Panel.ZIndex="3" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+                    <customControls:CommonValveControl Status="{Binding VCEFastPumpIsOpen,Mode=TwoWay}"  ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="900" Canvas.Top="258"  Tag="VCEFastPump" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}" IsCanEdit="{Binding  RtDataValues[SETM.IsOffline]}" Panel.ZIndex="3" HorizontalAlignment="Center" VerticalAlignment="Top"/>
 
                     <userControls:FlowPipe   Height="8"  Width="120" Canvas.Left="845" Canvas.Top="264" IsFlowing="{Binding VCEFastPumpIsOpen}" HorizontalAlignment="Left" VerticalAlignment="Top"/>
                     <userControls:FlowPipe   Height="8"  Width="30" Canvas.Left="845" Canvas.Top="234"  IsFlowing="{Binding VCEFastPumpIsOpen}" RotateTransformValue="90" HorizontalAlignment="Center" VerticalAlignment="Top"></userControls:FlowPipe>