Browse Source

kepler2300 PM界面添加Include/Exclude功能

lixiang 1 year ago
parent
commit
17793fef54

+ 6 - 4
Venus/Venus_MainPages/Views/OverKepler2200AView.xaml

@@ -955,14 +955,16 @@
                         <MenuItem Header="Stop Recipe"                       Cursor="Hand"   Command="{Binding AbortRecipeCommnad}" CommandParameter="0"/>
                         <MenuItem Header="Stop Recipe=>Return Wafer To Foup" Cursor="Hand"   Command="{Binding AbortRecipeCommnad}" CommandParameter="2"/>
                     </customControls:SplitButton>
-                    <RadioButton Content="OffLine" GroupName="Online2"    Width="100" Height="28" Margin="30 0 5 0" Style="{StaticResource Button_RadioButton}"  IsChecked="{Binding IsAutoMode,Converter={StaticResource BoolToBool},UpdateSourceTrigger=PropertyChanged}" FontSize="15" Command="{Binding OfflineCommand}"/>
-                    <RadioButton Content="OnLine"  GroupName="Online2"    Width="100" Height="28" Margin="0 0 0 0" Style="{StaticResource Button_RadioButton}"   IsChecked="{Binding IsAutoMode,UpdateSourceTrigger=PropertyChanged}" FontSize="15"                                       Command="{Binding OnlineCommand}"/>
+                    <RadioButton Content="OffLine"     Width="100" Height="28" Margin="30 0 5 0" Style="{StaticResource Button_RadioButton}"  IsChecked="{Binding IsAutoMode,Converter={StaticResource BoolToBool},UpdateSourceTrigger=PropertyChanged}" FontSize="15" Command="{Binding OfflineCommand}"/>
+                    <RadioButton Content="OnLine"      Width="100" Height="28" Margin="0 0 0 0" Style="{StaticResource Button_RadioButton}"   IsChecked="{Binding IsAutoMode,UpdateSourceTrigger=PropertyChanged}" FontSize="15"                                       Command="{Binding OnlineCommand}"/>
                     <customControls:PathButton  Width="120" Height="30" Content="Vent"          Command="{Binding VentCommand}"          Margin="30,0,0,0"  IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" />
                     <customControls:PathButton  Width="120" Height="30" Content="Pump Purge"    Command="{Binding PurgeCommand}"         Margin="30,0,0,0"  IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" />
                     <customControls:PathButton  Width="120" Height="30" Content="Pump Down"     Command="{Binding PumpCommand}"          Margin="30,0,0,0"  IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"/>
 
-                    <RadioButton Content="Exclude"  GroupName="Include2"    Width="100" Height="28" Margin="30 0 5 0" Style="{StaticResource Button_RadioButton}"  IsChecked="{Binding IsInclude,Converter={StaticResource BoolToBool},UpdateSourceTrigger=PropertyChanged}" FontSize="15" Command="{Binding IncludeCommand}"/>
-                    <RadioButton Content="Include"  GroupName="Include2"    Width="100" Height="28" Margin="0 0 0 0" Style="{StaticResource Button_RadioButton}"   IsChecked="{Binding IsInclude,UpdateSourceTrigger=PropertyChanged}" FontSize="15"   Command="{Binding IncludeCommand}"/>
+                    <StackPanel Orientation="Horizontal" Margin="30 0 0 0">
+                        <RadioButton Content="Exclude"  Margin="0 0 5 0"    Width="100" Height="28"  Style="{StaticResource Button_RadioButton}"   IsChecked="{Binding IsInclude,Converter={StaticResource BoolToBool},UpdateSourceTrigger=PropertyChanged}" FontSize="15" Command="{Binding IncludeCommand}"/>
+                        <RadioButton Content="Include"                      Width="100" Height="28"   Style="{StaticResource Button_RadioButton}"   IsChecked="{Binding IsInclude,UpdateSourceTrigger=PropertyChanged}" FontSize="15"                                       Command="{Binding IncludeCommand}"/>
+                    </StackPanel>
                 </StackPanel>
             </Border>
 

+ 7 - 4
Venus/Venus_MainPages/Views/OverKepler2300View.xaml

