1.添加Kepler2200 流气 Tolerance

2.解决Flow Pipe动画 突然变慢bug
3.OperationOverview 添加/删除wafer 恢复以前的button模式

Venus/Framework/Common/Tolerance/RecipeToleranceChecker.cs

@@ -29,6 +29,10 @@ namespace Aitex.Core.RT.Tolerance
         }
         public void Monitor(params double[] feedBacks)
         {
+            if (_toleranceObjects == null)
+            {
+                return;
+            }
             for (int i = 0; i < _toleranceObjects.Count; i++)
             {
                 if (_stopwatch.ElapsedMilliseconds > _toleranceObjects[i].DelayTime)

Venus/Venus_MainPages/Views/OperationOverView.xaml

@@ -324,7 +324,7 @@
 
 
 
-            <Canvas Canvas.Left="260" Canvas.Top="-130">
+            <Canvas Canvas.Left="260" Canvas.Top="-50">
                 <RadioButton Content="Carrier" Name="CarrierRadioButton"   Canvas.Left="900"   Canvas.Top="106" Width="60" Height="33" Style="{StaticResource Button_RadioButton}"   IsChecked="True"   />
                 <RadioButton Content="LP1"     Name="JobRadioButton1"      Canvas.Left="961"   Canvas.Top="106" Width="60" Height="33" Style="{StaticResource Button_RadioButton}"   IsChecked="False"  />
                 <RadioButton Content="LP2"     Name="JobRadioButton2"      Canvas.Left="1022"  Canvas.Top="106" Width="60" Height="33" Style="{StaticResource Button_RadioButton}"   IsChecked="False"  />

Venus/Venus_MainPages/Views/WaferAssociationUnit.xaml

@@ -6,6 +6,7 @@
              xmlns:unity="clr-namespace:Venus_MainPages.Unity"
              xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
              mc:Ignorable="d" 
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              d:DesignHeight="450" d:DesignWidth="800" x:Name="WaferUnit">
     <Grid>
         <Grid.ColumnDefinitions>
@@ -91,16 +92,16 @@
                 </ListBox.Resources>
                 <ListBox.ItemTemplate>
                     <DataTemplate>
-                        <Grid Height="21">
+                        <Grid Height="18">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto"></ColumnDefinition>
                                 <ColumnDefinition Width="Auto"></ColumnDefinition>
-                                <!--<ColumnDefinition Width="Auto"></ColumnDefinition>-->
+                                <ColumnDefinition Width="Auto"></ColumnDefinition>
                             </Grid.ColumnDefinitions>
                             <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1"  Width="30" Padding="5,1">
                                 <TextBlock Name="txtSlotIndex" Text="{Binding SlotIndex}" Foreground="{DynamicResource FG_Black}" FontSize="12" FontFamily="Arial" VerticalAlignment="Center"></TextBlock>
                             </Border>
-                            <Border Grid.Column="1" BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Width="360" >
+                            <Border Grid.Column="1" BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Width="250" >
                                 <Border.Style>
                                     <Style>
                                         <Style.Triggers>
@@ -113,8 +114,8 @@
                                         </Style.Triggers>
                                     </Style>
                                 </Border.Style>
-                                <!--<TextBlock Name="txtSeqName" ToolTip="{Binding RelativeSource={RelativeSource Self}, Path=Text}" Text="{Binding SequenceName}" Foreground="{DynamicResource FG_Black}" FontSize="12" FontFamily="Arial" HorizontalAlignment="Center" VerticalAlignment="Center"></TextBlock>-->
-                                <ComboBox  FontSize="12" FontFamily="Arial" HorizontalAlignment="Center" VerticalAlignment="Center" Width="360" SelectedIndex="{Binding ElementName=WaferUnit,Path=SelectedIndex,Mode=OneWay}">
+                                <TextBlock Name="txtSeqName" ToolTip="{Binding RelativeSource={RelativeSource Self}, Path=Text}" Text="{Binding SequenceName}" Foreground="{DynamicResource FG_Black}" FontSize="12" FontFamily="Arial" HorizontalAlignment="Center" VerticalAlignment="Center"></TextBlock>
+                                <!--<ComboBox  FontSize="12" FontFamily="Arial" HorizontalAlignment="Center" VerticalAlignment="Center" Width="360" SelectedIndex="{Binding ElementName=WaferUnit,Path=SelectedIndex,Mode=OneWay}">
                                     <i:Interaction.Triggers>
                                         <i:EventTrigger EventName="SelectionChanged">
                                             <i:InvokeCommandAction  Command="{Binding Path=DataContext.SetSequenceCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ListBox}}" CommandParameter="{Binding}"/>
@@ -122,10 +123,10 @@
                                     </i:Interaction.Triggers>
                                     <ComboBoxItem Content="{Binding ElementName=WaferUnit,Path=WAInfo.SequenceName}"></ComboBoxItem>
                                     <ComboBoxItem Content=""></ComboBoxItem>
-                                </ComboBox>
+                                </ComboBox>-->
                             </Border>
                            
-                            <!--<Border  Grid.Column="2" BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,1,1,1"  Width="110" Padding="5,1">
+                            <Border  Grid.Column="2" BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,1,1,1"  Width="110" Padding="5,1">
                                 <Button Width="60" Height="16"  Command="{Binding Path=DataContext.SetSequenceCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ListBox}}" CommandParameter="{Binding}">
                                     <Button.Style>
                                         <Style TargetType="{x:Type Button}" BasedOn="{StaticResource ResourceKey={x:Type Button}}">
@@ -142,7 +143,7 @@
                                         </Style>
                                     </Button.Style>
                                 </Button>
-                            </Border>-->
+                            </Border>
                         </Grid>
                     </DataTemplate>
                 </ListBox.ItemTemplate>

Venus/Venus_RT/Modules/PMs/ProcessDefine.cs

@@ -632,6 +632,10 @@ namespace Venus_RT.Modules.PMs
                 toleranceObjects.Add(new ToleranceObject("Gas6", ProcessUnit.Gas6, ProcessUnit.Gas6WarningRange, ProcessUnit.Gas6AlarmRange, ProcessUnit.ToleranceDelayTime_ms, ProcessUnit.ToleranceMode));
 
             }
+            if (ProcessUnit.ToleranceMode != ToleranceMode.None)
+            {
+                _GasFlowToleranceChecker.Start(toleranceObjects);
+            }
             return RState.Running;
         }
 

