IoSensor和管路 优化

Venus/Venus_MainPages/ViewModels/OperationOverViewModel.cs

@@ -1265,8 +1265,8 @@ namespace Venus_MainPages.ViewModels
             m_RtDataKeys.Add("TM.LLBESlitDoor.IsClosed");
             m_RtDataKeys.Add("TM.IsOnline");
             m_RtDataKeys.Add("TM.TMProcessGauge.Value");
-            m_RtDataKeys.Add("TM.TMATMSwitch.Value");
-            m_RtDataKeys.Add("TM.TMVacSwitch.Value");
+            m_RtDataKeys.Add("TM.IoSensor.TMATMSwitch.Value");
+            m_RtDataKeys.Add("TM.IoSensor.TMVacSwitch.Value");
             m_RtDataKeys.Add("TM.TMProcessGauge.Value");
             m_RtDataKeys.Add("TM.TMLidClosed");
             m_RtDataKeys.Add("TM.LLALidClosed");
@@ -1278,12 +1278,12 @@ namespace Venus_MainPages.ViewModels
             m_RtDataKeys.Add("TM.PMDSlitDoor.IsClosed");
             m_RtDataKeys.Add("LLA.IsOnline");
             m_RtDataKeys.Add($"TM.LLAPressureGauge.Value");
-            m_RtDataKeys.Add($"TM.LLAVacSwitch.Value");
-            m_RtDataKeys.Add($"TM.LLAATMSwitch.Value");
+            m_RtDataKeys.Add($"TM.IoSensor.LLAVacSwitch.Value");
+            m_RtDataKeys.Add($"TM.IoSensor.LLAATMSwitch.Value");
             m_RtDataKeys.Add("LLB.IsOnline");
             m_RtDataKeys.Add($"TM.LLBPressureGauge.Value");
-            m_RtDataKeys.Add($"TM.LLBVacSwitch.Value");
-            m_RtDataKeys.Add($"TM.LLBATMSwitch.Value");
+            m_RtDataKeys.Add($"TM.IoSensor.LLBVacSwitch.Value");
+            m_RtDataKeys.Add($"TM.IoSensor.LLBATMSwitch.Value");
             m_RtDataKeys.Add("LP1.IsLoaded");
             m_RtDataKeys.Add("LP2.IsLoaded");
             m_RtDataKeys.Add("LP3.IsLoaded");

Venus/Venus_MainPages/ViewModels/TMOperationViewModel.cs

@@ -618,12 +618,12 @@ namespace Venus_MainPages.ViewModels
             m_RtDataKeys.Add($"TM.LLBVentExhaustValve.IsOpen");
 
 
-            m_RtDataKeys.Add($"TM.TMVacSwitch.Value");
-            m_RtDataKeys.Add($"TM.LLAVacSwitch.Value");
-            m_RtDataKeys.Add($"TM.LLBVacSwitch.Value");
-            m_RtDataKeys.Add($"TM.TMATMSwitch.Value");
-            m_RtDataKeys.Add($"TM.LLAATMSwitch.Value");
-            m_RtDataKeys.Add($"TM.LLBATMSwitch.Value");
+            m_RtDataKeys.Add($"TM.IoSensor.TMVacSwitch.Value");
+            m_RtDataKeys.Add($"TM.IoSensor.LLAVacSwitch.Value");
+            m_RtDataKeys.Add($"TM.IoSensor.LLBVacSwitch.Value");
+            m_RtDataKeys.Add($"TM.IoSensor.TMATMSwitch.Value");
+            m_RtDataKeys.Add($"TM.IoSensor.LLAATMSwitch.Value");
+            m_RtDataKeys.Add($"TM.IoSensor.LLBATMSwitch.Value");
             m_RtDataKeys.Add($"TM.TMProcessGauge.Value");
             m_RtDataKeys.Add($"TM.TMForelineGauge.Value");
             m_RtDataKeys.Add($"TM.LLAPressureGauge.Value");

Venus/Venus_MainPages/Views/OperationOverView.xaml

@@ -550,14 +550,14 @@
             </Grid>
 
             <userControls:TextboxWithLabel  Canvas.Left="740" Canvas.Top="425" LabelValue="{Binding PressureType, StringFormat=CM4({0})}" TextBoxValue="{Binding RtDataValues[TM.LLBPressureGauge.Value],StringFormat='F1'}" TextBoxColor="#E6ECF5"/>
