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

Fix validation issue. Treat empty attribute as default value.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2020-11-12 16:19:08 +02:00
parent 34fd0b81bf
commit 9e4fa8337d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -825,6 +825,7 @@
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="operationColors"> <xs:simpleType name="operationColors">
<xs:restriction base="xs:string"> <xs:restriction base="xs:string">
<xs:enumeration value=""/><!--Same as default-->
<xs:enumeration value="default"/> <xs:enumeration value="default"/>
<xs:enumeration value="black"/> <xs:enumeration value="black"/>
<xs:enumeration value="green"/> <xs:enumeration value="green"/>
@ -857,6 +858,7 @@
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="operationPenStyle"> <xs:simpleType name="operationPenStyle">
<xs:restriction base="xs:string"> <xs:restriction base="xs:string">
<xs:enumeration value=""/><!--Same as default-->
<xs:enumeration value="default"/> <xs:enumeration value="default"/>
<xs:enumeration value="none"/> <xs:enumeration value="none"/>
<xs:enumeration value="hair"/> <xs:enumeration value="hair"/>

8
src/libs/vtools/tools/toolsdef.h
View File

@ -31,15 +31,17 @@
#include <QString> #include <QString>
#include <QMetaType> #include <QMetaType>
#include "../ifc/ifcdef.h"
class VGObject; class VGObject;
class VContainer; class VContainer;
struct SourceItem struct SourceItem
{ {
quint32 id{0}; quint32 id{NULL_ID};
QString alias{}; QString alias{};
QString penStyle{}; QString penStyle{TypeLineDefault};
QString color{}; QString color{ColorDefault};
}; };
Q_DECLARE_METATYPE(SourceItem) Q_DECLARE_METATYPE(SourceItem)