Skip to content

Commit

Permalink
removed ignition count from multimode engines
Browse files Browse the repository at this point in the history
  • Loading branch information
@PatPL
PatPL committed Oct 27, 2018
1 parent 8907aaf commit 064a417
Show file tree
Hide file tree
Showing 8 changed files with 50 additions and 34 deletions.
16 changes: 16 additions & 0 deletions GenericEngines/MainWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -644,6 +644,22 @@
</DataGridTemplateColumn>

<DataGridTemplateColumn SortMemberPath="Ignitions">
<DataGridTemplateColumn.CellStyle>
<Style TargetType="DataGridCell">
<Style.Triggers>
<DataTrigger Binding="{Binding PolyType}" Value="MultiModeSlave">
<Setter Property="Background" Value="#FF444444"/>
<Setter Property="Foreground" Value="#FF444444"/>
<Setter Property="IsEnabled" Value="False"/>
</DataTrigger>
<DataTrigger Binding="{Binding PolyType}" Value="MultiModeMaster">
<Setter Property="Background" Value="#FF444444"/>
<Setter Property="Foreground" Value="#FF444444"/>
<Setter Property="IsEnabled" Value="False"/>
</DataTrigger>
</Style.Triggers>
</Style>
</DataGridTemplateColumn.CellStyle>
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<TextBlock Text="{Binding Path=IgnitionsLabel, StringFormat={}{0}}" FontFamily="Verdana" VerticalAlignment="Center" Margin="1,1,1,1"></TextBlock>
Expand Down
Binary file modified GenericEngines/bin/Debug/GenericEngines.exe
View file
Binary file not shown.
Binary file modified GenericEngines/bin/Debug/GenericEngines.pdb
View file
Binary file not shown.
Binary file modified GenericEngines/obj/Debug/GenericEngines.exe
View file
Binary file not shown.
Binary file modified GenericEngines/obj/Debug/GenericEngines.g.resources
View file
Binary file not shown.
Binary file modified GenericEngines/obj/Debug/GenericEngines.pdb
View file
Binary file not shown.
34 changes: 17 additions & 17 deletions GenericEngines/obj/Debug/MainWindow.g.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#pragma checksum "..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "BBBE08B069601917A5F8B95D823AA5426B15CAE5"
#pragma checksum "..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "878F38DD4C50CB0D6D7BF6EFC6E09DD8CF2D5B8E"
//------------------------------------------------------------------------------
// <auto-generated>
// Ten kod został wygenerowany przez narzędzie.
Expand Down Expand Up @@ -365,117 +365,117 @@ void System.Windows.Markup.IStyleConnector.Connect(int connectionId, object targ
break;
case 21:

#line 709 "..\..\MainWindow.xaml"
#line 725 "..\..\MainWindow.xaml"
((System.Windows.Controls.ComboBox)(target)).Loaded += new System.Windows.RoutedEventHandler(this.PlumeCombo_Loaded);

#line default
#line hidden
break;
case 22:

#line 853 "..\..\MainWindow.xaml"
#line 869 "..\..\MainWindow.xaml"
((System.Windows.Controls.ComboBox)(target)).PreviewKeyUp += new System.Windows.Input.KeyEventHandler(this.TechComboBox_PreviewKeyUp);

#line default
#line hidden
break;
case 23:

#line 1010 "..\..\MainWindow.xaml"
#line 1026 "..\..\MainWindow.xaml"
((System.Windows.Controls.Image)(target)).MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.RegisterMouseDown);

#line default
#line hidden

#line 1010 "..\..\MainWindow.xaml"
#line 1026 "..\..\MainWindow.xaml"
((System.Windows.Controls.Image)(target)).MouseUp += new System.Windows.Input.MouseButtonEventHandler(this.AddGD_MouseUp);

#line default
#line hidden
break;
case 24:

#line 1011 "..\..\MainWindow.xaml"
#line 1027 "..\..\MainWindow.xaml"
((System.Windows.Controls.Image)(target)).MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.RegisterMouseDown);

#line default
#line hidden