-            <Ellipse Width="15" Height="15"  Canvas.Left="820" Canvas.Top="426" Fill="{Binding RtDataValues[TM.LLBATMSwitch.Value],Converter={StaticResource boolToColor}}"  Stroke="Silver" StrokeThickness="2"></Ellipse>
-            <Ellipse Width="15" Height="15"  Canvas.Left="820" Canvas.Top="446" Fill="{Binding RtDataValues[TM.LLBVacSwitch.Value],Converter={StaticResource boolToColor}}"  Stroke="Silver" StrokeThickness="2"></Ellipse>
+            <Ellipse Width="15" Height="15"  Canvas.Left="820" Canvas.Top="426" Fill="{Binding RtDataValues[TM.IoSensor.LLBATMSwitch.Value],Converter={StaticResource boolToColor}}"  Stroke="Silver" StrokeThickness="2"></Ellipse>
+            <Ellipse Width="15" Height="15"  Canvas.Left="820" Canvas.Top="446" Fill="{Binding RtDataValues[TM.IoSensor.LLBVacSwitch.Value],Converter={StaticResource boolToColor}}"  Stroke="Silver" StrokeThickness="2"></Ellipse>
             <TextBlock Text="ATM" Canvas.Left="840" Canvas.Top="426"/>
             <TextBlock Text="VAC" Canvas.Left="840" Canvas.Top="446"/>
 
             <userControls:TextboxWithLabel  Canvas.Left="386" Canvas.Top="425" LabelValue="{Binding PressureType, StringFormat=CM5({0})}" TextBoxValue="{Binding RtDataValues[TM.LLAPressureGauge.Value],StringFormat='F1'}" TextBoxColor="#E6ECF5"/>
-            <Ellipse Width="15" Height="15"  Canvas.Left="360" Canvas.Top="426" Fill="{Binding RtDataValues[TM.LLAATMSwitch.Value],Converter={StaticResource boolToColor}}"  Stroke="Silver" StrokeThickness="2"></Ellipse>
-            <Ellipse Width="15" Height="15"  Canvas.Left="360" Canvas.Top="446" Fill="{Binding RtDataValues[TM.LLAVacSwitch.Value],Converter={StaticResource boolToColor}}"  Stroke="Silver" StrokeThickness="2"></Ellipse>
+            <Ellipse Width="15" Height="15"  Canvas.Left="360" Canvas.Top="426" Fill="{Binding RtDataValues[TM.IoSensor.LLAATMSwitch.Value],Converter={StaticResource boolToColor}}"  Stroke="Silver" StrokeThickness="2"></Ellipse>
+            <Ellipse Width="15" Height="15"  Canvas.Left="360" Canvas.Top="446" Fill="{Binding RtDataValues[TM.IoSensor.LLAVacSwitch.Value],Converter={StaticResource boolToColor}}"  Stroke="Silver" StrokeThickness="2"></Ellipse>
             <TextBlock Text="ATM" Canvas.Left="330" Canvas.Top="426"/>
             <TextBlock Text="VAC" Canvas.Left="330" Canvas.Top="446"/>
 

Venus/Venus_MainPages/Views/OverKepler2200AView.xaml

@@ -194,7 +194,7 @@
                         <RotateTransform Angle="180"/>
                     </Image.RenderTransform>
                 </Image>
-                <ctrls:FlowPipe   Height="8"  Width="45" Canvas.Left="257"  Canvas.Top="180" RotateTransformValue="90" IsReverse="True">
+                <ctrls:FlowPipe   Height="8"  Width="46" Canvas.Left="257"  Canvas.Top="180" RotateTransformValue="90" IsReverse="True">
                     <ctrls:FlowPipe.IsFlowing>
                         <MultiBinding Converter="{StaticResource toBoolMultiValueConverter2}">
                             <Binding Path="PV12ValveIsOpen"/>
@@ -346,7 +346,7 @@
 
 
                 <Ellipse Width="20" Height="20"  Canvas.Left="90" Canvas.Top="114" Fill="{Binding MFCN2Data.IsWarning,Converter={StaticResource boolToColor4}}"   Stroke="Silver" StrokeThickness="2" ToolTip="Pressure Alarm"></Ellipse>
