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

Fixed issue #737. Valentina produces corrupted file if unite two pieces with

Browse Source 
pins.
(grafted from 0c048c920b8b495e756d87df63133187151e21e9)

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2017-07-26 13:56:19 +03:00
parent 4636215929
commit f648860c69
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.txt
View File

@ -39,6 +39,7 @@
- Fixed Valentina crash. Used way to avoid Qt's bug QTBUG-61213. - Fixed Valentina crash. Used way to avoid Qt's bug QTBUG-61213.
- Fixed behaviour on Windows. Valentina asks about synchronization measurements twice. - Fixed behaviour on Windows. Valentina asks about synchronization measurements twice.
- Fixed bug. Tape app saved default size value in wrong place. - Fixed bug. Tape app saved default size value in wrong place.
- [#737] Valentina produces corrupted file if unite two pieces with pins.
# Version 0.5.0 May 9, 2017 # Version 0.5.0 May 9, 2017
- [#581] User can now filter input lists by keyword in function wizard. - [#581] User can now filter input lists by keyword in function wizard.

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

@ -1575,7 +1575,8 @@ QVector<quint32> VToolUnionDetails::GetReferenceObjects() const
const QStringList parts = QStringList() << VAbstractPattern::TagNodes /*0*/ const QStringList parts = QStringList() << VAbstractPattern::TagNodes /*0*/
<< VToolSeamAllowance::TagCSA /*1*/ << VToolSeamAllowance::TagCSA /*1*/
<< VToolSeamAllowance::TagIPaths; /*2*/ << VToolSeamAllowance::TagIPaths /*2*/
<< VToolSeamAllowance::TagPins; /*3*/
const QDomNodeList nodesList = tool.childNodes(); const QDomNodeList nodesList = tool.childNodes();
for (qint32 i = 0; i < nodesList.size(); ++i) for (qint32 i = 0; i < nodesList.size(); ++i)
@ -1599,6 +1600,19 @@ QVector<quint32> VToolUnionDetails::GetReferenceObjects() const
list += ReferenceObjects(element, VToolSeamAllowance::TagRecord, list += ReferenceObjects(element, VToolSeamAllowance::TagRecord,
VAbstractPattern::AttrPath); VAbstractPattern::AttrPath);
break; break;
case 3://VToolSeamAllowance::TagPins
{
const QDomNodeList children = element.childNodes();
for (qint32 i = 0; i < children.size(); ++i)
{
const QDomElement record = children.at(i).toElement();
if (not record.isNull() && record.tagName() == VToolSeamAllowance::TagRecord)
{
list.append(record.text().toUInt());
}
}
break;
}
default: default:
break; break;
} }