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

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

make NgTankSystem input parameter optional

parent 2d79161e
No related branches found
No related tags found
No related merge requests found
......@@ -664,7 +664,7 @@ Public Class Vehicle
End Get
End Property
Public ReadOnly Property TankSystem As TankSystem Implements IVehicleDeclarationInputData.TankSystem
Public ReadOnly Property TankSystem As TankSystem? Implements IVehicleDeclarationInputData.TankSystem
get
Return DeclarationData.Vehicle.TankSystemDefault
End Get
......@@ -729,4 +729,6 @@ Public Class Vehicle
Return DeclarationData.Vehicle.ADAS.PredictiveCruiseControlDefault
End Get
End Property
End Class
......@@ -142,7 +142,7 @@ namespace TUGraz.VectoCommon.InputData
bool SleeperCab { get; }
TankSystem TankSystem { get; }
TankSystem? TankSystem { get; }
IAdvancedDriverAssistantSystemDeclarationInputData ADAS { get; }
......
......@@ -304,7 +304,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public bool VocationalVehicle { get { return DeclarationData.Vehicle.VocationalVehicleDefault; } }
public bool SleeperCab { get { return DeclarationData.Vehicle.SleeperCabDefault; } }
public TankSystem TankSystem { get { return DeclarationData.Vehicle.TankSystemDefault; } }
public TankSystem? TankSystem { get { return DeclarationData.Vehicle.TankSystemDefault; } }
public IAdvancedDriverAssistantSystemDeclarationInputData ADAS { get { return this; } }
public bool ZeroEmissionVehicle { get { return DeclarationData.Vehicle.ZeroEmissionVehicleDefault; } }
public bool HybridElectricHDV { get { return DeclarationData.Vehicle.HybridElectricHDVDefault; } }
......
......@@ -260,7 +260,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public bool SleeperCab { get { return DeclarationData.Vehicle.SleeperCabDefault; } }
public TankSystem TankSystem { get { return DeclarationData.Vehicle.TankSystemDefault; } }
public TankSystem? TankSystem { get { return DeclarationData.Vehicle.TankSystemDefault; } }
public IAdvancedDriverAssistantSystemDeclarationInputData ADAS { get { return this; } }
public bool ZeroEmissionVehicle { get { return DeclarationData.Vehicle.ZeroEmissionVehicleDefault; } }
......
......@@ -269,10 +269,10 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration
? XmlConvert.ToBoolean(GetElementValue(XMLNames.Vehicle_SleeperCab))
: DeclarationData.Vehicle.SleeperCabDefault;
} }
public TankSystem TankSystem { get {
public TankSystem? TankSystem { get {
return ElementExists(XMLNames.Vehicle_NgTankSystem)
? EnumHelper.ParseEnum<TankSystem>(GetElementValue(XMLNames.Vehicle_NgTankSystem))
: DeclarationData.Vehicle.TankSystemDefault;
: (TankSystem?)null;
} }
public IAdvancedDriverAssistantSystemDeclarationInputData ADAS { get { return this; } }
......
......@@ -293,7 +293,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering
public IPTOTransmissionInputData PTOTransmissionInputData { get; private set; }
public bool VocationalVehicle { get { return false; } }
public bool SleeperCab { get { return true; } }
public TankSystem TankSystem { get; }
public TankSystem? TankSystem { get; }
public IAdvancedDriverAssistantSystemDeclarationInputData ADAS { get { return null; } }
public bool ZeroEmissionVehicle { get { return false; } }
public bool HybridElectricHDV { get { return false; } }
......
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