#line 1011 "..\..\MainWindow.xaml"
#line 1027 "..\..\MainWindow.xaml"
((System.Windows.Controls.Image)(target)).MouseUp += new System.Windows.Input.MouseButtonEventHandler(this.RemoveGD_MouseUp);

#line default
#line hidden
break;
case 25:

#line 1012 "..\..\MainWindow.xaml"
#line 1028 "..\..\MainWindow.xaml"
((System.Windows.Controls.Image)(target)).MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.RegisterMouseDown);

#line default
#line hidden

#line 1012 "..\..\MainWindow.xaml"
#line 1028 "..\..\MainWindow.xaml"
((System.Windows.Controls.Image)(target)).MouseUp += new System.Windows.Input.MouseButtonEventHandler(this.SortThrustCurve_MouseUp);

#line default
#line hidden
break;
case 26:

#line 1013 "..\..\MainWindow.xaml"
#line 1029 "..\..\MainWindow.xaml"
((System.Windows.Controls.DataGrid)(target)).Loaded += new System.Windows.RoutedEventHandler(this.GD_Loaded);

#line default
#line hidden
break;
case 27:

#line 1098 "..\..\MainWindow.xaml"
#line 1114 "..\..\MainWindow.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewKeyDown += new System.Windows.Input.KeyEventHandler(this.TanksVolumeInput_PrewiewKeyDown);

#line default
#line hidden
break;
case 28:

#line 1103 "..\..\MainWindow.xaml"
#line 1119 "..\..\MainWindow.xaml"
((System.Windows.Controls.Image)(target)).MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.RegisterMouseDown);

#line default
#line hidden

#line 1103 "..\..\MainWindow.xaml"
#line 1119 "..\..\MainWindow.xaml"
((System.Windows.Controls.Image)(target)).MouseUp += new System.Windows.Input.MouseButtonEventHandler(this.AddGD_MouseUp);

#line default
#line hidden
break;
case 29:

#line 1104 "..\..\MainWindow.xaml"
#line 1120 "..\..\MainWindow.xaml"
((System.Windows.Controls.Image)(target)).MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.RegisterMouseDown);

#line default
#line hidden

#line 1104 "..\..\MainWindow.xaml"
#line 1120 "..\..\MainWindow.xaml"
((System.Windows.Controls.Image)(target)).MouseUp += new System.Windows.Input.MouseButtonEventHandler(this.RemoveGD_MouseUp);

#line default
#line hidden
break;
case 30:

#line 1106 "..\..\MainWindow.xaml"
#line 1122 "..\..\MainWindow.xaml"
((System.Windows.Controls.DataGrid)(target)).Loaded += new System.Windows.RoutedEventHandler(this.GD_Loaded);

#line default
#line hidden
break;
case 31:

#line 1111 "..\..\MainWindow.xaml"
#line 1127 "..\..\MainWindow.xaml"
((System.Windows.Controls.ComboBox)(target)).Loaded += new System.Windows.RoutedEventHandler(this.PropellantCombo_Loaded);

#line default
Expand Down
34 changes: 17 additions & 17 deletions GenericEngines/obj/Debug/MainWindow.g.i.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#pragma checksum "..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "BBBE08B069601917A5F8B95D823AA5426B15CAE5"
#pragma checksum "..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "878F38DD4C50CB0D6D7BF6EFC6E09DD8CF2D5B8E"
//------------------------------------------------------------------------------
// <auto-generated>
// Ten kod został wygenerowany przez narzędzie.
Expand Down Expand Up @@ -365,117 +365,117 @@ void System.Windows.Markup.IStyleConnector.Connect(int connectionId, object targ
break;
case 21:

#line 709 "..\..\MainWindow.xaml"
#line 725 "..\..\MainWindow.xaml"
((System.Windows.Controls.ComboBox)(target)).Loaded += new System.Windows.RoutedEventHandler(this.PlumeCombo_Loaded);

#line default
#line hidden
break;
case 22:

#line 853 "..\..\MainWindow.xaml"
#line 869 "..\..\MainWindow.xaml"
((System.Windows.Controls.ComboBox)(target)).PreviewKeyUp += new System.Windows.Input.KeyEventHandler(this.TechComboBox_PreviewKeyUp);

#line default
#line hidden
break;
case 23:

#line 1010 "..\..\MainWindow.xaml"
#line 1026 "..\..\MainWindow.xaml"
((System.Windows.Controls.Image)(target)).MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.RegisterMouseDown);

