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

Merge with develop.

Browse Source 
--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2017-02-01 12:26:08 +02:00
commit 415e5a25a5
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/ifc/schema/pattern/v0.4.0.xsd
View File

@ -420,14 +420,14 @@
<xs:element name="csa" minOccurs="0" maxOccurs="1"> <xs:element name="csa" minOccurs="0" maxOccurs="1">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="child" type="xs:unsignedInt" minOccurs="1" maxOccurs="unbounded"/> <xs:element name="child" type="xs:unsignedInt" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="iPaths" minOccurs="0" maxOccurs="1"> <xs:element name="iPaths" minOccurs="0" maxOccurs="1">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="child" type="xs:unsignedInt" minOccurs="1" maxOccurs="unbounded"/> <xs:element name="child" type="xs:unsignedInt" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>

3
src/libs/vtools/tools/vtooluniondetails.cpp
View File

@ -621,6 +621,8 @@ QDomElement GetTagChildren(VAbstractPattern *doc, quint32 id)
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void SaveChildren(VAbstractPattern *doc, quint32 id, QDomElement section, const QVector<quint32> &children) void SaveChildren(VAbstractPattern *doc, quint32 id, QDomElement section, const QVector<quint32> &children)
{ {
if (children.size() > 0)
{
for (int i=0; i<children.size(); ++i) for (int i=0; i<children.size(); ++i)
{ {
QDomElement tagChild = doc->createElement(VToolUnionDetails::TagChild); QDomElement tagChild = doc->createElement(VToolUnionDetails::TagChild);
@ -629,6 +631,7 @@ void SaveChildren(VAbstractPattern *doc, quint32 id, QDomElement section, const
} }
GetTagChildren(doc, id).appendChild(section); GetTagChildren(doc, id).appendChild(section);
}
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------