Browse Source

Venus DE ui&viewmodel update

hecl 1 year ago
parent
commit
dbe33e8d29

+ 14 - 3
Venus/Venus_MainPages/ViewModels/OverVenusDEViewModel.cs

@@ -89,8 +89,8 @@ namespace Venus_MainPages.ViewModels
 
         private double m_HeGasSetpoint;
         private int m_HePressureSetpoint;
-
-
+        private bool m_Valve12Visible;
+        private bool m_Valve11Visible;
         private float m_SRFFwdPowerSetpoint;
         private float m_BRFFwdPowerSetpoint;
 
@@ -271,6 +271,16 @@ namespace Venus_MainPages.ViewModels
             get { return m_IsTurboPumpAtSpeed; }
             set { SetProperty(ref m_IsTurboPumpAtSpeed, value); }
         }
+        public bool Valve12Visible
+        {
+            get { return m_Valve12Visible; }
+            set { SetProperty(ref m_Valve12Visible, value); }
+        }
+        public bool Valve11Visible
+        {
+            get { return m_Valve11Visible; }
+            set { SetProperty(ref m_Valve11Visible, value); }
+        }
         public bool TurboPumpWaterFlowSwitch
         {
             get { return m_TurboPumpWaterFlowSwitch; }
@@ -1653,7 +1663,8 @@ namespace Venus_MainPages.ViewModels
                 {
                     return;
                 }
-
+                Valve12Visible = (bool)QueryDataClient.Instance.Service.GetConfig($"{ModuleName}.MfcGas12.Enable");
+                Valve11Visible = (bool)QueryDataClient.Instance.Service.GetConfig($"{ModuleName}.MfcGas11.Enable");
                 TurboN2FlowSetPoint = Convert.ToInt32(QueryDataClient.Instance.Service.GetConfig($"{ModuleName}.TurboN2FlowSetPoint"));
 
                 PVN21ValveIsOpen = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.ValvePVN21.IsOpen");

File diff suppressed because it is too large
+ 31 - 33
Venus/Venus_MainPages/Views/OverVenusDEView.xaml


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

@@ -872,9 +872,7 @@
                     </MultiBinding>
                 </TextBlock.Text>
             </TextBlock>
-            <Border Background="#b1d2f2" Width="24" Height="570" Canvas.Top="118" Canvas.Left="61" Panel.ZIndex="2" HorizontalAlignment="Center" VerticalAlignment="Top">
 
-            </Border>
         </Canvas>
         <Canvas Canvas.Right="2050" Canvas.Top="70">
             <Ellipse Width="20" Height="20" Fill="{Binding PVHe1ValveIsOpen,Converter={StaticResource boolToColor}}"  Canvas.Left="926" Canvas.Top="687" Stroke="Silver" StrokeThickness="2"/>