Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS will be completely phased out by mid-2025. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit d08a33de authored by Franz KOBER josef's avatar Franz KOBER josef
Browse files

removed TorqueConverterData Datatable from XMLPrimaryVehicleReport

parent 52bb44c6
No related branches found
No related tags found
No related merge requests found
......@@ -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>
......
......@@ -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
......@@ -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;
}
}
......
......@@ -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; }
......
......@@ -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)
{
......
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