Browse Source

fix bug of placing wafers

JET-GZX 4 days ago
parent
commit
18f93e94f4

+ 0 - 0
.tgitconfig


+ 29 - 3
VirgoUI/Models/Controls/EFEMFrontView.xaml

@@ -43,12 +43,25 @@
                                       HorizontalAlignment="Right" VerticalAlignment="Center"/>
                             <StackPanel Grid.Column="1" VerticalAlignment="Center" Margin="0,0,5,0">
                                 <ctrl:Slot ViewType="Front" x:Name="EFEMUpper" 
-                                          DataContext="{Binding UnitData.WaferManager.Wafers[1]}"
+                                          DataContext="{Binding UnitData.WaferManager.Wafers[1],RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
                                           WaferStatus="{Binding WaferStatus}" 
                                           SlotID="{Binding SlotID}" 
                                           ModuleID="{Binding ModuleID}" 
-                                          SourceName="{Binding SourceName}" 
+                                          SourceName="{Binding SourceName}"
                                           HorizontalAlignment="Center" VerticalAlignment="Top">
+                                    <i:Interaction.Triggers>
+                                        <i:EventTrigger EventName="SlotMouseButtonDown">
+                                            <cal:ActionMessage MethodName="OnMouseUp">
+                                                <cal:Parameter Value="$source" />
+                                                <cal:Parameter Value="$eventargs" />
+                                            </cal:ActionMessage>
+                                        </i:EventTrigger>
+                                        <i:EventTrigger EventName="WaferTransferStarted">
+                                            <cal:ActionMessage MethodName="OnWaferTransfer">
+                                                <cal:Parameter Value="$eventargs" />
+                                            </cal:ActionMessage>
+                                        </i:EventTrigger>
+                                    </i:Interaction.Triggers>
                                 </ctrl:Slot>
                                 <Rectangle Width="30" Height="3" Fill="{DynamicResource FOUP_PathBG}" Margin="0,2,0,0">
                                     <Rectangle.Effect>
@@ -68,12 +81,25 @@
                                       HorizontalAlignment="Right" VerticalAlignment="Center"/>
                             <StackPanel Grid.Column="1" VerticalAlignment="Center" Margin="0,0,5,0">
                                 <ctrl:Slot ViewType="Front" x:Name="EFEMLower" 
-                                          DataContext="{Binding UnitData.WaferManager.Wafers[0]}"
+                                          DataContext="{Binding UnitData.WaferManager.Wafers[0],RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
                                           WaferStatus="{Binding WaferStatus}" 
                                           SlotID="{Binding SlotID}" 
                                           ModuleID="{Binding ModuleID}" 
                                           SourceName="{Binding SourceName}" 
                                           HorizontalAlignment="Center" VerticalAlignment="Top">
+                                    <i:Interaction.Triggers>
+                                        <i:EventTrigger EventName="SlotMouseButtonDown">
+                                            <cal:ActionMessage MethodName="OnMouseUp">
+                                                <cal:Parameter Value="$source" />
+                                                <cal:Parameter Value="$eventargs" />
+                                            </cal:ActionMessage>
+                                        </i:EventTrigger>
+                                        <i:EventTrigger EventName="WaferTransferStarted">
+                                            <cal:ActionMessage MethodName="OnWaferTransfer">
+                                                <cal:Parameter Value="$eventargs" />
+                                            </cal:ActionMessage>
+                                        </i:EventTrigger>
+                                    </i:Interaction.Triggers>
                                 </ctrl:Slot>
                                 <Rectangle Width="30" Height="3" Fill="{DynamicResource FOUP_PathBG}" Margin="0,2,0,0">
                                     <Rectangle.Effect>

+ 2 - 1
VirgoUI/Models/Platform/EFEM/EFEMViewModel.cs

@@ -824,6 +824,7 @@ namespace VirgoUI.Client.Models.Platform.EFEM
                 }
             }
         }
+
         public EFEMViewModel()
         {
             this.DisplayName = "EFEM";
@@ -863,7 +864,7 @@ namespace VirgoUI.Client.Models.Platform.EFEM
             SelectedHomeModule = "EFEM";
             PickSelectedBlade = PlaceSelectedBlade = ExtendSelectedBlade = GripSelectedBlade = UngripSelectedBlade = _blades[0];
         }
-
+        
         protected override void OnActivate()
         {
             SmallPinWaferSize = MapWaferSize((int)QueryDataClient.Instance.Service.GetConfig($"System.SmallWafer"));