-                <Ellipse Width="20" Height="20"  Canvas.Left="90" Canvas.Top="174" Fill="{Binding MFCN2Data.IsWarning,Converter={StaticResource boolToColor4}}"   Stroke="Silver" StrokeThickness="2" ToolTip="Pressure Alarm"></Ellipse>
+                <!--<Ellipse Width="20" Height="20"  Canvas.Left="90" Canvas.Top="174" Fill="{Binding MFCN2Data.IsWarning,Converter={StaticResource boolToColor4}}"   Stroke="Silver" StrokeThickness="2" ToolTip="Pressure Alarm"></Ellipse>-->
                 <Ellipse Width="20" Height="20"  Canvas.Left="90" Canvas.Top="224" Fill="{Binding MFC1Data.IsWarning,Converter={StaticResource boolToColor4}}"  Stroke="Silver" StrokeThickness="2" ToolTip="Pressure Alarm"></Ellipse>
                 <Ellipse Width="20" Height="20"  Canvas.Left="90" Canvas.Top="280" Fill="{Binding MFC2Data.IsWarning,Converter={StaticResource boolToColor4}}"  Stroke="Silver" StrokeThickness="2" ToolTip="Pressure Alarm"></Ellipse>
                 <Ellipse Width="20" Height="20"  Canvas.Left="90" Canvas.Top="336" Fill="{Binding MFC3Data.IsWarning,Converter={StaticResource boolToColor4}}"  Stroke="Silver" StrokeThickness="2" ToolTip="Pressure Alarm"></Ellipse>
@@ -429,11 +429,11 @@
 
 
 
-                <ctrls:FlowPipe  Height="8"  Width="36" Canvas.Left="815" Canvas.Top="85"  RotateTransformValue="90" IsReverse="False">
-                    <ctrls:FlowPipe.IsFlowing>
+                <ctrls:FlowPipe  Height="8"  Width="36" Canvas.Left="815" Canvas.Top="85"  RotateTransformValue="90" IsReverse="False" IsFlowing="{Binding PurgeValveIsOpen}">
+                    <!--<ctrls:FlowPipe.IsFlowing>
                         <MultiBinding Converter="{StaticResource toBoolMultiValueConverter4}">
                             <Binding Path="PurgeValveIsOpen"/>
-                            <!--<Binding Path="N2ValveIsOpen"/>-->
+                            --><!--<Binding Path="N2ValveIsOpen"/>--><!--
                             <Binding Path="PV11ValveIsOpen"/>
                             <Binding Path="PV21ValveIsOpen"/>
                             <Binding Path="PV31ValveIsOpen"/>
@@ -441,7 +441,7 @@
                             <Binding Path="MFC5ValveIsOpen"/>
                             <Binding Path="MFC6ValveIsOpen"/>
                         </MultiBinding>
-                    </ctrls:FlowPipe.IsFlowing>
+                    </ctrls:FlowPipe.IsFlowing>-->
                 </ctrls:FlowPipe>
 
 

Venus/Venus_MainPages/Views/OverKepler2200BView.xaml

@@ -194,7 +194,7 @@
                         <RotateTransform Angle="180"/>
                     </Image.RenderTransform>
                 </Image>
-                <ctrls:FlowPipe   Height="8"  Width="45" Canvas.Left="257"  Canvas.Top="180" RotateTransformValue="90" IsReverse="True">
+                <ctrls:FlowPipe   Height="8"  Width="46" Canvas.Left="257"  Canvas.Top="180" RotateTransformValue="90" IsReverse="True">
                     <ctrls:FlowPipe.IsFlowing>
                         <MultiBinding Converter="{StaticResource toBoolMultiValueConverter2}">
                             <Binding Path="PV12ValveIsOpen"/>
@@ -346,7 +346,7 @@
 
 
                 <Ellipse Width="20" Height="20"  Canvas.Left="90" Canvas.Top="114" Fill="{Binding MFCN2Data.IsWarning,Converter={StaticResource boolToColor4}}"   Stroke="Silver" StrokeThickness="2" ToolTip="Pressure Alarm"></Ellipse>
