From 90709db8d9ac13dbd64179327677f4968f541287 Mon Sep 17 00:00:00 2001 From: Markus Quaritsch <markus.quaritsch@tugraz.at> Date: Tue, 18 Jan 2022 11:25:29 +0100 Subject: [PATCH] renaming schema file for vif, adding limits for boosting type, renaming attribute from stage to step in vif --- ...eclarationDefinitions.2.10.2_JobInputData.xsd | 16 ++++++++++++++-- ...tage.0.1.xsd => VectoOutputMultistep.0.1.xsd} | 2 +- VectoCore/VectoXML.spp | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) rename VectoCore/VectoCore/Resources/XSD/{VectoOutputMultistage.0.1.xsd => VectoOutputMultistep.0.1.xsd} (99%) diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd index 7f3f817cdc..95c535955a 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd @@ -995,8 +995,20 @@ <xs:sequence> <xs:element name="Entry" minOccurs="2" maxOccurs="unbounded"> <xs:complexType> - <xs:attribute name="rotationalSpeed" type="v1.0:Double2" use="required"/> - <xs:attribute name="boostingTorque" type="v1.0:Double2" use="required"/> + <xs:attribute name="rotationalSpeed" use="required"> + <xs:simpleType> + <xs:restriction base="v1.0:Double2"> + <xs:minInclusive value="0.00"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="boostingTorque" use="required"> + <xs:simpleType> + <xs:restriction base="v1.0:Double2"> + <xs:minInclusive value="0.00"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> </xs:complexType> </xs:element> </xs:sequence> diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd similarity index 99% rename from VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd rename to VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd index 1b6fe46ffc..df91be2e0d 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd @@ -476,7 +476,7 @@ <xs:element name="Data" type="vif:AbstractManufacturingStageDataType"/> <xs:element name="Signature" type="v1.0:SignatureType"/> </xs:sequence> - <xs:attribute name="stageCount" use="required"> + <xs:attribute name="stepCount" use="required"> <xs:simpleType> <xs:restriction base="xs:int"> <xs:minInclusive value="2"/> diff --git a/VectoCore/VectoXML.spp b/VectoCore/VectoXML.spp index 759b78ba7c..a43fced58c 100644 --- a/VectoCore/VectoXML.spp +++ b/VectoCore/VectoXML.spp @@ -473,7 +473,7 @@ <File FilePath="VectoCore\Resources\XSD\VectoOutputManufacturer.0.7.xsd" HomeFolder="Yes"/> <File FilePath="VectoCore\Resources\XSD\VectoOutputManufacturer.0.8.xsd" HomeFolder="Yes"/> <File FilePath="VectoCore\Resources\XSD\VectoOutputManufacturer.xsd" HomeFolder="Yes"/> - <File FilePath="VectoCore\Resources\XSD\VectoOutputMultistage.0.1.xsd" HomeFolder="Yes"/> + <File FilePath="VectoCore\Resources\XSD\VectoOutputMultistep.0.1.xsd" HomeFolder="Yes"/> <File FilePath="VectoCore\Resources\XSD\VectoOutputPrimaryBus.xsd" HomeFolder="Yes"/> <File FilePath="VectoCore\Resources\XSD\VTPReport.0.1.xsd" HomeFolder="Yes"/> <File FilePath="VectoCore\Resources\XSD\VTPReport.0.2.xsd" HomeFolder="Yes"/> -- GitLab