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

Fix reading a layout.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2022-11-21 16:48:29 +02:00
parent 034fc5822b
commit 2d6fa0fe9b
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/puzzle/xml/vplayoutfilereader.cpp
View File

@ -91,6 +91,11 @@ auto StringToPoint(const QString &point) -> QPointF
auto StringToPath(const QString &path) -> QVector<QPointF> auto StringToPath(const QString &path) -> QVector<QPointF>
{ {
QVector<QPointF> p; QVector<QPointF> p;
if (path.isEmpty())
{
return p;
}
QStringList points = path.split(ML::pointsSep); QStringList points = path.split(ML::pointsSep);
p.reserve(points.size()); p.reserve(points.size());
for (const auto& point : points) for (const auto& point : points)
@ -528,6 +533,8 @@ VLayoutPoint VPLayoutFileReader::ReadLayoutPoint()
point.SetTurnPoint(ReadAttributeBool(attribs, ML::AttrTurnPoint, falseStr)); point.SetTurnPoint(ReadAttributeBool(attribs, ML::AttrTurnPoint, falseStr));
point.SetCurvePoint(ReadAttributeBool(attribs, ML::AttrCurvePoint, falseStr)); point.SetCurvePoint(ReadAttributeBool(attribs, ML::AttrCurvePoint, falseStr));
readElementText();
return point; return point;
} }
@ -570,9 +577,10 @@ void VPLayoutFileReader::ReadSeamAllowance(const VPPiecePtr &piece)
bool builtIn = ReadAttributeBool(attribs, ML::AttrBuiltIn, falseStr); bool builtIn = ReadAttributeBool(attribs, ML::AttrBuiltIn, falseStr);
QVector<VLayoutPoint> path = ReadLayoutPoints();
if (enabled && not builtIn) if (enabled && not builtIn)
{ {
QVector<VLayoutPoint> path = ReadLayoutPoints();
if (path.isEmpty()) if (path.isEmpty())
{ {
throw VException(tr("Error in line %1. Seam allowance is empty.").arg(lineNumber())); throw VException(tr("Error in line %1. Seam allowance is empty.").arg(lineNumber()));
@ -743,6 +751,8 @@ auto VPLayoutFileReader::ReadMarker() -> VLayoutPlaceLabel
// cppcheck-suppress unknownMacro // cppcheck-suppress unknownMacro
QT_WARNING_POP QT_WARNING_POP
readElementText();
return marker; return marker;
} }