From 6065a960d80a64833a6fb8b9fd38810fd348bb86 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Thu, 10 Jun 2021 09:43:46 +0200
Subject: [PATCH] bugfix saving declaration job
---
VECTO/GUI/VectoJobForm.vb | 5 ++++-
VECTO/Input Files/VectoJob.vb | 13 +++++++++++--
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/VECTO/GUI/VectoJobForm.vb b/VECTO/GUI/VectoJobForm.vb
index adbc3547b3..785f68654c 100644
--- a/VECTO/GUI/VectoJobForm.vb
+++ b/VECTO/GUI/VectoJobForm.vb
@@ -648,6 +648,7 @@ Public Class VectoJobForm
'a_DesMax
vectoJob.DesMaxFile = TbDesMaxFile.Text
+ vectoJob.AuxEntries.Clear()
For Each lv0 As ListViewItem In LvAux.Items
Dim auxEntry As VectoJob.AuxEntry = New VectoJob.AuxEntry
@@ -657,7 +658,7 @@ Public Class VectoJobForm
Function(x) Trim(x)))
auxEntry.Type = AuxiliaryTypeHelper.ParseKey(lv0.SubItems(AuxViewColumns.AuxID).Text)
-
+ vectoJob.AuxEntries(AuxiliaryTypeHelper.GetAuxKey(auxEntry.Type)) = auxEntry
Next
vectoJob.AuxPwrICEOn = TbAuxPAuxICEOn.Text.ToDouble(0)
vectoJob.AuxPwrDrivingICEOff = tbPAuxDrivingICEOff.Text.ToDouble(0)
@@ -672,6 +673,8 @@ Public Class VectoJobForm
vectoJob.UseBusAux = false
End If
+
+
'vectoJob.EngineOnly = JobType = VectoSimulationJobType.EngineOnlySimulation
vectoJob.OverSpeedOn = RdOverspeed.Checked
diff --git a/VECTO/Input Files/VectoJob.vb b/VECTO/Input Files/VectoJob.vb
index c55f884d98..4254f25dd2 100644
--- a/VECTO/Input Files/VectoJob.vb
+++ b/VECTO/Input Files/VectoJob.vb
@@ -35,6 +35,7 @@ Public Class VectoJob
IDeclarationJobInputData, IDriverEngineeringInputData, IDriverDeclarationInputData, IAuxiliariesEngineeringInputData, IAuxiliaryEngineeringInputData,
IAuxiliariesDeclarationInputData, IJSONVehicleComponents, IEngineStopStartEngineeringInputData, IEcoRollEngineeringInputData, IPCCEngineeringInputData
+
Private _sFilePath As String
Private _myPath As String
@@ -93,6 +94,8 @@ Public Class VectoJob
Public AuxPwrDrivingICEOff As Double
Public AuxPwrStandstillICEOff As Double
+ Public AuxEntries As Dictionary(Of String, AuxEntry )
+
'Private _vehicleInputData As JSONComponentInputData
'Private _engineInputData As JSONComponentInputData
'Private _gearboxInputData As JSONComponentInputData
@@ -126,6 +129,8 @@ Public Class VectoJob
_driverAccelerationFile = New SubPath
CycleFiles = New List(Of SubPath)
+
+ AuxEntries = new Dictionary(Of String,AuxEntry)
End Sub
Public Function SaveFile() As Boolean
@@ -711,7 +716,7 @@ Public Class VectoJob
Public ReadOnly Property Auxiliaries As IAuxiliaryEngineeringInputData _
Implements IAuxiliariesEngineeringInputData.Auxiliaries
Get
- Return me
+ Return Me 'AuxData().Cast(Of IAuxiliariesEngineeringInputData).ToList()
End Get
End Property
@@ -735,7 +740,9 @@ Public Class VectoJob
Protected Function AuxData() As IList(Of DeclarationAuxiliaryDataInputData)
Dim retVal As List(Of DeclarationAuxiliaryDataInputData) = New List(Of DeclarationAuxiliaryDataInputData)
-
+ For Each entry As KeyValuePair(Of string, AuxEntry) In AuxEntries
+ retVal.Add(New DeclarationAuxiliaryDataInputData() With{ .ID = entry.Key, .Technology = entry.Value.TechnologyList, .Type = AuxiliaryTypeHelper.ParseKey(entry.Key)})
+ Next
Return retVal
End Function
@@ -808,6 +815,8 @@ Public Class VectoJob
Return AuxElPadd.SI(of Watt)
End Get
End Property
+
+
End Class
--
GitLab