From 76f93ca63eebf0ca22a8354627fd826181304519 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 15 Jan 2018 16:20:29 +0200 Subject: [PATCH] Fixed issue #797. Custom seam allowance ignored in some cases. (grafted from 3d77c1493f427eefbad7d98a828cd64061b72759) --HG-- branch : develop --- ChangeLog.txt | 1 + src/libs/vpatterndb/vpiece.cpp | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index d476f143c..92bcc71bd 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -81,6 +81,7 @@ - [#776] Valentina cannot recognize translated functions. - [#778] Calling Valentina with "-h" option opens information dialog instead of writing to console. - [#788] Unhardcode icon path in GNU/Linux launcher. +- [#797] Custom seam allowance ignored in some cases. # Version 0.5.0 May 9, 2017 - [#581] User can now filter input lists by keyword in function wizard. diff --git a/src/libs/vpatterndb/vpiece.cpp b/src/libs/vpatterndb/vpiece.cpp index c3e982297..7946ec9d6 100644 --- a/src/libs/vpatterndb/vpiece.cpp +++ b/src/libs/vpatterndb/vpiece.cpp @@ -837,7 +837,7 @@ QVector VPiece::GetUnitedPath(const VContainer *data) const } const QVector midBefore = united.mid(0, indexStartPoint+1); - const QVector midAfter = united.mid(indexEndPoint); + const QVector midAfter = united.mid(indexEndPoint, united.size() - midBefore.size()); QVector customNodes = data->GetPiecePath(records.at(i).path).GetNodes(); if (records.at(i).reverse) @@ -887,8 +887,7 @@ QVector VPiece::GetValidRecords() const && indexStartPoint != -1 && not d->m_path.at(indexStartPoint).IsExcluded() && indexEndPoint != -1 - && not d->m_path.at(indexEndPoint).IsExcluded() - && indexStartPoint < indexEndPoint) + && not d->m_path.at(indexEndPoint).IsExcluded()) { records.append(record); }