diff --git a/VECTO3GUI2020/MainWindow.xaml b/VECTO3GUI2020/MainWindow.xaml
index 375574105d43fff296cef60b20a9bedfb92ed31c..85c6888d21f6c84b3711953bb715c51d2d70c97e 100644
--- a/VECTO3GUI2020/MainWindow.xaml
+++ b/VECTO3GUI2020/MainWindow.xaml
@@ -38,8 +38,8 @@
</MenuItem.CommandParameter>
</MenuItem>
<Separator></Separator>
- <MenuItem Header="{x:Static resx:GUILabels.CreateInterimCompletedInput}" Command="{Binding JobListVm.NewCompletedInputCommand}" ToolTip="{x:Static resx:GUILabels.CreateInterimCompletedInputToolTip}"/>
- <MenuItem Header="{x:Static resx:GUILabels.CreateExemptedInterimCompletedInput}" Command="{Binding JobListVm.NewExemptedCompletedInputCommand}" ToolTip="{x:Static resx:GUILabels.CreateExemptedInterimCompletedInputToolTip}"/>
+ <MenuItem Header="{x:Static resx:GUILabels.CreateInterimCompletedInput}" Command="{Binding JobListVm.NewCompletedInputCommand}" />
+ <MenuItem Header="{x:Static resx:GUILabels.CreateExemptedInterimCompletedInput}" Command="{Binding JobListVm.NewExemptedCompletedInputCommand}" />
</MenuItem>
<MenuItem Header="Load File" Command="{Binding JobListVm.AddJobAsyncCommand}"/>
<MenuItem Header="Settings" Command="{Binding OpenSettings}"/>
diff --git a/VECTO3GUI2020/Properties/GUILabels.Designer.cs b/VECTO3GUI2020/Properties/GUILabels.Designer.cs
index 8067f9f78e09135fefe941f5db827e5bf8ae55a4..8a5c88f6fb9df7e6a0b25ac9a2a53a4e06f51602 100644
--- a/VECTO3GUI2020/Properties/GUILabels.Designer.cs
+++ b/VECTO3GUI2020/Properties/GUILabels.Designer.cs
@@ -151,7 +151,7 @@ namespace VECTO3GUI2020.Properties {
}
/// <summary>
- /// Looks up a localized string similar to Create Interim/Completed Input.
+ /// Looks up a localized string similar to .
/// </summary>
public static string CreateInterimCompletedInputToolTip {
get {
@@ -196,7 +196,7 @@ namespace VECTO3GUI2020.Properties {
}
/// <summary>
- /// Looks up a localized string similar to Create a new Complete Job.
+ /// Looks up a localized string similar to Special Case 2: Provide primary input XML and all parameters of completed vehicle to create a VECTO job..
/// </summary>
public static string NewCompleteJobToolTip {
get {
@@ -214,7 +214,7 @@ namespace VECTO3GUI2020.Properties {
}
/// <summary>
- /// Looks up a localized string similar to Create a new Interim/Completed Job.
+ /// Looks up a localized string similar to General case: Provide VIF and completed model parameters to create a VECTO job..
/// </summary>
public static string NewInterimOrCompletedJobToolTip {
get {
@@ -232,7 +232,7 @@ namespace VECTO3GUI2020.Properties {
}
/// <summary>
- /// Looks up a localized string similar to Create a new Primary Job with Interim Input.
+ /// Looks up a localized string similar to Special Case 1: Provide primary input XML and some parameters of completed vehicle (interim XML) to create a VECTO job..
/// </summary>
public static string NewPrimaryAndInterimJobToolTip {
get {
diff --git a/VECTO3GUI2020/Properties/GUILabels.resx b/VECTO3GUI2020/Properties/GUILabels.resx
index ac2e3599c035e1bcc1cb5d0bdd48ce2e39ace7f8..616d2ff6d65bdbe2cc0be014a55ce746c44d636b 100644
--- a/VECTO3GUI2020/Properties/GUILabels.resx
+++ b/VECTO3GUI2020/Properties/GUILabels.resx
@@ -124,19 +124,19 @@
<value>New Primary Job with Interim Input</value>
</data>
<data name="NewPrimaryAndInterimJobToolTip" xml:space="preserve">
- <value>Create a new Primary Job with Interim Input</value>
+ <value>Special Case 1: Provide primary input XML and some parameters of completed vehicle (interim XML) to create a VECTO job.</value>
</data>
<data name="NewInterimOrCompletedJob" xml:space="preserve">
<value>New Interim/Completed Job</value>
</data>
<data name="NewInterimOrCompletedJobToolTip" xml:space="preserve">
- <value>Create a new Interim/Completed Job</value>
+ <value>General case: Provide VIF and completed model parameters to create a VECTO job.</value>
</data>
<data name="NewCompleteJob" xml:space="preserve">
<value>New Complete Job</value>
</data>
<data name="NewCompleteJobToolTip" xml:space="preserve">
- <value>Create a new Complete Job</value>
+ <value>Special Case 2: Provide primary input XML and all parameters of completed vehicle to create a VECTO job.</value>
</data>
<data name="CreateInterimCompletedInput" xml:space="preserve">
<value>Create Interim/Completed Input</value>
@@ -172,7 +172,7 @@
<value>Components_Conventional_CompletedBusType</value>
</data>
<data name="CreateInterimCompletedInputToolTip" xml:space="preserve">
- <value>Create Interim/Completed Input</value>
+ <value></value>
</data>
<data name="CreateExemptedInterimCompletedInput" xml:space="preserve">
<value>Create Exempted Interim/Completed Input</value>
diff --git a/VECTO3GUI2020/ViewModel/Implementation/JobListViewModel.cs b/VECTO3GUI2020/ViewModel/Implementation/JobListViewModel.cs
index 293cde435008d6ca76e45fabcbfa0ef1ba5f3512..e5dcf31de4857987660de2214d6da36db889785c 100644
--- a/VECTO3GUI2020/ViewModel/Implementation/JobListViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/Implementation/JobListViewModel.cs
@@ -409,7 +409,7 @@ namespace VECTO3GUI2020.ViewModel.Implementation
Time = DateTime.Now,
Type = MessageType.InfoMessage,
});
- status.Report("No jobs selected");
+ status.Report("No Jobs selected");
return;
}
}
@@ -631,7 +631,7 @@ namespace VECTO3GUI2020.ViewModel.Implementation
PrintRuns(justFinished, fileWriters, outputMessages);
finishedRuns.AddRange(justFinished.Select(x => x.Key));
- var delayMs = 500;
+ var delayMs = 100;
Task.Delay(delayMs, ct).Wait(delayMs);
}
start.Stop();
@@ -841,6 +841,7 @@ namespace VECTO3GUI2020.ViewModel.Implementation
});
_simulationLoggingEnabled = false;
_cancellationTokenSource.Cancel();
+ _status.Report("");
},
diff --git a/VECTO3GUI2020/Views/JoblistView.xaml b/VECTO3GUI2020/Views/JoblistView.xaml
index ed74d7e50a1b0baf4cfee7bba9280b4a02007ec2..285f3a99ddd4c346434e521882b4b6ebce39b168 100644
--- a/VECTO3GUI2020/Views/JoblistView.xaml
+++ b/VECTO3GUI2020/Views/JoblistView.xaml
@@ -57,7 +57,7 @@
PreviewDrop = "JobDataGrid_OnPreviewDrop"
ColumnHeaderStyle="{StaticResource JobListDataGridHeaderStyle}"
RowHeight="30"
- AlternatingRowBackground="Gainsboro"
+ AlternatingRowBackground="WhiteSmoke"
CellStyle="{DynamicResource DataGridCellStyle1}"
SelectedItem = "{Binding SelectedJob}"
>
diff --git a/VECTO3GUI2020/Views/Multistage/CreateVifView.xaml b/VECTO3GUI2020/Views/Multistage/CreateVifView.xaml
index 4d46b27ba5c4fc8185cca0b984ce7b59ab8bf490..5be0ce48930362fcca7628109545f2fe13338a98 100644
--- a/VECTO3GUI2020/Views/Multistage/CreateVifView.xaml
+++ b/VECTO3GUI2020/Views/Multistage/CreateVifView.xaml
@@ -9,10 +9,9 @@
xmlns:implementation1="clr-namespace:VECTO3GUI2020.ViewModel.MultiStage.Implementation"
mc:Ignorable="d"
Width="600"
- MinHeight="200"
- d:DesignHeight="450" d:DesignWidth="800" d:DataContext="{d:DesignInstance implementation1:CreateVifViewModel}">
+ MinWidth="600" d:DataContext="{d:DesignInstance implementation1:CreateVifViewModel}">
<Grid>
- <DockPanel LastChildFill="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+ <DockPanel LastChildFill="False" HorizontalAlignment="Stretch" VerticalAlignment="Top">
<!--<Label HorizontalAlignment="Center" DockPanel.Dock="Top"
Visibility="{Binding UnsavedChanges,
Converter={StaticResource BooleanToVisibilityConverter}}">
@@ -36,48 +35,22 @@
Margin="2 4">
</Button>
- <customControls:FilePicker DockPanel.Dock="Left" HorizontalAlignment="Stretch"
- Text="{Binding PrimaryInputPath}"
- Command="{Binding SelectPrimaryInputFileCommand}"/>
+ <customControls:FilePicker DockPanel.Dock="Left" HorizontalAlignment="Stretch" Text="{Binding PrimaryInputPath}" Command="{Binding SelectPrimaryInputFileCommand}"/>
</DockPanel>
- <Label Grid.Row="2" Style="{DynamicResource LabelStyle1}"
- Visibility="{Binding Completed,
- Converter={StaticResource InvertedBoolToVisibilityConverter}}">Select Interim Input</Label>
- <Label Grid.Row="2" Style="{DynamicResource LabelStyle1}"
- Visibility="{Binding Completed,
- Converter={StaticResource BooleanToVisibilityConverter}}">Select Completed Input</Label>
- <DockPanel Grid.Row="3" HorizontalAlignment="Stretch">
- <Button Command="{Binding RemoveStageInputCommand}"
- DockPanel.Dock="Right"
- ContentTemplate="{StaticResource TrashIcon}"
- Width="30"
- Padding="4"
- Margin="2 4">
-
- </Button>
- <customControls:FilePicker DockPanel.Dock="Left"
- Text="{Binding StageInputPath}"
- Command="{Binding SelectCompletedInputFileCommand}"></customControls:FilePicker>
+ <Label Grid.Row="2" Style="{DynamicResource LabelStyle1}" Visibility="{Binding Completed, Converter={StaticResource InvertedBoolToVisibilityConverter}}">Select Interim Input</Label>
+ <Label Grid.Row="2" Style="{DynamicResource LabelStyle1}" Visibility="{Binding Completed, Converter={StaticResource BooleanToVisibilityConverter}}">Select Completed Input</Label>
+ <DockPanel Grid.Row="3">
+ <!--<Button DockPanel.Dock="Right" Command="{Binding EditStageInputCommand}" Width="30" Padding="4" Margin="4">Edit</Button>-->
+ <Button DockPanel.Dock="Right" Command="{Binding RemoveStageInputCommand}" ContentTemplate="{StaticResource TrashIcon}" Width="30" Padding="4" Margin="4"/>
+ <customControls:FilePicker DockPanel.Dock="Left" Text="{Binding StageInputPath}" Command="{Binding SelectCompletedInputFileCommand}" />
</DockPanel>
</Grid>
- <DockPanel DockPanel.Dock="Bottom" LastChildFill="False">
- <UniformGrid DockPanel.Dock="Right" Rows="1" Width="500" HorizontalAlignment="Right">
- <Button Style="{StaticResource MultiStageButtonStyle1}">Create</Button>
- <Button Style="{StaticResource MultiStageButtonStyle1}"
- Command="{Binding SaveJobAsCommand}"
- >
- Save Job as ...
- </Button>
- <Button Style="{StaticResource MultiStageButtonStyle1}"
- Command="{Binding SaveJobCommand}">
- Save Job
- </Button>
- <Button Style="{StaticResource MultiStageButtonStyle1}"
- Command="{Binding CloseWindowCommand}"
- CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}">Close</Button>
- </UniformGrid>
- </DockPanel>
+ <StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal" HorizontalAlignment="Right">
+ <Button Width="100" Style="{StaticResource MultiStageButtonStyle1}" Command="{Binding SaveJobAsCommand}">Save Job as ...</Button>
+ <Button Width="100" Style="{StaticResource MultiStageButtonStyle1}" Command="{Binding SaveJobCommand}">Save Job</Button>
+ <Button Width="100" Style="{StaticResource MultiStageButtonStyle1}" Command="{Binding CloseWindowCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}">Close</Button>
+ </StackPanel>
</DockPanel>
</Grid>
</UserControl>