#line default
#line hidden

#line 1010 "..\..\MainWindow.xaml"
#line 1026 "..\..\MainWindow.xaml"
((System.Windows.Controls.Image)(target)).MouseUp += new System.Windows.Input.MouseButtonEventHandler(this.AddGD_MouseUp);

#line default
#line hidden
break;
case 24:

#line 1011 "..\..\MainWindow.xaml"
#line 1027 "..\..\MainWindow.xaml"
((System.Windows.Controls.Image)(target)).MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.RegisterMouseDown);

#line default
#line hidden

#line 1011 "..\..\MainWindow.xaml"
#line 1027 "..\..\MainWindow.xaml"
((System.Windows.Controls.Image)(target)).MouseUp += new System.Windows.Input.MouseButtonEventHandler(this.RemoveGD_MouseUp);

#line default
#line hidden
break;
case 25:

#line 1012 "..\..\MainWindow.xaml"
#line 1028 "..\..\MainWindow.xaml"
((System.Windows.Controls.Image)(target)).MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.RegisterMouseDown);

#line default
#line hidden

#line 1012 "..\..\MainWindow.xaml"
#line 1028 "..\..\MainWindow.xaml"
((System.Windows.Controls.Image)(target)).MouseUp += new System.Windows.Input.MouseButtonEventHandler(this.SortThrustCurve_MouseUp);

#line default
#line hidden
break;
case 26:

#line 1013 "..\..\MainWindow.xaml"
#line 1029 "..\..\MainWindow.xaml"
((System.Windows.Controls.DataGrid)(target)).Loaded += new System.Windows.RoutedEventHandler(this.GD_Loaded);

#line default
#line hidden
break;
case 27:

#line 1098 "..\..\MainWindow.xaml"
#line 1114 "..\..\MainWindow.xaml"
((System.Windows.Controls.TextBox)(target)).PreviewKeyDown += new System.Windows.Input.KeyEventHandler(this.TanksVolumeInput_PrewiewKeyDown);

#line default
#line hidden
break;
case 28:

#line 1103 "..\..\MainWindow.xaml"
#line 1119 "..\..\MainWindow.xaml"
((System.Windows.Controls.Image)(target)).MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.RegisterMouseDown);

#line default
#line hidden

#line 1103 "..\..\MainWindow.xaml"
#line 1119 "..\..\MainWindow.xaml"
((System.Windows.Controls.Image)(target)).MouseUp += new System.Windows.Input.MouseButtonEventHandler(this.AddGD_MouseUp);

#line default
#line hidden
break;
case 29:

#line 1104 "..\..\MainWindow.xaml"
#line 1120 "..\..\MainWindow.xaml"
((System.Windows.Controls.Image)(target)).MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.RegisterMouseDown);

#line default
#line hidden

#line 1104 "..\..\MainWindow.xaml"
#line 1120 "..\..\MainWindow.xaml"
((System.Windows.Controls.Image)(target)).MouseUp += new System.Windows.Input.MouseButtonEventHandler(this.RemoveGD_MouseUp);

#line default
#line hidden
break;
case 30:

#line 1106 "..\..\MainWindow.xaml"
#line 1122 "..\..\MainWindow.xaml"
((System.Windows.Controls.DataGrid)(target)).Loaded += new System.Windows.RoutedEventHandler(this.GD_Loaded);

#line default
#line hidden
break;
case 31:

#line 1111 "..\..\MainWindow.xaml"
#line 1127 "..\..\MainWindow.xaml"
((System.Windows.Controls.ComboBox)(target)).Loaded += new System.Windows.RoutedEventHandler(this.PropellantCombo_Loaded);

#line default
Expand Down

0 comments on commit 064a417

Please sign in to comment.