aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed issue #866. Valentina produces an invalid pattern file if a user defines

Browse Source 
more than 9 materials.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2018-07-19 16:47:20 +03:00
parent 2c7b21b98d
commit 20b3f034d4
13 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/ifc/schema/pattern/v0.6.4.xsd
View File

@ -112,7 +112,7 @@
<xs:element name="patternMaterials" minOccurs="0" maxOccurs="1"> <xs:element name="patternMaterials" minOccurs="0" maxOccurs="1">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="material" minOccurs="0" maxOccurs="9"> <xs:element name="material" minOccurs="0" maxOccurs="20">
<xs:complexType> <xs:complexType>
<xs:attribute name="number" type="userMaterialType" use="required"/> <xs:attribute name="number" type="userMaterialType" use="required"/>
<xs:attribute name="name" type="xs:string"/> <xs:attribute name="name" type="xs:string"/>

2
src/libs/ifc/schema/pattern/v0.6.5.xsd
View File

@ -112,7 +112,7 @@
<xs:element name="patternMaterials" minOccurs="0" maxOccurs="1"> <xs:element name="patternMaterials" minOccurs="0" maxOccurs="1">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="material" minOccurs="0" maxOccurs="9"> <xs:element name="material" minOccurs="0" maxOccurs="20">
<xs:complexType> <xs:complexType>
<xs:attribute name="number" type="userMaterialType" use="required"/> <xs:attribute name="number" type="userMaterialType" use="required"/>
<xs:attribute name="name" type="xs:string"/> <xs:attribute name="name" type="xs:string"/>

2
src/libs/ifc/schema/pattern/v0.6.6.xsd
View File

@ -112,7 +112,7 @@
<xs:element name="patternMaterials" minOccurs="0" maxOccurs="1"> <xs:element name="patternMaterials" minOccurs="0" maxOccurs="1">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="material" minOccurs="0" maxOccurs="9"> <xs:element name="material" minOccurs="0" maxOccurs="20">
<xs:complexType> <xs:complexType>
<xs:attribute name="number" type="userMaterialType" use="required"/> <xs:attribute name="number" type="userMaterialType" use="required"/>
<xs:attribute name="name" type="xs:string"/> <xs:attribute name="name" type="xs:string"/>

2
src/libs/ifc/schema/pattern/v0.7.0.xsd
View File

@ -112,7 +112,7 @@
<xs:element name="patternMaterials" minOccurs="0" maxOccurs="1"> <xs:element name="patternMaterials" minOccurs="0" maxOccurs="1">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="material" minOccurs="0" maxOccurs="9"> <xs:element name="material" minOccurs="0" maxOccurs="20">
<xs:complexType> <xs:complexType>
<xs:attribute name="number" type="userMaterialType" use="required"/> <xs:attribute name="number" type="userMaterialType" use="required"/>
<xs:attribute name="name" type="xs:string"/> <xs:attribute name="name" type="xs:string"/>

2
src/libs/ifc/schema/pattern/v0.7.1.xsd
View File

@ -112,7 +112,7 @@
<xs:element name="patternMaterials" minOccurs="0" maxOccurs="1"> <xs:element name="patternMaterials" minOccurs="0" maxOccurs="1">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="material" minOccurs="0" maxOccurs="9"> <xs:element name="material" minOccurs="0" maxOccurs="20">
<xs:complexType> <xs:complexType>
<xs:attribute name="number" type="userMaterialType" use="required"/> <xs:attribute name="number" type="userMaterialType" use="required"/>
<xs:attribute name="name" type="xs:string"/> <xs:attribute name="name" type="xs:string"/>

2
src/libs/ifc/schema/pattern/v0.7.2.xsd
View File

@ -112,7 +112,7 @@
<xs:element name="patternMaterials" minOccurs="0" maxOccurs="1"> <xs:element name="patternMaterials" minOccurs="0" maxOccurs="1">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="material" minOccurs="0" maxOccurs="9"> <xs:element name="material" minOccurs="0" maxOccurs="20">
<xs:complexType> <xs:complexType>
<xs:attribute name="number" type="userMaterialType" use="required"/> <xs:attribute name="number" type="userMaterialType" use="required"/>
<xs:attribute name="name" type="xs:string"/> <xs:attribute name="name" type="xs:string"/>

2
src/libs/ifc/schema/pattern/v0.7.3.xsd
View File

