Browse Source

LoadLock Left&Right UI Update

Intern01 1 year ago
parent
commit
ca4aebf454

+ 1 - 5
Venus/Venus_RT/Config/TM/TMInterlock.xml

@@ -101,11 +101,7 @@
     <Limit di="DI_LLA_Lid_Door_Closed"				value="true" tip="LLA Lid Closed"					tip.zh-CN="" tip.en-US="DI-26" />
 	</Action>
 	
-	<Action do="DO_LLB_Slit_Door_E_Open"					value="true" tip="Loadlock B EFEM Side Door Open"	tip.zh-CN="" tip.en-US="DO-21" >
-		<Limit di="DI_LLB_T_Slit_Door_close_Position"	value="true" tip="LLB TM Side Door Closed"			tip.zh-CN="" tip.en-US="DI-30" />
-		<Limit di="DI_LLB_Lid_Door_Closed"				value="true" tip="LLB Lid Closed"					tip.zh-CN="" tip.en-US="DI-31" />
-		<Limit di="DI_EFEM_RB_Not_Extend_LLB"			value="true" tip="EFEM Robot Net Extend to LLB"		tip.zh-CN="" tip.en-US="DI-12" />
-	</Action>
+
 
 	<Action do="DO_LLA_Slit_Door_T_Open"					value="true" tip="Loadlock A TM Side Door Open"		tip.zh-CN="" tip.en-US="DO-13" >
 		<Limit di="DI_TM_RB_Not_Extend_LLA"				value="true" tip="TM Robot Net Extend to LLA"		tip.zh-CN="" tip.en-US="DI-8" />

+ 16 - 4
Venus/Venus_Themes/UserControls/LoadLockLeft.xaml

@@ -8,7 +8,7 @@
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800" Name="LeftLoadLock" Opacity="0.9">
     <UserControl.Resources>
-        
+
         <Style TargetType="Rectangle" x:Key="doorAnimation">
             <Setter Property="Width" Value="192"/>
             <Style.Triggers>
@@ -68,7 +68,7 @@
                 <Rectangle.RenderTransform>
                     <RotateTransform Angle="28" CenterX="95" CenterY="10"/>
                 </Rectangle.RenderTransform>
-              
+
             </Rectangle>
             <Rectangle Cursor="Hand" DataContext="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl,AncestorLevel=1}}" Style="{StaticResource doorAnimation}"  Fill="DimGray"   VerticalAlignment="Top"    Height="20"  Canvas.Top="28" Canvas.Left="27">
                 <Rectangle.RenderTransform>
@@ -137,9 +137,21 @@
                 </Rectangle.ContextMenu>
             </Rectangle>
 
+            <Rectangle Cursor="Hand" DataContext="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl,AncestorLevel=1}}" Style="{StaticResource door2Animation}"  Fill="DimGray"   VerticalAlignment="Center"    Height="20"    Canvas.Top="200" Canvas.Left="-41" Visibility="{Binding ElementName=LeftLoadLock,Path=Door2IsVisibility}" HorizontalAlignment="Left" Width="162">
+                <Rectangle.RenderTransform >
+                    <RotateTransform CenterX="102" CenterY="10" Angle="180"/>
+                </Rectangle.RenderTransform>
+                <Rectangle.ContextMenu >
+                    <ContextMenu>
+                        <MenuItem Header="Open Door"  Click="OpenDoor2_Click"    IsChecked="{Binding DoorIsOpen}" IsEnabled="{Binding Door2IsOpen,Converter={StaticResource BoolToBool}}"/>
+                        <MenuItem Header="Close Door" Click="CloseDoor2_Click"    IsChecked="{Binding DoorIsOpen,Converter={StaticResource BoolToBool}}" IsEnabled="{Binding Door2IsOpen}"/>
+                    </ContextMenu>
+                </Rectangle.ContextMenu>
+            </Rectangle>
+
             <TextBlock Text="LLA" FontSize="35" Canvas.Left="-70" Canvas.Top="50"/>
         </Canvas>
-            
-        
+
+
     </Viewbox>
 </UserControl>

+ 9 - 0
Venus/Venus_Themes/UserControls/LoadLockRight.xaml

@@ -138,6 +138,15 @@
                 </ctrl:Slot>
             </Viewbox>
             <Rectangle  Fill="Silver" Width="162"  VerticalAlignment="Top"    Height="20"  Canvas.Top="200" Canvas.Left="39" Visibility="{Binding ElementName=RightLoadLock,Path=Door2IsVisibility}"/>
+            <Rectangle Cursor="Hand" DataContext="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl,AncestorLevel=1}}" Fill="DimGray" Style="{StaticResource door2Animation}"  VerticalAlignment="Top"    Height="20"  Canvas.Top="200" Canvas.Left="40" Visibility="{Binding ElementName=LeftLoadLock,Path=Door2IsVisibility}">
+                <Rectangle.ContextMenu>
+                    <ContextMenu>
+                        <MenuItem Header="Open Door"  Click="OpenDoor2_Click"    IsChecked="{Binding Door2IsOpen}" IsEnabled="{Binding Door2IsOpen,Converter={StaticResource BoolToBool}}"/>
+                        <MenuItem Header="Close Door" Click="CloseDoor2_Click"    IsChecked="{Binding Door2IsOpen,Converter={StaticResource BoolToBool}}" IsEnabled="{Binding Door2IsOpen}"/>
+                    </ContextMenu>
+                </Rectangle.ContextMenu>
+            </Rectangle>
+            
             <Rectangle Cursor="Hand" DataContext="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl,AncestorLevel=1}}" Fill="DimGray" Style="{StaticResource door2Animation}"  VerticalAlignment="Top"    Height="20"  Canvas.Top="200" Canvas.Left="59"  Visibility="{Binding ElementName=RightLoadLock,Path=Door2IsVisibility}">
                 <Rectangle.RenderTransform>
                     <RotateTransform Angle="180" CenterX="71" CenterY="10"/>