diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro index e2c6d4ae5..2a0ff498d 100644 --- a/src/app/tape/tape.pro +++ b/src/app/tape/tape.pro @@ -264,6 +264,7 @@ INCLUDEPATH += $${PWD}/../../libs/vpropertyexplorer DEPENDPATH += $${PWD}/../../libs/vpropertyexplorer # The list helps to check that all files are exist. +# Don't forget to convert text to curves. DIAGRAMS += \ $${PWD}/share/resources/diagrams/Ap1.svg \ $${PWD}/share/resources/diagrams/Ap2.svg \ diff --git a/src/app/valentina/mainwindowsnogui.cpp b/src/app/valentina/mainwindowsnogui.cpp index d1b71bf81..424658572 100644 --- a/src/app/valentina/mainwindowsnogui.cpp +++ b/src/app/valentina/mainwindowsnogui.cpp @@ -422,7 +422,7 @@ void MainWindowsNoGUI::PrepareDetailsForLayout(const QHash *de VLayoutDetail det = VLayoutDetail(); const VDetail &d = idetail.value(); det.SetCountourPoints(d.ContourPoints(pattern)); - det.SetSeamAllowencePoints(d.SeamAllowancePoints(pattern), d.getSeamAllowance()); + det.SetSeamAllowencePoints(d.SeamAllowancePoints(pattern), d.getSeamAllowance(), d.getClosed()); det.setName(d.getName()); det.setWidth(qApp->toPixel(d.getWidth())); diff --git a/src/libs/vlayout/vlayoutdetail.cpp b/src/libs/vlayout/vlayoutdetail.cpp index 077ae41bc..21fef345c 100644 --- a/src/libs/vlayout/vlayoutdetail.cpp +++ b/src/libs/vlayout/vlayoutdetail.cpp @@ -87,11 +87,12 @@ QVector VLayoutDetail::GetSeamAllowencePoints() const } //--------------------------------------------------------------------------------------------------------------------- -void VLayoutDetail::SetSeamAllowencePoints(const QVector &points, bool seamAllowence) +void VLayoutDetail::SetSeamAllowencePoints(const QVector &points, bool seamAllowence, bool closed) { if (seamAllowence) { setSeamAllowance(seamAllowence); + setClosed(closed); d->seamAllowence = points; if (not d->seamAllowence.isEmpty()) { @@ -164,7 +165,7 @@ void VLayoutDetail::Mirror(const QLineF &edge) const QLineF axis = QLineF(edge.x2(), edge.y2(), edge.x2() + 100, edge.y2()); // Ox axis const qreal angle = edge.angleTo(axis); - const QPointF p2 = edge.p2(); + const QPointF p2 = edge.p2(); QTransform m; m.translate(p2.x(), p2.y()); m.rotate(-angle); @@ -215,7 +216,7 @@ QLineF VLayoutDetail::Edge(int i) const if (d->mirror) { const int oldI1 = i1; - const int size = d->layoutAllowence.size()-1; //-V807 + const int size = d->layoutAllowence.size()-1; //-V807 i1 = size - i2; i2 = size - oldI1; return QLineF(d->matrix.map(d->layoutAllowence.at(i2)), d->matrix.map(d->layoutAllowence.at(i1))); diff --git a/src/libs/vlayout/vlayoutdetail.h b/src/libs/vlayout/vlayoutdetail.h index 7f4b21262..80e53a93b 100644 --- a/src/libs/vlayout/vlayoutdetail.h +++ b/src/libs/vlayout/vlayoutdetail.h @@ -49,7 +49,7 @@ public: void SetCountourPoints(const QVector &points); QVector GetSeamAllowencePoints() const; - void SetSeamAllowencePoints(const QVector &points, bool seamAllowence = true); + void SetSeamAllowencePoints(const QVector &points, bool seamAllowence = true, bool closed = true); QVector GetLayoutAllowencePoints() const; void SetLayoutAllowencePoints();