Code development platform for open source projects from the European Union institutions

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

Merge branch 'feature/VECTO_GUI' into develop

parents c15d41ce 910c267c
No related branches found
No related tags found
No related merge requests found
...@@ -256,7 +256,8 @@ namespace VECTO3GUI.ViewModel.Impl ...@@ -256,7 +256,8 @@ namespace VECTO3GUI.ViewModel.Impl
private void UpdateJobData() private void UpdateJobData()
{ {
SavedJobEntry.Body.PrimaryVehicle = FirstFilePath; SavedJobEntry.Body.PrimaryVehicle = JobType.SingleBusJob == JobType ? FirstFilePath : null; ;
SavedJobEntry.Body.PrimaryVehicleResults = JobType.CompletedBusJob == JobType ? FirstFilePath : null;
SavedJobEntry.Body.CompletedVehicle = SecondFilePath; SavedJobEntry.Body.CompletedVehicle = SecondFilePath;
} }
......
...@@ -868,7 +868,7 @@ namespace VECTO3GUI.ViewModel.Impl ...@@ -868,7 +868,7 @@ namespace VECTO3GUI.ViewModel.Impl
sender.ReportProgress(100, new VectoSimulationProgress() {Type = VectoSimulationProgress.MsgType.StatusMessage, Message = "No jobs selected for simulation"}); sender.ReportProgress(100, new VectoSimulationProgress() {Type = VectoSimulationProgress.MsgType.StatusMessage, Message = "No jobs selected for simulation"});
return; return;
} }
var sumFileWriter = new FileOutputWriter(Path.GetDirectoryName(jobs.First().JobEntryFilePath)); var sumFileWriter = new FileOutputWriter(GetOutputDirectory(jobs.First().JobEntryFilePath));
var sumContainer = new SummaryDataContainer(sumFileWriter); var sumContainer = new SummaryDataContainer(sumFileWriter);
var jobContainer = new JobContainer(sumContainer); var jobContainer = new JobContainer(sumContainer);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment