From 8a18c1ee249b504c0b35cbc9576d81ecfc80f1c1 Mon Sep 17 00:00:00 2001 From: Markus Quaritsch <markus.quaritsch@tugraz.at> Date: Wed, 21 Dec 2016 13:16:18 +0100 Subject: [PATCH] adding constant CdxA for construction cycles --- VectoCore/VectoCore/Models/Declaration/Segment.cs | 2 ++ VectoCore/VectoCore/Models/Declaration/Segments.cs | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/VectoCore/VectoCore/Models/Declaration/Segment.cs b/VectoCore/VectoCore/Models/Declaration/Segment.cs index 3e21a8b0c3..cfd31a60ea 100644 --- a/VectoCore/VectoCore/Models/Declaration/Segment.cs +++ b/VectoCore/VectoCore/Models/Declaration/Segment.cs @@ -53,5 +53,7 @@ namespace TUGraz.VectoCore.Models.Declaration public Stream AccelerationFile { get; internal set; } public Mission[] Missions { get; internal set; } + + public SquareMeter CdAConstruction { get; internal set; } } } \ No newline at end of file diff --git a/VectoCore/VectoCore/Models/Declaration/Segments.cs b/VectoCore/VectoCore/Models/Declaration/Segments.cs index 8606f7a12c..76f45862ad 100644 --- a/VectoCore/VectoCore/Models/Declaration/Segments.cs +++ b/VectoCore/VectoCore/Models/Declaration/Segments.cs @@ -109,7 +109,8 @@ namespace TUGraz.VectoCore.Models.Declaration RessourceHelper.ReadStream(DeclarationData.DeclarationDataResourcePrefix + ".VACC." + row.Field<string>(".vaccfile")), Missions = CreateMissions(ref grossVehicleMassRating, curbWeight, row), - GrossVehicleMassRating = grossVehicleMassRating + GrossVehicleMassRating = grossVehicleMassRating, + CdAConstruction = row.ParseDouble("cdxa construction").SI<SquareMeter>() }; return segment; @@ -156,7 +157,7 @@ namespace TUGraz.VectoCore.Models.Declaration var mission = new Mission { MissionType = missionType, - CrossWindCorrection = row.Field<string>("crosswindcorrection" + GetMissionSuffix(missionType)), + CrossWindCorrectionParameters = row.Field<string>("crosswindcorrection" + GetMissionSuffix(missionType)), CycleFile = RessourceHelper.ReadStream(DeclarationData.DeclarationDataResourcePrefix + ".MissionCycles." + missionType + Constants.FileExtensions.CycleFile), -- GitLab