@@ -988,14 +988,17 @@
                         <MenuItem Header="Stop Recipe"                       Cursor="Hand"   Command="{Binding AbortRecipeCommnad}" CommandParameter="0"/>
                         <MenuItem Header="Stop Recipe=>Return Wafer To Foup" Cursor="Hand"   Command="{Binding AbortRecipeCommnad}" CommandParameter="2"/>
                     </customControls:SplitButton>
-                    <RadioButton Content="OffLine" GroupName="Online"    Width="100" Height="28" Margin="30 0 5 0" Style="{StaticResource Button_RadioButton}"  IsChecked="{Binding IsAutoMode,Converter={StaticResource BoolToBool},Mode=TwoWay}" FontSize="15" Command="{Binding OfflineCommand}"/>
-                    <RadioButton Content="OnLine"  GroupName="Online"    Width="100" Height="28" Margin="0 0 0 0" Style="{StaticResource Button_RadioButton}"   IsChecked="{Binding IsAutoMode,Mode=TwoWay}" FontSize="15"                                       Command="{Binding OnlineCommand}"/>
+                    <RadioButton Content="OffLine"    Width="100" Height="28" Margin="30 0 5 0" Style="{StaticResource Button_RadioButton}"  IsChecked="{Binding IsAutoMode,Converter={StaticResource BoolToBool},UpdateSourceTrigger=PropertyChanged}" FontSize="15" Command="{Binding OfflineCommand}"/>
+                    <RadioButton Content="OnLine"     Width="100" Height="28" Margin="0 0 0 0" Style="{StaticResource Button_RadioButton}"   IsChecked="{Binding IsAutoMode,UpdateSourceTrigger=PropertyChanged}" FontSize="15"                                       Command="{Binding OnlineCommand}"/>
                     <customControls:PathButton  Width="120" Height="30" Content="Vent"          Command="{Binding VentCommand}"          Margin="30,0,0,0"  IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" />
                     <customControls:PathButton  Width="120" Height="30" Content="Pump Purge"    Command="{Binding PurgeCommand}"         Margin="30,0,0,0"  IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" />
                     <customControls:PathButton  Width="120" Height="30" Content="Pump Down"     Command="{Binding PumpCommand}"          Margin="30,0,0,0"  IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"/>
 
-                    <RadioButton Content="Exclude"  GroupName="Include"    Width="100" Height="28" Margin="30 0 5 0" Style="{StaticResource Button_RadioButton}"   IsChecked="{Binding IsInclude,Converter={StaticResource BoolToBool},Mode=TwoWay}" FontSize="15" Command="{Binding IncludeCommand}"/>
-                    <RadioButton Content="Include"  GroupName="Include"    Width="100" Height="28" Margin="0 0 0 0"  Style="{StaticResource Button_RadioButton}"   IsChecked="{Binding IsInclude,Mode=TwoWay}" FontSize="15"                                       Command="{Binding IncludeCommand}"/>
+                    <StackPanel Orientation="Horizontal" Margin="30 0 0 0">
+                        <RadioButton Content="Exclude"  Margin="0 0 5 0"    Width="100" Height="28"  Style="{StaticResource Button_RadioButton}"   IsChecked="{Binding IsInclude,Converter={StaticResource BoolToBool},UpdateSourceTrigger=PropertyChanged}" FontSize="15" Command="{Binding IncludeCommand}"/>
+                        <RadioButton Content="Include"      Width="100" Height="28"   Style="{StaticResource Button_RadioButton}"   IsChecked="{Binding IsInclude,UpdateSourceTrigger=PropertyChanged}" FontSize="15"                                       Command="{Binding IncludeCommand}"/>
+                    </StackPanel>
+                  
                 </StackPanel>
             </Border>
 

+ 1 - 1
Venus/Venus_RT/App.config

@@ -28,7 +28,7 @@
 	<connectionStrings>
 		<add name="PostgreSQL"   connectionString="Server=localhost;Port=5432;User Id=postgres;Password=123456;Database=postgres;Enlist=true;Preload Reader=true;" />
 		<!--0是other,1是Venus,2是kepler2300,3是Kepler2200,4是VenusSE,5是VenusDE-->
-		<add name="ConfigType"   connectionString="3"/>
+		<add name="ConfigType"   connectionString="2"/>
 	</connectionStrings>
 	<system.serviceModel>
 		<!--<diagnostics>