-                <Ellipse Width="20" Height="20"  Canvas.Left="90" Canvas.Top="174" Fill="{Binding MFCN2Data.IsWarning,Converter={StaticResource boolToColor4}}"   Stroke="Silver" StrokeThickness="2" ToolTip="Pressure Alarm"></Ellipse>
+                <!--<Ellipse Width="20" Height="20"  Canvas.Left="90" Canvas.Top="174" Fill="{Binding MFCN2Data.IsWarning,Converter={StaticResource boolToColor4}}"   Stroke="Silver" StrokeThickness="2" ToolTip="Pressure Alarm"></Ellipse>-->
                 <Ellipse Width="20" Height="20"  Canvas.Left="90" Canvas.Top="224" Fill="{Binding MFC1Data.IsWarning,Converter={StaticResource boolToColor4}}"  Stroke="Silver" StrokeThickness="2" ToolTip="Pressure Alarm"></Ellipse>
                 <Ellipse Width="20" Height="20"  Canvas.Left="90" Canvas.Top="280" Fill="{Binding MFC2Data.IsWarning,Converter={StaticResource boolToColor4}}"  Stroke="Silver" StrokeThickness="2" ToolTip="Pressure Alarm"></Ellipse>
                 <Ellipse Width="20" Height="20"  Canvas.Left="90" Canvas.Top="336" Fill="{Binding MFC3Data.IsWarning,Converter={StaticResource boolToColor4}}"  Stroke="Silver" StrokeThickness="2" ToolTip="Pressure Alarm"></Ellipse>
@@ -431,11 +431,11 @@
 
 
 
-                <ctrls:FlowPipe  Height="8"  Width="36" Canvas.Left="815" Canvas.Top="85"  RotateTransformValue="90" IsReverse="False">
-                    <ctrls:FlowPipe.IsFlowing>
+                <ctrls:FlowPipe  Height="8"  Width="36" Canvas.Left="815" Canvas.Top="85"  RotateTransformValue="90" IsReverse="False" IsFlowing="{Binding PurgeValveIsOpen}">
+                    <!--<ctrls:FlowPipe.IsFlowing>
                         <MultiBinding Converter="{StaticResource toBoolMultiValueConverter4}">
                             <Binding Path="PurgeValveIsOpen"/>
-                            <!--<Binding Path="N2ValveIsOpen"/>-->
+                            --><!--<Binding Path="N2ValveIsOpen"/>--><!--
                             <Binding Path="PV11ValveIsOpen"/>
                             <Binding Path="PV21ValveIsOpen"/>
                             <Binding Path="PV31ValveIsOpen"/>
@@ -443,7 +443,7 @@
                             <Binding Path="MFC5ValveIsOpen"/>
                             <Binding Path="MFC6ValveIsOpen"/>
                         </MultiBinding>
-                    </ctrls:FlowPipe.IsFlowing>
+                    </ctrls:FlowPipe.IsFlowing>-->
                 </ctrls:FlowPipe>
 
 

Venus/Venus_MainPages/Views/TMOperationView.xaml

@@ -330,8 +330,8 @@
                     <RotateTransform Angle="90"/>
                 </Border.RenderTransform>
             </Border>
-            <Ellipse Width="20" Height="20"  Canvas.Left="817" Canvas.Top="210" Fill="{Binding RtDataValues[TM.TMATMSwitch.Value],Converter={StaticResource boolToColor}}"  Stroke="Silver" StrokeThickness="2"></Ellipse>
-            <Ellipse Width="20" Height="20"  Canvas.Left="797" Canvas.Top="264" Fill="{Binding RtDataValues[TM.TMVacSwitch.Value],Converter={StaticResource boolToColor}}"  Stroke="Silver" StrokeThickness="2"></Ellipse>
+            <Ellipse Width="20" Height="20"  Canvas.Left="817" Canvas.Top="210" Fill="{Binding RtDataValues[TM.IoSensor.TMATMSwitch.Value],Converter={StaticResource boolToColor}}"  Stroke="Silver" StrokeThickness="2"></Ellipse>
+            <Ellipse Width="20" Height="20"  Canvas.Left="797" Canvas.Top="264" Fill="{Binding RtDataValues[TM.IoSensor.TMVacSwitch.Value],Converter={StaticResource boolToColor}}"  Stroke="Silver" StrokeThickness="2"></Ellipse>
             <userControls:TextboxWithLabel  Canvas.Left="838" Canvas.Top="218" LabelValue="{Binding PressureType, StringFormat=CM3({0})}" TextBoxValue="{Binding RtDataValues[TM.TMProcessGauge.Value],StringFormat='F1'}" TextBoxColor="#E6ECF5"/>
             <TextBlock Text="ATM" Canvas.Left="814" Canvas.Top="195"/>
             <TextBlock Text="VAC" Canvas.Left="795" Canvas.Top="286"/>
