浏览代码

优化跑片动画,解决robot去loadport露出wafer的问题

lixiang 1 年之前
父节点
当前提交
96334720ac

+ 10 - 8
Venus/Venus_MainPages/ViewModels/OperationOverViewModel.cs

@@ -749,12 +749,12 @@ namespace Venus_MainPages.ViewModels
                     if (waferRobotTAction != Robot1TAction)
                     {
                         Robot1TAction = waferRobotTAction;
-                        await Task.Delay(600);
                     }
                     else
                     { 
-                        await Task.Delay(100);
+                        //await Task.Delay(100);
                     }
+                    await Task.Delay(600);
 
                     //Robot1TAction = (WaferRobotTAction)Enum.Parse(typeof(WaferRobotTAction), module, true);
                     //await Task.Delay(600);
@@ -771,12 +771,12 @@ namespace Venus_MainPages.ViewModels
                     if (waferRobotTAction != Robot2TAction)
                     {
                         Robot2TAction = waferRobotTAction;
-                        await Task.Delay(600);
                     }
                     else
                     { 
-                        await Task.Delay(100);
+                        //await Task.Delay(100);
                     }
+                    await Task.Delay(600);
 
                     //Robot2TAction = (WaferRobotTAction)Enum.Parse(typeof(WaferRobotTAction), module, true);
                     //await Task.Delay(600);
@@ -812,12 +812,13 @@ namespace Venus_MainPages.ViewModels
                     if (waferRobotTAction != Robot1TAction)
                     {
                         Robot1TAction = waferRobotTAction;
-                        await Task.Delay(600);
                     }
                     else
                     { 
-                        await Task.Delay(100);
+                       // await Task.Delay(100);
                     }
+                    await Task.Delay(600);
+
                     Robot1XAction = WaferRobotXAction.Extend;
                 }
                 else if (arm == "ArmB")
@@ -826,12 +827,13 @@ namespace Venus_MainPages.ViewModels
                     if (waferRobotTAction != Robot2TAction)
                     {
                         Robot2TAction = waferRobotTAction;
-                        await Task.Delay(600);
                     }
                     else
                     { 
-                        await Task.Delay(100);
+                       // await Task.Delay(100);
                     }
+                    await Task.Delay(600);
+
                     Robot2XAction = WaferRobotXAction.Extend;
                 }
             }

+ 2 - 2
Venus/Venus_MainPages/Views/OperationOverView.xaml

@@ -62,9 +62,9 @@
             <customControls:WaferRobotControl OriginT="PMD"    Canvas.Left="310" Canvas.Top="160"   Width="160" Height="240"     RobotTAction="{Binding Robot2TAction}" RobotXAction="{Binding Robot2XAction}"  RobotWafer="{Binding TMBladeBWafer}" IsEnabled="False" Opacity="{Binding RtDataValues[TM.IsOnline],Converter={StaticResource IsOnlineToOpacityConverter}}"/>
 
 
-            <TextBlock Text="{Binding RobotMoveInfo}"     FontSize="20" Canvas.Left="700" Canvas.Top="250" />
+            <TextBlock Text="{Binding RobotMoveInfo}"     FontSize="20" Canvas.Left="700" Canvas.Top="250" Visibility="Collapsed"/>
 
-            <TextBlock Text="{Binding EfemRobotMoveInfo}" FontSize="20" Canvas.Left="700" Canvas.Top="350" />
+            <TextBlock Text="{Binding EfemRobotMoveInfo}" FontSize="20" Canvas.Left="700" Canvas.Top="350" Visibility="Collapsed"/>
         </Canvas>
 
         <Grid Width="280" Height="170" Canvas.Left="30" Canvas.Top="250"  unity:GridOptions.LineBrush="#afb4db"  unity:GridOptions.ShowBorder="True" Background="#E9EDF4" Visibility="{Binding PMAIsInstalled,Converter={StaticResource bool2VisibilityConverter}}">

+ 4 - 4
Venus/Venus_Themes/Themes/Generic.xaml

@@ -38,7 +38,7 @@
                                 <VisualStateGroup Name="RobotXActions">
                                     <VisualStateGroup.Transitions>
                                         <VisualTransition To="Extend">
-                                        <Storyboard FillBehavior="HoldEnd" Timeline.SpeedRatio="13">
+                                        <Storyboard FillBehavior="HoldEnd" Timeline.SpeedRatio="18">
                                                 <DoubleAnimationUsingKeyFrames Storyboard.TargetName="armXT1RotateAct" Storyboard.TargetProperty="Angle">
                                                     <LinearDoubleKeyFrame Value="90" KeyTime="0:0:0"/>
                                                 <LinearDoubleKeyFrame Value="0"  KeyTime="0:0:9"/>
@@ -62,7 +62,7 @@
                                             </Storyboard>
                                         </VisualTransition>
                                         <VisualTransition To="Retract">
-                                            <Storyboard FillBehavior="HoldEnd" SpeedRatio="14">
+                                            <Storyboard FillBehavior="HoldEnd" SpeedRatio="18">
                                                 <DoubleAnimationUsingKeyFrames Storyboard.TargetName="armXT1RotateAct" Storyboard.TargetProperty="Angle">
                                                     <LinearDoubleKeyFrame Value="0"  KeyTime="0:0:0"/>
                                                     <LinearDoubleKeyFrame Value="90" KeyTime="0:0:9"/>
@@ -408,7 +408,7 @@
                             <VisualStateGroup Name="RobotXActions">
                                 <VisualStateGroup.Transitions>
                                     <VisualTransition To="Extend">
-                                        <Storyboard FillBehavior="HoldEnd" SpeedRatio="13">
+                                        <Storyboard FillBehavior="HoldEnd" SpeedRatio="18">
                                             <DoubleAnimationUsingKeyFrames Storyboard.TargetName="armXT1RotateAct" Storyboard.TargetProperty="Angle">
                                                 <LinearDoubleKeyFrame Value="90" KeyTime="0:0:0"/>
                                                 <LinearDoubleKeyFrame Value="0"  KeyTime="0:0:9"/>
@@ -432,7 +432,7 @@
                                         </Storyboard>
                                     </VisualTransition>
                                     <VisualTransition To="Retract">
-                                        <Storyboard FillBehavior="HoldEnd" SpeedRatio="14">
+                                        <Storyboard FillBehavior="HoldEnd" SpeedRatio="18">
                                             <DoubleAnimationUsingKeyFrames Storyboard.TargetName="armXT1RotateAct" Storyboard.TargetProperty="Angle">
                                                 <LinearDoubleKeyFrame Value="0"  KeyTime="0:0:0"/>
                                                 <LinearDoubleKeyFrame Value="90" KeyTime="0:0:9"/>