From d08a33de2c7e1741955bc2736322ab24315007b3 Mon Sep 17 00:00:00 2001
From: "VKMTHD\\franzjosefkober" <franz.josef.kober@ivt.tugraz.at>
Date: Tue, 25 May 2021 18:47:52 +0200
Subject: [PATCH] removed TorqueConverterData Datatable from
XMLPrimaryVehicleReport
---
.../Resources/XMLNames.Designer.cs | 9 +++++++
.../VectoCommon/Resources/XMLNames.resx | 3 +++
.../DeclarationDataAdapterHeavyLorry.cs | 1 -
.../Data/Gearbox/TorqueConverterData.cs | 3 +--
.../OutputData/XML/XMLPrimaryVehicleReport.cs | 25 ++-----------------
5 files changed, 15 insertions(+), 26 deletions(-)
diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
index 54c3929127..8dc7401d43 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
@@ -582,6 +582,15 @@ namespace TUGraz.VectoCommon.Resources {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to ChassisConfiguration.
+ /// </summary>
+ public static string Bus_ChassisConfiguration {
+ get {
+ return ResourceManager.GetString("Bus_ChassisConfiguration", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to CompressorRatio.
/// </summary>
diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.resx b/VectoCommon/VectoCommon/Resources/XMLNames.resx
index 0f4f526557..17b740e085 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.resx
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.resx
@@ -1512,4 +1512,7 @@
<data name="CompressorDrive" xml:space="preserve">
<value>CompressorDrive</value>
</data>
+ <data name="Bus_ChassisConfiguration" xml:space="preserve">
+ <value>ChassisConfiguration</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterHeavyLorry.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterHeavyLorry.cs
index 35d030c6dc..4d58024257 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterHeavyLorry.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterHeavyLorry.cs
@@ -425,7 +425,6 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
retVal.TorqueConverterData.CertificationNumber = torqueConverter.CertificationNumber;
retVal.TorqueConverterData.Date = torqueConverter.Date;
retVal.TorqueConverterData.AppVersion = torqueConverter.AppVersion;
- retVal.TorqueConverterData.TCData = torqueConverter.TCData;
}
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TorqueConverterData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TorqueConverterData.cs
index 29c416f019..ec6e9c4e70 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TorqueConverterData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TorqueConverterData.cs
@@ -48,8 +48,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox
protected internal readonly TorqueConverterEntry[] TorqueConverterEntries;
public string AppVersion { get; protected internal set; }
- public DataTable TCData { get; protected internal set; }
-
+
[Required, SIRange(0, double.MaxValue)]
public PerSecond ReferenceSpeed { get; protected internal set; }
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLPrimaryVehicleReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLPrimaryVehicleReport.cs
index 7bc47dc1c3..77f77735f5 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLPrimaryVehicleReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLPrimaryVehicleReport.cs
@@ -118,7 +118,7 @@ namespace TUGraz.VectoCore.OutputData.XML
new XElement(tns + XMLNames.Vehicle_VIN, modelData.VehicleData.VIN),
new XElement(tns + XMLNames.Component_Date, XmlConvert.ToString(modelData.VehicleData.Date, XmlDateTimeSerializationMode.Utc)),
new XElement(tns + XMLNames.Bus_LegislativeCategory, modelData.VehicleData.LegislativeClass.ToXMLFormat()),
- new XElement(tns + "ChassisConfiguration", modelData.VehicleData.VehicleCategory.ToXMLFormat()),
+ new XElement(tns + XMLNames.Bus_ChassisConfiguration, modelData.VehicleData.VehicleCategory.ToXMLFormat()),
new XElement(tns + XMLNames.Vehicle_AxleConfiguration, modelData.VehicleData.AxleConfiguration.GetName()),
new XElement(tns + XMLNames.Vehicle_Articulated, modelData.VehicleData.InputData.Articulated),
new XElement(tns + XMLNames.TPMLM, modelData.VehicleData.InputData.GrossVehicleMassRating.ToXMLFormat(0)),
@@ -195,30 +195,9 @@ namespace TUGraz.VectoCore.OutputData.XML
new XElement(tns + XMLNames.Report_DataWrap,
new XAttribute(xsi + "type", "TorqueConverterDataPIFType"),
GetCommonDescription(torqueConverter),
- new XElement(tns + XMLNames.Component_AppVersion, torqueConverter.AppVersion),
- new XElement(tns + XMLNames.TorqueConverter_Characteristics,
- GetTorqueConverterCharacteristics(torqueConverter.TCData))
+ new XElement(tns + XMLNames.Component_AppVersion, torqueConverter.AppVersion)
));
}
-
- private List<XElement> GetTorqueConverterCharacteristics(DataTable tcData)
- {
- var characteristics = new List<XElement>();
-
- foreach (DataRow row in tcData.Rows) {
- var elementEntry = new XElement(tns + XMLNames.TorqueConverter_Characteristics_Entry,
- new XAttribute(XMLNames.TorqueConverterData_SpeedRatio_Attr,
- row[TorqueConverterDataReader.Fields.SpeedRatio].ToString()),
- new XAttribute(XMLNames.TorqueConverterData_TorqueRatio_Attr,
- row[TorqueConverterDataReader.Fields.TorqueRatio].ToString()),
- new XAttribute(XMLNames.TorqueConverterDataMapping_InputTorqueRef_Attr,
- row[TorqueConverterDataReader.Fields.CharacteristicTorque].ToString())
- );
- characteristics.Add(elementEntry);
- }
-
- return characteristics;
- }
protected virtual XElement GetAxleWheelsDescription(VectoRunData modeldData)
{
--
GitLab