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

Fixed issue #405. Crash after deleting first pattern piece in the list.

Browse Source 
--HG--
branch : release
This commit is contained in:
Roman Telezhynskyi 2016-02-19 15:56:38 +02:00
parent 9313eefd9e
commit 037ad21553
2 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog.txt
View File

@ -1,3 +1,6 @@
# Version 0.4.3
- [#405] Fixed crash after deleting first pattern piece in the list.
# Version 0.4.2 February 17, 2016
- Measurement Diagram is not shown on Mac OS X.
- In dialog 'tool Spline Path' fixed broken selecting new point into the list of points.

34
src/libs/vtools/undocommands/deletepatternpiece.cpp
View File

@ -36,10 +36,13 @@ DeletePatternPiece::DeletePatternPiece(VAbstractPattern *doc, const QString &nam
{
setText(tr("delete pattern piece %1").arg(namePP));
QDomElement patternP = doc->GetPPElement(namePP);
const QDomElement patternP = doc->GetPPElement(namePP);
patternPiece = patternP.cloneNode().toElement();
QDomNode previousPP = patternP.previousSibling();//find previous pattern piece
previousPPName = doc->GetParametrString(previousPP.toElement(), VAbstractPattern::AttrName, "");
const QDomElement previousPP = patternP.previousSibling().toElement();//find previous pattern piece
if (not previousPP.isNull() && previousPP.tagName() == VAbstractPattern::TagDraw)
{
previousPPName = doc->GetParametrString(previousPP, VAbstractPattern::AttrName, "");
}
}
//---------------------------------------------------------------------------------------------------------------------
@ -52,11 +55,28 @@ void DeletePatternPiece::undo()
qCDebug(vUndo, "Undo.");
QDomElement rootElement = doc->documentElement();
QDomNode previousPP = doc->GetPPElement(previousPPName);
rootElement.insertAfter(patternPiece, previousPP);
if (not previousPPName.isEmpty())
{ // not first in the list, add after tag draw
const QDomNode previousPP = doc->GetPPElement(previousPPName);
rootElement.insertAfter(patternPiece, previousPP);
}
else
{ // first in the list, add after tag increments
const QDomNodeList list = rootElement.elementsByTagName(VAbstractPattern::TagIncrements);
QDomElement increment;
if (not list.isEmpty())
{
increment = list.at(0).toElement();
}
Q_ASSERT_X(not increment.isNull(), Q_FUNC_INFO, "Couldn't' find tag Increments");
rootElement.insertAfter(patternPiece, increment);
}
emit NeedFullParsing();
doc->ChangedActivPP(namePP);
doc->ChangeActivPP(namePP);
}
//---------------------------------------------------------------------------------------------------------------------
@ -65,7 +85,7 @@ void DeletePatternPiece::redo()
qCDebug(vUndo, "Redo.");
QDomElement rootElement = doc->documentElement();
QDomElement patternPiece = doc->GetPPElement(namePP);
const QDomElement patternPiece = doc->GetPPElement(namePP);
rootElement.removeChild(patternPiece);
emit NeedFullParsing();
}