fix saving job form with busaux params

VECTO/GUI/VectoJobForm.vb

@@ -590,9 +590,11 @@ Public Class VectoJobForm
         if (Not inputData.JobInputData.Vehicle.Components.AuxiliaryInputData.BusAuxiliariesData Is nothing) Then
             cbEnableBusAux.Checked = True
             tbBusAuxParams.Text = GetRelativePath(inputData.JobInputData.Vehicle.Components.AuxiliaryInputData.BusAuxiliariesData.DataSource.SourceFile, _basePath)
+            pnBusAux.Enabled = true
         Else 
             cbEnableBusAux.Checked = False
             tbBusAuxParams.Text = ""
+            pnBusAux.Enabled = False
         End If
 
         DeclInit()
@@ -671,6 +673,13 @@ Public Class VectoJobForm
 
         vectoJob.AuxElPadd = tbElectricAuxConstant.Text.ToDouble(0)
 
+        if cbEnableBusAux.Checked AndAlso Not string.IsNullOrWhiteSpace(tbBusAuxParams.Text) Then
+            vectoJob.UseBusAux = true
+            vectoJob.PathBusAux = tbBusAuxParams.Text
+        Else 
+            vectoJob.UseBusAux = false
+        End If
+
         'vectoJob.EngineOnly = JobType = VectoSimulationJobType.EngineOnlySimulation
 
         vectoJob.OverSpeedOn = RdOverspeed.Checked

VECTO/Input Files/VectoJob.vb

@@ -45,6 +45,7 @@ Public Class VectoJob
     Private ReadOnly _gearboxFile As SubPath
     Private ReadOnly _tcuFile As SubPath
     Private ReadOnly _hcuFile As SubPath
+    Private ReadOnly _busAuxFile As SubPath
 
     Private ReadOnly _lacDfTargetSpeedFile As SubPath
     Private ReadOnly _lacDfVelocityDropFile as SubPath
@@ -52,6 +53,8 @@ Public Class VectoJob
     Private _startStop As Boolean
     Public StartStopDelay As Double
 
+    public UseBusAux as Boolean
+
     Private ReadOnly _driverAccelerationFile As SubPath
 
     Public ReadOnly AuxPaths As Dictionary(Of String, AuxEntry)
@@ -112,6 +115,7 @@ Public Class VectoJob
         _gearboxFile = New SubPath
         _tcuFile = New SubPath
         _hcuFile = New SubPath()
+        _busAuxFile = new SubPath()
         _lacDfTargetSpeedFile = New SubPath()
         _lacDfVelocityDropFile = New SubPath()
 
@@ -204,6 +208,19 @@ Public Class VectoJob
         End Set
     End Property
 
+    Public Property PathBusAux(Optional ByVal original As Boolean = False) As String
+        Get
+            If original Then
+                Return _busAuxFile.OriginalPath
+            Else
+                Return _busAuxFile.FullPath
+            End If
+        End Get
+        Set(value As String)
+            _busAuxFile.Init(_myPath, value)
+        End Set
+    End Property
+
     Public Property PathShiftParams(Optional ByVal original As Boolean = False) As String
         Get
             If original Then
@@ -690,7 +707,10 @@ Public Class VectoJob
 
     Public ReadOnly Property BusAuxiliariesData As IBusAuxiliariesEngineeringData Implements IAuxiliariesEngineeringInputData.BusAuxiliariesData
     get
-            Throw new NotImplementedException
+        If (not UseBusAux) Then
+            Return Nothing
+        End If
+        Return New JSONComponentInputData(_busAuxFile.FullPath, Me).JobInputData.Vehicle.Components.AuxiliaryInputData.BusAuxiliariesData
     End Get
     End Property
 

VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs

@@ -48,7 +48,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 	public class JSONComponentInputData : IEngineeringInputDataProvider, IDeclarationInputDataProvider,
 		IEngineeringJobInputData, IVehicleEngineeringInputData, IAdvancedDriverAssistantSystemDeclarationInputData,
 		IAdvancedDriverAssistantSystemsEngineering, IVehicleComponentsDeclaration, IVehicleComponentsEngineering,
-		IDriverEngineeringInputData
+		IDriverEngineeringInputData, IAuxiliariesEngineeringInputData
 	{
 		protected IGearboxEngineeringInputData Gearbox;
 		protected IAxleGearInputData AxleGear;
@@ -65,6 +65,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 		private IAxlesEngineeringInputData _axleWheelsEng;
 		private IBatteryPackEngineeringInputData Battery;
 		private IElectricMotorEngineeringInputData ElectricMotor;
+		private IBusAuxiliariesEngineeringData BusAux;
 
 
 		public JSONComponentInputData(string filename, IJSONVehicleComponents job, bool tolerateMissing = false)
@@ -93,6 +94,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
                 case Constants.FileExtensions.HybridStrategyParameters:
 					tmp = JSONInputDataFactory.ReadHybridStrategyParameters(filename, tolerateMissing);
 					break;
+				case ".vaux":
+					tmp = JSONInputDataFactory.ReadEngineeringBusAuxiliaries(filename, tolerateMissing);
+					break;
 			}
 
 			tmp.Switch()
@@ -110,8 +114,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 				.If<IAxlesEngineeringInputData>(c => _axleWheelsEng = c)
 				.If<IBatteryPackEngineeringInputData>(c => Battery = c)
 				.If<IElectricMotorEngineeringInputData>(c => { ElectricMotor = c; })
-				.If<IHybridStrategyParameters>(c => HybridStrategyParameters = c);
-			;
+				.If<IHybridStrategyParameters>(c => HybridStrategyParameters = c)
+				.If<IBusAuxiliariesEngineeringData>(c => BusAux = c);
+
 			_filename = filename;
 		}
 
@@ -574,7 +579,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 
 		IAuxiliariesEngineeringInputData IVehicleComponentsEngineering.AuxiliaryInputData
 		{
-			get { throw new NotImplementedException(); }
+			get { return this; }
 		}
 
 		IRetarderInputData IVehicleComponentsDeclaration.RetarderInputData
@@ -605,5 +610,19 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 		}
 
 		#endregion
+
+		#region Implementation of IAuxiliariesEngineeringInputData
+
+		public IList<IAuxiliaryEngineeringInputData> Auxiliaries { get { return new List<IAuxiliaryEngineeringInputData>();} }
+		public IBusAuxiliariesEngineeringData BusAuxiliariesData
+		{
+			get { return BusAux; }
+		}
+		public Watt ElectricAuxPower
+		{
+			get { return 0.SI<Watt>(); }
+		}
+
+		#endregion
 	}
 }
\ No newline at end of file

VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs

@@ -954,6 +954,9 @@ public class JSONFileWriter : IOutputFileWriter
 			auxList.Add(auxOut);
 		}
 
+		if (aux.BusAuxiliariesData != null) {
+			body.Add("BusAux", GetRelativePath(job.Vehicle.Components.AuxiliaryInputData.BusAuxiliariesData.DataSource.SourceFile, basePath));
+		}
 		body.Add("Aux", auxList);
 		if (!job.SavedInDeclarationMode)
 			body.Add("Padd", pAdd);