Venus/Venus_Themes/UserControls/FlowPipe.xaml

@@ -20,8 +20,8 @@
                     <DataTrigger Binding="{Binding ElementName=flowPipeControl,Path=IsFlowing}" Value="True">
                         <DataTrigger.EnterActions>
                             <BeginStoryboard Name="FlowStoryboard">
-                                <Storyboard RepeatBehavior="Forever" Timeline.DesiredFrameRate="10">
-                                    <DoubleAnimation Storyboard.TargetProperty="StrokeDashOffset" Duration="0:0:10" To="70"/>
+                                <Storyboard RepeatBehavior="Forever" Timeline.DesiredFrameRate="10" FillBehavior="Stop">
+                                    <DoubleAnimation Storyboard.TargetProperty="StrokeDashOffset" Duration="0:0:10" From="0" To="70"/>
                                 </Storyboard>
                             </BeginStoryboard>
                             <!--<BeginStoryboard >
@@ -33,10 +33,10 @@
                         <DataTrigger.ExitActions>
                             <!--<BeginStoryboard>
                                 <Storyboard>
-                                    <DoubleAnimation  Storyboard.TargetProperty="Opacity" Duration="0:0:0.1"  To="0"/>
+                                    <DoubleAnimation  Storyboard.TargetProperty="StrokeDashOffset" Duration="0:0:0" To="0"/>
                                 </Storyboard>
                             </BeginStoryboard>-->
-                            <StopStoryboard BeginStoryboardName="FlowStoryboard"/>
+                            <!--<StopStoryboard BeginStoryboardName="FlowStoryboard"/>-->
                         </DataTrigger.ExitActions>
                     </DataTrigger>
                 </Style.Triggers>