diff --git a/VectoCommon/VectoCommon/BusAuxiliaries/IAuxiliaryConfig.cs b/VectoCommon/VectoCommon/BusAuxiliaries/IAuxiliaryConfig.cs index 36793d2013d15d07ea761c571fa1d1165d97731b..ca0fbab1cebe70d4e92fb8a7355c674a2c0e195e 100644 --- a/VectoCommon/VectoCommon/BusAuxiliaries/IAuxiliaryConfig.cs +++ b/VectoCommon/VectoCommon/BusAuxiliaries/IAuxiliaryConfig.cs @@ -18,7 +18,7 @@ using TUGraz.VectoCore.Models.BusAuxiliaries; namespace TUGraz.VectoCommon.BusAuxiliaries { public interface IAuxiliaryConfig { - [JsonIgnore] + IBusAuxiliariesDeclarationData InputData { get; } // Electrical diff --git a/VectoCommon/VectoCommon/Utils/SI.cs b/VectoCommon/VectoCommon/Utils/SI.cs index 4abe64cdaf43b5043db4c40294ecd164d0c7948c..fed773f60699388e658b2bb57e17ecf52a0e6eac 100644 --- a/VectoCommon/VectoCommon/Utils/SI.cs +++ b/VectoCommon/VectoCommon/Utils/SI.cs @@ -1666,15 +1666,15 @@ namespace TUGraz.VectoCommon.Utils return ToString(null); } - public virtual string UnitString - { - get { return GetUnitString(_units); } - } public virtual double TheValue { get { return Val; } } + public virtual string UnitString + { + get { return GetUnitString(_units); } + } private string ToString(string format) { diff --git a/VectoCore/VectoCore/Models/BusAuxiliaries/AuxiliaryConfig.cs b/VectoCore/VectoCore/Models/BusAuxiliaries/AuxiliaryConfig.cs index 3b2f6ba1292e36a0666f998358bbe043ea7074c4..0f5cd6476ed9abcf87357b969a5bdf59b0cbb11b 100644 --- a/VectoCore/VectoCore/Models/BusAuxiliaries/AuxiliaryConfig.cs +++ b/VectoCore/VectoCore/Models/BusAuxiliaries/AuxiliaryConfig.cs @@ -20,6 +20,7 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries { public class AuxiliaryConfig : IAuxiliaryConfig { + [JsonIgnore] public IBusAuxiliariesDeclarationData InputData { get; internal set; } // Electrical diff --git a/VectoCore/VectoCore/Models/Declaration/Mission.cs b/VectoCore/VectoCore/Models/Declaration/Mission.cs index 7af6db8b18f7c7313176a3553caf98bc3263b9ca..16bf9ca861f575d2fee483582636dd8bf56ebf32 100644 --- a/VectoCore/VectoCore/Models/Declaration/Mission.cs +++ b/VectoCore/VectoCore/Models/Declaration/Mission.cs @@ -33,6 +33,7 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; +using Newtonsoft.Json; using TUGraz.VectoCommon.BusAuxiliaries; using TUGraz.VectoCommon.Models; using TUGraz.VectoCommon.Utils; @@ -57,6 +58,7 @@ namespace TUGraz.VectoCore.Models.Declaration public Kilogram BodyCurbWeight { get; internal set; } + [JsonIgnore] public Stream CycleFile { get; internal set; } public IList<MissionTrailer> Trailer { get; internal set; } diff --git a/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs b/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs index c22feae85f7d5998e36199fc7b3c19cb206d0e3b..2221c166c2c49052ba140eb41dd09cee4ec01bf0 100644 --- a/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs +++ b/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs @@ -99,6 +99,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Data public string ModFileSuffix { get; internal set; } [ValidateObject] + [JsonIgnore] public IDeclarationReport Report { get; internal set; } [Required, ValidateObject] diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs index eb8c9ec9edd62d4514da33c687faf7a8966db0ea..9b57bd841bf98d1a09cb07429dc3ca2fbc27f6a6 100644 --- a/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs +++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs @@ -35,6 +35,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Xml; using System.Xml.Linq; +using Newtonsoft.Json; using TUGraz.VectoCommon.BusAuxiliaries; using TUGraz.VectoCommon.Exceptions; using TUGraz.VectoCommon.InputData; @@ -239,9 +240,12 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data public bool EngineStopStart { get; internal set; } public EcoRollType EcoRoll { get; internal set; } public PredictiveCruiseControlType PredictiveCruiseControl { get; internal set; } + + [JsonIgnore] public IAdvancedDriverAssistantSystemDeclarationInputData InputData { get; internal set; } } + [JsonIgnore] public IVehicleDeclarationInputData InputData { get; internal set; }