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

Improve checking allowance validity.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2020-06-03 13:18:43 +03:00
parent ca3c5c8532
commit db007ac301
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libs/vlayout/vabstractpiece.cpp
View File

@ -1527,6 +1527,7 @@ bool VAbstractPiece::IsAllowanceValid(const QVector<QPointF> &base, const QVecto
// DumpVector(base); // Uncomment for dumping test data // DumpVector(base); // Uncomment for dumping test data
// DumpVector(allowance); // Uncomment for dumping test data // DumpVector(allowance); // Uncomment for dumping test data
// First check direction
const qreal baseDirection = VPiece::SumTrapezoids(base); const qreal baseDirection = VPiece::SumTrapezoids(base);
const qreal allowanceDirection = VPiece::SumTrapezoids(allowance); const qreal allowanceDirection = VPiece::SumTrapezoids(allowance);
@ -1535,6 +1536,7 @@ bool VAbstractPiece::IsAllowanceValid(const QVector<QPointF> &base, const QVecto
return false; // Wrong direction return false; // Wrong direction
} }
// Edges must not intersect
for (auto i = 0; i < base.count(); ++i) for (auto i = 0; i < base.count(); ++i)
{ {
int nextI = -1; int nextI = -1;
@ -1585,6 +1587,17 @@ bool VAbstractPiece::IsAllowanceValid(const QVector<QPointF> &base, const QVecto
} }
} }
// Just instersection edges is not enough. The base must be inside of the allowance.
QPolygonF allowancePolygon(allowance);
for (auto &point : base)
{
if (not allowancePolygon.containsPoint(point, Qt::WindingFill))
{
return false;
}
}
return true; return true;
} }