From aeaa92a00c512257e1e9543021c7f016d2e12d5b Mon Sep 17 00:00:00 2001 From: Markus Quaritsch <markus.quaritsch@tugraz.at> Date: Wed, 18 Jul 2018 07:15:07 +0200 Subject: [PATCH] update manufacturer schema --- .../XMLDeclarationAirdragDataProvider.cs | 58 +++++++++---------- .../XSD/VectoOutputManufacturer.0.5.xsd | 2 +- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationAirdragDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationAirdragDataProvider.cs index 1e56a67ce8..ac8b26677b 100644 --- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationAirdragDataProvider.cs +++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationAirdragDataProvider.cs @@ -29,33 +29,33 @@ * Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology */ -using TUGraz.VectoCommon.InputData; -using TUGraz.VectoCommon.Models; -using TUGraz.VectoCommon.Resources; -using TUGraz.VectoCommon.Utils; - -namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration -{ - public class XMLDeclarationAirdragDataProvider : AbstractDeclarationXMLComponentDataProvider, - IAirdragDeclarationInputData - { - public XMLDeclarationAirdragDataProvider(XMLDeclarationInputDataProvider xmlInputDataProvider) - : base(xmlInputDataProvider) - { - XBasePath = Helper.Query(VehiclePath, - XMLNames.Vehicle_Components, - XMLNames.Component_AirDrag, - XMLNames.ComponentDataWrapper); - } - - public new CertificationMethod CertificationMethod - { - get { return CertificationMethod.Measured; } - } - - public SquareMeter AirDragArea - { - get { return ElementExists(XMLNames.AirDrag_DeclaredCdxA) ? GetDoubleElementValue(XMLNames.AirDrag_DeclaredCdxA).SI<SquareMeter>() : null; } - } - } +using TUGraz.VectoCommon.InputData; +using TUGraz.VectoCommon.Models; +using TUGraz.VectoCommon.Resources; +using TUGraz.VectoCommon.Utils; + +namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration +{ + public class XMLDeclarationAirdragDataProvider : AbstractDeclarationXMLComponentDataProvider, + IAirdragDeclarationInputData + { + public XMLDeclarationAirdragDataProvider(XMLDeclarationInputDataProvider xmlInputDataProvider) + : base(xmlInputDataProvider) + { + XBasePath = Helper.Query(VehiclePath, + XMLNames.Vehicle_Components, + XMLNames.Component_AirDrag, + XMLNames.ComponentDataWrapper); + } + + public new CertificationMethod CertificationMethod + { + get { return CertificationMethod.Measured; } + } + + public SquareMeter AirDragArea + { + get { return ElementExists(XMLNames.AirDrag_DeclaredCdxA) ? GetDoubleElementValue(XMLNames.AirDrag_DeclaredCdxA).SI<SquareMeter>() : null; } + } + } } \ No newline at end of file diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.5.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.5.xsd index f362e8302d..b310b61a34 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.5.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.5.xsd @@ -361,7 +361,7 @@ </xs:complexType> <xs:complexType name="TorqueLimitsType"> <xs:sequence> - <xs:element name="Entry" type="TorqueLimitsEntryType"/> + <xs:element name="Entry" type="TorqueLimitsEntryType" maxOccurs="unbounded"/> </xs:sequence> </xs:complexType> <xs:complexType name="VectoOutputDataType"> -- GitLab