修复OperationView PM显示错误bug

Venus/Venus_MainPages/ViewModels/OperationOverViewModel.cs

@@ -10,6 +10,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using System.Windows;
 using System.Windows.Threading;
 using Venus_Core;
 using Venus_MainPages.Unity;
@@ -751,7 +752,9 @@ namespace Venus_MainPages.ViewModels
                     m_View.operationCanvas.Children.Remove(m_View.pmaGrid);
                     for (int i = 0; i < m_View.pmaGrid.Children.Count; i++)
                     {
-                        m_View.pmaGrid.Children[i] = null;
+                        UIElement element = m_View.pmaGrid.Children[i];
+                        m_View.pmaGrid.Children.Remove(element);                        
+                        element = null;
                     }
                     m_View.pmaGrid.Children.Clear();
 
@@ -766,9 +769,10 @@ namespace Venus_MainPages.ViewModels
 
                     for (int i = 0; i < m_View.pmbGrid.Children.Count; i++)
                     {
-                        m_View.pmbGrid.Children[i] = null;
+                        UIElement element = m_View.pmbGrid.Children[i];
+                        m_View.pmbGrid.Children.Remove(element);
+                        element = null;
                     }
-                    m_View.pmbGrid.Children.Clear();
 
 
                     m_View.pmbGrid = null;
@@ -781,10 +785,10 @@ namespace Venus_MainPages.ViewModels
 
                     for (int i = 0; i < m_View.pmcGrid.Children.Count; i++)
                     {
-                        var item = m_View.pmcGrid.Children[i];
-                        item = null;
+                        UIElement element = m_View.pmcGrid.Children[i];
+                        m_View.pmcGrid.Children.Remove(element);
+                        element = null;
                     }
-                    m_View.pmcGrid.Children.Clear();
                     m_View.pmcGrid = null;
                 }
                 if (!PMDIsInstalled)
@@ -794,8 +798,9 @@ namespace Venus_MainPages.ViewModels
                     m_View.operationCanvas.Children.Remove(m_View.pmdGrid);
                     for (int i = 0; i < m_View.pmdGrid.Children.Count; i++)
                     {
-                       var item= m_View.pmdGrid.Children[i];
-                        item = null;
+                        UIElement element = m_View.pmdGrid.Children[i];
+                        m_View.pmdGrid.Children.Remove(element);
+                        element = null;
                     }
                     m_View.pmdGrid.Children.Clear();
                     m_View.pmdGrid = null;

Venus/Venus_MainPages/Views/OperationOverView.xaml

@@ -95,7 +95,7 @@
                 </StackPanel>
             </Border>
 
-            <Grid x:Name="pmaGrid" Canvas.Left="5"   Canvas.Top="250" Width="280" Height="180" Margin="0 0 0 10">
+            <Grid x:Name="pmaGrid" Canvas.Left="5"   Canvas.Top="250" Width="280" Height="180" Margin="0 0 0 10" Visibility="{Binding PMAIsInstalled,Converter={StaticResource bool2VisibilityConverter}}">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="24"/>
                     <RowDefinition/>
@@ -159,7 +159,7 @@
                 </TextBlock>
             </Grid>
 
-            <Grid x:Name="pmbGrid" Canvas.Left="5"   Canvas.Top="50" Width="280" Height="180" Margin="0 0 0 10">
+            <Grid x:Name="pmbGrid" Canvas.Left="5"   Canvas.Top="50" Width="280" Height="180" Margin="0 0 0 10" Visibility="{Binding PMBIsInstalled,Converter={StaticResource bool2VisibilityConverter}}">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="24"/>
                     <RowDefinition/>
@@ -223,7 +223,7 @@
                 </TextBlock>
             </Grid>
 
-            <Grid x:Name="pmcGrid" Canvas.Left="800" Canvas.Top="50" Width="280" Height="180"  Margin="0 0 0 10" >
+            <Grid x:Name="pmcGrid" Canvas.Left="800" Canvas.Top="50" Width="280" Height="180"  Margin="0 0 0 10" Visibility="{Binding PMCIsInstalled,Converter={StaticResource bool2VisibilityConverter}}">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="24"/>
                     <RowDefinition/>
@@ -287,7 +287,7 @@
                 </TextBlock>
             </Grid>
 
-            <Grid x:Name="pmdGrid" Canvas.Left="800" Canvas.Top="250" Width="280" Height="180" >
+            <Grid x:Name="pmdGrid" Canvas.Left="800" Canvas.Top="250" Width="280" Height="180" Visibility="{Binding PMDIsInstalled,Converter={StaticResource bool2VisibilityConverter}}">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="24"/>
                     <RowDefinition/>

Venus/Venus_MainPages/Views/TMView.xaml

@@ -118,7 +118,7 @@
 
                 <customControls:CustomComBobox   Grid.Row="5" Grid.Column="0"    SelectedItem="{Binding BladeNiceXinSongWaferRobotTAction}" unity:ItemsControlHelper.EnumValuesToItemsSource="True"/>
                 <customControls:CustomComBobox   Grid.Row="5" Grid.Column="2"     SelectedItem="{Binding GoToSelectedBlade}" unity:ItemsControlHelper.EnumValuesToItemsSource="True"/>
-                <Button     Grid.Row="5" Grid.Column="3"  Margin="5" Width="100" Height="25"  Content="Goto" IsEnabled="{Binding Path=IsManualMode}" Command="{Binding GotoCommand}"/>
+                <Button     Grid.Row="5" Grid.Column="3"  Margin="5" Width="100" Height="25"  Content="Goto"  Command="{Binding GotoCommand}"/>
                 <Button     Grid.Row="6" Grid.Column="3"  Margin="5" Width="100" Height="25" Content="Robot Home" Command="{Binding RobotHomeCommand}" />
             </Grid>
             <!--</Border>-->