Fixed issue #797. Custom seam allowance ignored in some cases.
(grafted from 3d77c1493f427eefbad7d98a828cd64061b72759) --HG-- branch : develop
This commit is contained in:
parent
3f8b441579
commit
76f93ca63e
|
@ -81,6 +81,7 @@
|
||||||
- [#776] Valentina cannot recognize translated functions.
|
- [#776] Valentina cannot recognize translated functions.
|
||||||
- [#778] Calling Valentina with "-h" option opens information dialog instead of writing to console.
|
- [#778] Calling Valentina with "-h" option opens information dialog instead of writing to console.
|
||||||
- [#788] Unhardcode icon path in GNU/Linux launcher.
|
- [#788] Unhardcode icon path in GNU/Linux launcher.
|
||||||
|
- [#797] Custom seam allowance ignored in some cases.
|
||||||
|
|
||||||
# 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.
|
||||||
|
|
|
@ -837,7 +837,7 @@ QVector<VPieceNode> VPiece::GetUnitedPath(const VContainer *data) const
|
||||||
}
|
}
|
||||||
|
|
||||||
const QVector<VPieceNode> midBefore = united.mid(0, indexStartPoint+1);
|
const QVector<VPieceNode> midBefore = united.mid(0, indexStartPoint+1);
|
||||||
const QVector<VPieceNode> midAfter = united.mid(indexEndPoint);
|
const QVector<VPieceNode> midAfter = united.mid(indexEndPoint, united.size() - midBefore.size());
|
||||||
|
|
||||||
QVector<VPieceNode> customNodes = data->GetPiecePath(records.at(i).path).GetNodes();
|
QVector<VPieceNode> customNodes = data->GetPiecePath(records.at(i).path).GetNodes();
|
||||||
if (records.at(i).reverse)
|
if (records.at(i).reverse)
|
||||||
|
@ -887,8 +887,7 @@ QVector<CustomSARecord> VPiece::GetValidRecords() const
|
||||||
&& indexStartPoint != -1
|
&& indexStartPoint != -1
|
||||||
&& not d->m_path.at(indexStartPoint).IsExcluded()
|
&& not d->m_path.at(indexStartPoint).IsExcluded()
|
||||||
&& indexEndPoint != -1
|
&& indexEndPoint != -1
|
||||||
&& not d->m_path.at(indexEndPoint).IsExcluded()
|
&& not d->m_path.at(indexEndPoint).IsExcluded())
|
||||||
&& indexStartPoint < indexEndPoint)
|
|
||||||
{
|
{
|
||||||
records.append(record);
|
records.append(record);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user