@ -112,7 +112,7 @@
<xs:element name="patternMaterials" minOccurs="0" maxOccurs="1"> <xs:element name="patternMaterials" minOccurs="0" maxOccurs="1">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="material" minOccurs="0" maxOccurs="9"> <xs:element name="material" minOccurs="0" maxOccurs="20">
<xs:complexType> <xs:complexType>
<xs:attribute name="number" type="userMaterialType" use="required"/> <xs:attribute name="number" type="userMaterialType" use="required"/>
<xs:attribute name="name" type="xs:string"/> <xs:attribute name="name" type="xs:string"/>

2
src/libs/ifc/schema/pattern/v0.7.4.xsd
View File

@ -112,7 +112,7 @@
<xs:element name="patternMaterials" minOccurs="0" maxOccurs="1"> <xs:element name="patternMaterials" minOccurs="0" maxOccurs="1">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="material" minOccurs="0" maxOccurs="9"> <xs:element name="material" minOccurs="0" maxOccurs="20">
<xs:complexType> <xs:complexType>
<xs:attribute name="number" type="userMaterialType" use="required"/> <xs:attribute name="number" type="userMaterialType" use="required"/>
<xs:attribute name="name" type="xs:string"/> <xs:attribute name="name" type="xs:string"/>

2
src/libs/ifc/schema/pattern/v0.7.5.xsd
View File

@ -112,7 +112,7 @@
<xs:element name="patternMaterials" minOccurs="0" maxOccurs="1"> <xs:element name="patternMaterials" minOccurs="0" maxOccurs="1">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="material" minOccurs="0" maxOccurs="9"> <xs:element name="material" minOccurs="0" maxOccurs="20">
<xs:complexType> <xs:complexType>
<xs:attribute name="number" type="userMaterialType" use="required"/> <xs:attribute name="number" type="userMaterialType" use="required"/>
<xs:attribute name="name" type="xs:string"/> <xs:attribute name="name" type="xs:string"/>

2
src/libs/ifc/schema/pattern/v0.7.6.xsd
View File

@ -112,7 +112,7 @@
<xs:element name="patternMaterials" minOccurs="0" maxOccurs="1"> <xs:element name="patternMaterials" minOccurs="0" maxOccurs="1">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="material" minOccurs="0" maxOccurs="9"> <xs:element name="material" minOccurs="0" maxOccurs="20">
<xs:complexType> <xs:complexType>
<xs:attribute name="number" type="userMaterialType" use="required"/> <xs:attribute name="number" type="userMaterialType" use="required"/>
<xs:attribute name="name" type="xs:string"/> <xs:attribute name="name" type="xs:string"/>

2
src/libs/ifc/schema/pattern/v0.7.7.xsd
View File

@ -112,7 +112,7 @@
<xs:element name="patternMaterials" minOccurs="0" maxOccurs="1"> <xs:element name="patternMaterials" minOccurs="0" maxOccurs="1">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="material" minOccurs="0" maxOccurs="9"> <xs:element name="material" minOccurs="0" maxOccurs="20">
<xs:complexType> <xs:complexType>
<xs:attribute name="number" type="userMaterialType" use="required"/> <xs:attribute name="number" type="userMaterialType" use="required"/>
<xs:attribute name="name" type="xs:string"/> <xs:attribute name="name" type="xs:string"/>

2
src/libs/ifc/schema/pattern/v0.7.8.xsd
View File

@ -112,7 +112,7 @@
<xs:element name="patternMaterials" minOccurs="0" maxOccurs="1"> <xs:element name="patternMaterials" minOccurs="0" maxOccurs="1">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="material" minOccurs="0" maxOccurs="9"> <xs:element name="material" minOccurs="0" maxOccurs="20">
<xs:complexType> <xs:complexType>
<xs:attribute name="number" type="userMaterialType" use="required"/> <xs:attribute name="number" type="userMaterialType" use="required"/>
<xs:attribute name="name" type="xs:string"/> <xs:attribute name="name" type="xs:string"/>

1
src/libs/vmisc/def.h
View File

@ -390,6 +390,7 @@ extern const QString pl_mInterlining;
extern const QString pl_wCut; extern const QString pl_wCut;
extern const QString pl_wOnFold; extern const QString pl_wOnFold;
// Don't forget to syncronize with XSD schema.
const int userMaterialPlaceholdersQuantity = 20; const int userMaterialPlaceholdersQuantity = 20;
extern const QStringList labelTemplatePlaceholders; extern const QStringList labelTemplatePlaceholders;