@@ -351,8 +351,8 @@
                     <RotateTransform Angle="90"/>
                 </Border.RenderTransform>
             </Border>
-            <Ellipse Width="20" Height="20"  Canvas.Left="837" Canvas.Top="544" Fill="{Binding RtDataValues[TM.LLBATMSwitch.Value],Converter={StaticResource boolToColor}}"  Stroke="Silver" StrokeThickness="2"></Ellipse>
-            <Ellipse Width="20" Height="20"  Canvas.Left="817" Canvas.Top="544" Fill="{Binding RtDataValues[TM.LLBVacSwitch.Value],Converter={StaticResource boolToColor}}"  Stroke="Silver" StrokeThickness="2"></Ellipse>
+            <Ellipse Width="20" Height="20"  Canvas.Left="837" Canvas.Top="544" Fill="{Binding RtDataValues[TM.IoSensor.LLBATMSwitch.Value],Converter={StaticResource boolToColor}}"  Stroke="Silver" StrokeThickness="2"></Ellipse>
+            <Ellipse Width="20" Height="20"  Canvas.Left="817" Canvas.Top="544" Fill="{Binding RtDataValues[TM.IoSensor.LLBVacSwitch.Value],Converter={StaticResource boolToColor}}"  Stroke="Silver" StrokeThickness="2"></Ellipse>
             <userControls:TextboxWithLabel  Canvas.Left="858" Canvas.Top="498" LabelValue="{Binding PressureType, StringFormat=CM4({0})}" TextBoxValue="{Binding RtDataValues[TM.LLBPressureGauge.Value],StringFormat='F1'}" TextBoxColor="#E6ECF5"/>
             <TextBlock Text="ATM" Canvas.Left="468" Canvas.Top="565"/>
             <TextBlock Text="VAC" Canvas.Left="440" Canvas.Top="565"/>
@@ -373,8 +373,8 @@
                     <RotateTransform Angle="90"/>
                 </Border.RenderTransform>
             </Border>
-            <Ellipse Width="20" Height="20"  Canvas.Left="467" Canvas.Top="544" Fill="{Binding RtDataValues[TM.LLAATMSwitch.Value],Converter={StaticResource boolToColor}}"  Stroke="Silver" StrokeThickness="2"></Ellipse>
-            <Ellipse Width="20" Height="20"  Canvas.Left="447" Canvas.Top="544" Fill="{Binding RtDataValues[TM.LLAVacSwitch.Value],Converter={StaticResource boolToColor}}"  Stroke="Silver" StrokeThickness="2"></Ellipse>
+            <Ellipse Width="20" Height="20"  Canvas.Left="467" Canvas.Top="544" Fill="{Binding RtDataValues[TM.IoSensor.LLAATMSwitch.Value],Converter={StaticResource boolToColor}}"  Stroke="Silver" StrokeThickness="2"></Ellipse>
+            <Ellipse Width="20" Height="20"  Canvas.Left="447" Canvas.Top="544" Fill="{Binding RtDataValues[TM.IoSensor.LLAVacSwitch.Value],Converter={StaticResource boolToColor}}"  Stroke="Silver" StrokeThickness="2"></Ellipse>
             <userControls:TextboxWithLabel  Canvas.Left="378" Canvas.Top="498" LabelValue="{Binding PressureType, StringFormat=CM5({0})}" TextBoxValue="{Binding RtDataValues[TM.LLAPressureGauge.Value],StringFormat='F1'}" TextBoxColor="#E6ECF5"/>
 
             <TextBlock Text="ATM" Canvas.Left="838" Canvas.Top="565"/>