diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationWriter.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationWriter.cs index 725b98ead0e7105e6275656218287a7e6d641d3b..109d410a5a3325853b6de421c62adca8c3ea42f4 100644 --- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationWriter.cs +++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationWriter.cs @@ -132,7 +132,7 @@ namespace TUGraz.VectoCore.OutputData.XML var id = string.Format("ENG-{0}", data.Model.RemoveWhitespace()); var fld = EngineFullLoadCurve.Create(data.FullLoadCurve, true); return new XElement(tns + XMLNames.Component_Engine, - new XAttribute(XMLNames.Component_CertificationNumber, string.Format("ENG-{0}", data.Model)), + new XAttribute(XMLNames.Component_CertificationNumber_Attr, string.Format("ENG-{0}", data.Model)), new XElement(tns + XMLNames.ComponentDataWrapper, new XAttribute(XMLNames.Component_ID_Attr, id), GetDefaultComponentElements(string.Format("ENG-{0}", data.Model), data.Model), @@ -178,7 +178,7 @@ namespace TUGraz.VectoCore.OutputData.XML } var id = string.Format("GBX-{0}", gbxData.Model.RemoveWhitespace()); return new XElement(tns + XMLNames.Component_Gearbox, - new XAttribute(XMLNames.Component_CertificationNumber, string.Format("GBX-{0}", gbxData.Model)), + new XAttribute(XMLNames.Component_CertificationNumber_Attr, string.Format("GBX-{0}", gbxData.Model)), new XElement(tns + XMLNames.ComponentDataWrapper, new XAttribute(XMLNames.Component_ID_Attr, id), GetDefaultComponentElements(string.Format("GBX-{0}", gbxData.Model), gbxData.Model), @@ -199,7 +199,7 @@ namespace TUGraz.VectoCore.OutputData.XML } var id = string.Format("TC-{0}", data.Model.RemoveWhitespace()); return new XElement(tns + XMLNames.Component_TorqueConverter, - new XAttribute(XMLNames.Component_CertificationNumber, id), + new XAttribute(XMLNames.Component_CertificationNumber_Attr, id), new XElement(tns + XMLNames.ComponentDataWrapper, new XAttribute(XMLNames.Component_ID_Attr, id), GetDefaultComponentElements(data.TechnicalReportId, data.Model), @@ -218,7 +218,7 @@ namespace TUGraz.VectoCore.OutputData.XML { var id = string.Format("ANGL-{0}", data.Model.RemoveWhitespace()); return new XElement(tns + XMLNames.Component_Angledrive, - new XAttribute(XMLNames.Component_CertificationNumber, "ANGL-" + data.Model), + new XAttribute(XMLNames.Component_CertificationNumber_Attr, "ANGL-" + data.Model), new XElement(tns + XMLNames.ComponentDataWrapper, new XAttribute(XMLNames.Component_ID_Attr, id), GetDefaultComponentElements(data.TechnicalReportId, data.Model), @@ -233,7 +233,7 @@ namespace TUGraz.VectoCore.OutputData.XML { var id = string.Format("RET-{0}", data.Model.RemoveWhitespace()); return new XElement(tns + XMLNames.Component_Retarder, - new XAttribute(XMLNames.Component_CertificationNumber, "RET-none"), + new XAttribute(XMLNames.Component_CertificationNumber_Attr, "RET-none"), new XElement(tns + XMLNames.ComponentDataWrapper, new XAttribute(XMLNames.Component_ID_Attr, id), GetDefaultComponentElements(data.TechnicalReportId, data.Model), @@ -250,7 +250,7 @@ namespace TUGraz.VectoCore.OutputData.XML { var typeId = string.Format("AXLGEAR-{0:0.000}", data.Ratio); return new XElement(tns + XMLNames.Component_Axlegear, - new XAttribute(XMLNames.Component_CertificationNumber, string.Format("AXL-{0}", data.Model)), + new XAttribute(XMLNames.Component_CertificationNumber_Attr, string.Format("AXL-{0}", data.Model)), new XElement(tns + XMLNames.ComponentDataWrapper, new XAttribute(XMLNames.Component_ID_Attr, typeId), GetDefaultComponentElements(typeId, "N.A."), @@ -292,7 +292,7 @@ namespace TUGraz.VectoCore.OutputData.XML { var id = string.Format("TYRE-{0}", axle.Wheels).RemoveWhitespace().Replace("/", "_"); return new XElement(tns + "Tyre", - new XAttribute(XMLNames.Component_CertificationNumber, id), + new XAttribute(XMLNames.Component_CertificationNumber_Attr, id), new XElement(tns + XMLNames.ComponentDataWrapper, new XAttribute(XMLNames.Component_ID_Attr, id), GetDefaultComponentElements(string.Format("TYRE-{0}", axle.Wheels), axle.Wheels), @@ -327,7 +327,7 @@ namespace TUGraz.VectoCore.OutputData.XML { var id = string.Format("Airdrag-{0}", data.Model); return new XElement(tns + XMLNames.Component_AirDrag, - new XAttribute(XMLNames.Component_CertificationNumber, string.Format("AD-{0}", data.Model)), + new XAttribute(XMLNames.Component_CertificationNumber_Attr, string.Format("AD-{0}", data.Model)), new XElement(tns + XMLNames.ComponentDataWrapper, new XAttribute(XMLNames.Component_ID_Attr, id), GetDefaultComponentElements(data.Model, "N.A."), diff --git a/VectoCore/VectoCore/Resources/XMLNames.Designer.cs b/VectoCore/VectoCore/Resources/XMLNames.Designer.cs index 2f116224927d28f9cdf3cb43e4c5db77af72162d..04faa1a12840ecdae1354a1ee7544f149d3d136f 100644 --- a/VectoCore/VectoCore/Resources/XMLNames.Designer.cs +++ b/VectoCore/VectoCore/Resources/XMLNames.Designer.cs @@ -457,11 +457,11 @@ namespace TUGraz.VectoCore.Resources { } /// <summary> - /// Looks up a localized string similar to CertificationNumber. + /// Looks up a localized string similar to certificationNumber. /// </summary> - public static string Component_CertificationNumber { + public static string Component_CertificationNumber_Attr { get { - return ResourceManager.GetString("Component_CertificationNumber", resourceCulture); + return ResourceManager.GetString("Component_CertificationNumber_Attr", resourceCulture); } } diff --git a/VectoCore/VectoCore/Resources/XMLNames.resx b/VectoCore/VectoCore/Resources/XMLNames.resx index ad6df583b379eedd4a9e16ed64e5ad74a256efb3..bbfeacc197d62468b1941dccc39aa41c72e81a38 100644 --- a/VectoCore/VectoCore/Resources/XMLNames.resx +++ b/VectoCore/VectoCore/Resources/XMLNames.resx @@ -555,8 +555,8 @@ <data name="Component_Model" xml:space="preserve"> <value>Model</value> </data> - <data name="Component_CertificationNumber" xml:space="preserve"> - <value>CertificationNumber</value> + <data name="Component_CertificationNumber_Attr" xml:space="preserve"> + <value>certificationNumber</value> </data> <data name="Angledrive_LossMap_Entry" xml:space="preserve"> <value>Entry</value> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_gearbox-sample_ref.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_gearbox-sample_ref.xml index 024225b62ec3e93f8f501cfaa6545e91097a2ef2..8f15d664a9abadde9766f545ad670be1635fb31d 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_gearbox-sample_ref.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_gearbox-sample_ref.xml @@ -128,6 +128,10 @@ </Signature> <TorqueConverter> <Data> + <Manufacturer>Generic Torqueconverter Manufacturer</Manufacturer> + <Model>Generic Torqueconverter</Model> + <Creator>Markus Quaritsch, TUG ITI</Creator> + <Date>2017-01-11T11:00:00Z</Date> <ReferenceRPM>1000</ReferenceRPM> <Characteristics> <Resource type="csv" file="tc_data.vtcc"/> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_job-sample_FULL.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_job-sample_FULL.xml index 726dbaf4711b28193b967f860aaf345a560100d7..7e6407b19de067f1b70b673a942c90c571e45296 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_job-sample_FULL.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderEngineering/engineering_job-sample_FULL.xml @@ -2552,6 +2552,10 @@ </Signature> <TorqueConverter> <Data> + <Manufacturer>Generic Torqueconverter Manufacturer</Manufacturer> + <Model>Generic Torqueconverter</Model> + <Creator>Markus Quaritsch, TUG ITI</Creator> + <Date>2017-01-11T11:00:00Z</Date> <ReferenceRPM>1000</ReferenceRPM> <Characteristics> <Entry speedRatio="0.0000" inputTorqueRef="300.00" torqueRatio="1.80"/>