From 9152405829fc77eb2ea94a84c670269e34ed1404 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Tue, 5 May 2020 16:55:29 +0200
Subject: [PATCH] correct sample data, fix gui for vtp buses
---
.../Declaration Mode/VTP SampleData ML/VTP Testzyklus.vdri | 2 +-
VECTO/GUI/VectoVTPJobForm.vb | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/Generic Vehicles/Declaration Mode/VTP SampleData ML/VTP Testzyklus.vdri b/Generic Vehicles/Declaration Mode/VTP SampleData ML/VTP Testzyklus.vdri
index 629706f62b..bedecbd9c6 100644
--- a/Generic Vehicles/Declaration Mode/VTP SampleData ML/VTP Testzyklus.vdri
+++ b/Generic Vehicles/Declaration Mode/VTP SampleData ML/VTP Testzyklus.vdri
@@ -1,4 +1,4 @@
-<t> [s],<v> [km/h],<n_eng> [rpm],<n_fan> [rpm],<tq_left> [Nm],<tq_right> [Nm],<n_wh_left> [rpm],<n_wh_right> [rpm],<fc> [g/h],<gear>
+<t> [s],<v> [km/h],<n_eng> [rpm],<n_fan> [rpm],<tq_left> [Nm],<tq_right> [Nm],<n_wh_left> [rpm],<n_wh_right> [rpm],<fc_Diesel CI> [g/h],<gear>
0.5,0,800,2201.103,0,0,0,0,683.3202,0
1.5,0,800,2201.103,0,0,0,0,683.3202,0
2.5,0,800,2201.103,0,0,0,0,683.3202,0
diff --git a/VECTO/GUI/VectoVTPJobForm.vb b/VECTO/GUI/VectoVTPJobForm.vb
index fe5beeff1f..8aa3288d10 100644
--- a/VECTO/GUI/VectoVTPJobForm.vb
+++ b/VECTO/GUI/VectoVTPJobForm.vb
@@ -254,6 +254,10 @@ Public Class VectoVTPJobForm
Private Sub PopulateAuxiliaryList(auxInput As IAuxiliariesDeclarationInputData)
LvAux.Items.Clear()
+ If auxInput is Nothing Then
+ Return
+ End If
+
Dim entry As IAuxiliaryDeclarationInputData
For Each entry In auxInput.Auxiliaries
'If entry.AuxiliaryType = AuxiliaryDemandType.Constant Then Continue For
--
GitLab