This site uses cookies. Visit our cookies policy page or click the link in any footer for more information and to change your preferences.

Accept all cookies Accept only essential cookies

Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit c8d0c137 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

Merge branch 'feature/VECTO-1410-multistage-tool-buses' of... 

Merge branch 'feature/VECTO-1410-multistage-tool-buses' of git+ssh://129.27.107.191:2211/vecto-dev into feature/VECTO-1410_IVT-multistage-tool-buses
parents 4f3f33b4 baa6c300
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
VECTO3GUI2020/MainWindow.xaml
+ 2
− 2
View file @ c8d0c137
......@@ -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}"/>
......
VECTO3GUI2020/Properties/GUILabels.Designer.cs
+ 4
− 4
View file @ c8d0c137
......@@ -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 {
......
VECTO3GUI2020/Properties/GUILabels.resx
+ 4
− 4
View file @ c8d0c137
......@@ -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>
......
VECTO3GUI2020/ViewModel/Implementation/JobListViewModel.cs
+ 3
− 2
View file @ c8d0c137
......@@ -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("");
},
......
VECTO3GUI2020/Views/JoblistView.xaml
+ 1
− 1
View file @ c8d0c137
......@@ -57,7 +57,7 @@
PreviewDrop = "JobDataGrid_OnPreviewDrop"
ColumnHeaderStyle="{StaticResource JobListDataGridHeaderStyle}"
RowHeight="30"
AlternatingRowBackground="Gainsboro"
AlternatingRowBackground="WhiteSmoke"
CellStyle="{DynamicResource DataGridCellStyle1}"
SelectedItem = "{Binding SelectedJob}"
>
......
VECTO3GUI2020/Views/Multistage/CreateVifView.xaml
+ 14
− 41
View file @ c8d0c137
......@@ -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>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about