Browse Source

Upload missing code and remove the PM pressure display.

kuangzl 9 months ago
parent
commit
f56adfe739

+ 4 - 4
Venus/Venus_MainPages/ViewModels/VenusDETMViewModel.cs

@@ -559,7 +559,7 @@ namespace Venus_MainPages.ViewModels
             {
                 case "Pick":
                     PickSoltItemsSource.Clear();
-                    if ((int)PickSelectedModule == 3)
+                    if ((int)PickSelectedModule == 4|| (int)PickSelectedModule == 5)
                     {
                         for (int i = 1; i <= 25; i++)
                         {
@@ -575,7 +575,7 @@ namespace Venus_MainPages.ViewModels
                     break;
                 case "Place":
                     PlaceSoltItemsSource.Clear();
-                    if ((int)PlaceSelectedModule == 3)
+                    if ((int)PlaceSelectedModule == 4|| (int)PlaceSelectedModule == 5)
                     {
                         for (int i = 1; i <= 25; i++)
                         {
@@ -591,7 +591,7 @@ namespace Venus_MainPages.ViewModels
                     break;
                 case "Extend":
                     ExtendSoltItemsSource.Clear();
-                    if ((int)ExtendSelectedModule == 3)
+                    if ((int)ExtendSelectedModule == 4|| (int)ExtendSelectedModule == 5)
                     {
                         for (int i = 1; i <= 25; i++)
                         {
@@ -607,7 +607,7 @@ namespace Venus_MainPages.ViewModels
                     break;
                 case "Retract":
                     RetractSoltItemsSource.Clear();
-                    if ((int)RetractSelectedModule == 3)
+                    if ((int)RetractSelectedModule == 4|| (int)RetractSelectedModule == 5)
                     {
                         for (int i = 1; i <= 25; i++)
                         {

File diff suppressed because it is too large
+ 13 - 32
Venus/Venus_MainPages/Views/VenusDeOperationOverView.xaml


+ 8 - 6
Venus/Venus_Themes/UserControls/TMChamber.xaml

@@ -57,7 +57,9 @@
 
 
             <Canvas Width="200" Height="200" Grid.Row="1">
-                <Border Canvas.Top="-54" Canvas.Left="-9" Height="44" Width="210" Background="Transparent" BorderBrush="Gainsboro" BorderThickness="0,0,3,3" CornerRadius="3" Visibility="{Binding ElementName=tmChamber,Path=IsVenting,Converter={StaticResource bool2VisibilityConverter}}">
+                <!--<Border Canvas.Top="-54" Canvas.Left="-9" Height="44" Width="210" Background="Transparent" BorderBrush="Gainsboro" BorderThickness="0,0,3,3" CornerRadius="3" Visibility="{Binding ElementName=tmChamber,Path=IsVenting,Converter={StaticResource bool2VisibilityConverter}}">-->
+
+                    <Border Canvas.Top="-54" Canvas.Left="-9" Height="44" Width="210" Background="Transparent" BorderBrush="Gainsboro" BorderThickness="0,0,3,3" CornerRadius="3" Visibility="Collapsed">
                     <Border Background="Transparent" CornerRadius="1"  BorderBrush="Black" BorderThickness="3,3,0,0">
                         <StackPanel Margin="-160,0,0,0" Height="44">
 
@@ -87,13 +89,13 @@
                 </Border>
 
 
-                <Border  Canvas.Top="-50" Canvas.Left="-39" HorizontalAlignment="Center" Width="320">
+                <Border  Canvas.Top="-50" Canvas.Left="-60" HorizontalAlignment="Center" Width="320">
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="{Binding ElementName=tmChamber,Path=PMVisibility}">
                         <TextBlock  FontSize="30" Text="{Binding ElementName=tmChamber,Path=Name}"/>
-                        <TextBlock  FontSize="30" Text="(" HorizontalAlignment="Center"/>
-                        <TextBlock  FontSize="30" Text="{Binding ElementName=tmChamber,Path=PressureValue,StringFormat=F0}" HorizontalAlignment="Center"/>
-                        <TextBlock  FontSize="30" Text="{Binding ElementName=tmChamber,Path=Unit}" HorizontalAlignment="Center"/>
-                        <TextBlock  FontSize="30" Text=")" HorizontalAlignment="Center"/>
+                        <TextBlock Visibility="Collapsed"  FontSize="30" Text="(" HorizontalAlignment="Center"/>
+                        <TextBlock Visibility="Collapsed"  FontSize="30" Text="{Binding ElementName=tmChamber,Path=PressureValue,StringFormat=F0}" HorizontalAlignment="Center"/>
+                        <TextBlock Visibility="Collapsed"  FontSize="30" Text="{Binding ElementName=tmChamber,Path=Unit}" HorizontalAlignment="Center"/>
+                        <TextBlock Visibility="Collapsed"  FontSize="30" Text=")" HorizontalAlignment="Center"/>
 
                     </StackPanel>
                 </Border>