From 82f87b2d236b7493181489b0ad81c098554ae923 Mon Sep 17 00:00:00 2001
From: "VKMTHD\\franzjosefkober" <franz.josef.kober@ivt.tugraz.at>
Date: Fri, 30 Apr 2021 17:08:55 +0200
Subject: [PATCH] reader adjusted due to the name changes
---
.../Resources/XMLNames.Designer.cs | 27 +++++++++++++++++++
.../VectoCommon/Resources/XMLNames.resx | 9 +++++++
...MLDeclarationBusAuxiliariesDataProvider.cs | 2 +-
.../XMLDeclarationVehicleDataProvider.cs | 10 +++----
4 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
index 2ef3211ecd..24c2462e3a 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
@@ -897,6 +897,15 @@ namespace TUGraz.VectoCommon.Resources {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to VehicleDeclarationType.
+ /// </summary>
+ public static string Bus_VehicleDeclarationType {
+ get {
+ return ResourceManager.GetString("Bus_VehicleDeclarationType", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to VehicleLength.
/// </summary>
@@ -1023,6 +1032,15 @@ namespace TUGraz.VectoCommon.Resources {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to SCRReagentDosing.
+ /// </summary>
+ public static string BusAux_PneumaticSystem_SCRReagentDosing {
+ get {
+ return ResourceManager.GetString("BusAux_PneumaticSystem_SCRReagentDosing", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to SmartCompressionSystem.
/// </summary>
@@ -3687,6 +3705,15 @@ namespace TUGraz.VectoCommon.Resources {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to BodyworkCode.
+ /// </summary>
+ public static string Vehicle_BodyworkCode {
+ get {
+ return ResourceManager.GetString("Vehicle_BodyworkCode", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to CargoVolume.
/// </summary>
diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.resx b/VectoCommon/VectoCommon/Resources/XMLNames.resx
index 34634b35d3..eef1fffb7c 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.resx
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.resx
@@ -1488,4 +1488,13 @@
<data name="VehicleAttr_VehicleDeclarationType" xml:space="preserve">
<value>VehicleDeclarationType</value>
</data>
+ <data name="BusAux_PneumaticSystem_SCRReagentDosing" xml:space="preserve">
+ <value>SCRReagentDosing</value>
+ </data>
+ <data name="Bus_VehicleDeclarationType" xml:space="preserve">
+ <value>VehicleDeclarationType</value>
+ </data>
+ <data name="Vehicle_BodyworkCode" xml:space="preserve">
+ <value>BodyworkCode</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationBusAuxiliariesDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationBusAuxiliariesDataProvider.cs
index 073d3f207b..b33ee82dcf 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationBusAuxiliariesDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationBusAuxiliariesDataProvider.cs
@@ -128,7 +128,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
get
{
return GetBool(
- new[] { XMLNames.BusAux_PneumaticSystem, XMLNames.BusAux_PneumaticSystem_AdBlueDosing })
+ new[] { XMLNames.BusAux_PneumaticSystem, XMLNames.BusAux_PneumaticSystem_SCRReagentDosing })
? ConsumerTechnology.Pneumatically
: ConsumerTechnology.Electrically;
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
index fb15aa2b26..c71f4ab540 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
@@ -1233,8 +1233,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
{
get
{
- return ElementExists(XMLNames.Vehicle_VehicleCode)
- ? GetString(XMLNames.Vehicle_VehicleCode).ParseEnum<VehicleCode>()
+ return ElementExists(XMLNames.Vehicle_BodyworkCode)
+ ? GetString(XMLNames.Vehicle_BodyworkCode).ParseEnum<VehicleCode>()
: (VehicleCode?)null;
}
}
@@ -1301,7 +1301,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public override VehicleDeclarationType VehicleDeclarationType
{
- get { return VehicleDeclarationTypeHelper.Parse(GetString(XMLNames.Bus_DeclarationType)); }
+ get { return VehicleDeclarationTypeHelper.Parse(GetString(XMLNames.Bus_VehicleDeclarationType)); }
}
@@ -1468,8 +1468,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
{
get
{
- return ElementExists(XMLNames.Vehicle_VehicleCode)
- ? GetString(XMLNames.Vehicle_VehicleCode).ParseEnum<VehicleCode>()
+ return ElementExists(XMLNames.Vehicle_BodyworkCode)
+ ? GetString(XMLNames.Vehicle_BodyworkCode).ParseEnum<VehicleCode>()
: (VehicleCode?)null;
}
}
--
GitLab