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

Improve checking allowance validity.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2019-02-27 20:33:59 +02:00
parent 782b257c04
commit a479f3cb40
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1427,6 +1427,9 @@ bool VAbstractPiece::IsAllowanceValid(const QVector<QPointF> &base, const QVecto
return false; // Not enough data return false; // Not enough data
} }
// DumpVector(base); // Uncomment for dumping test data
// DumpVector(allowance); // Uncomment for dumping test data
const qreal baseDirection = VPiece::SumTrapezoids(base); const qreal baseDirection = VPiece::SumTrapezoids(base);
const qreal allowanceDirection = VPiece::SumTrapezoids(allowance); const qreal allowanceDirection = VPiece::SumTrapezoids(allowance);
@ -1453,8 +1456,11 @@ bool VAbstractPiece::IsAllowanceValid(const QVector<QPointF> &base, const QVecto
QPointF crosPoint; QPointF crosPoint;
const auto type = baseSegment.intersect(allowanceSegment, &crosPoint); const auto type = baseSegment.intersect(allowanceSegment, &crosPoint);
if (type == QLineF::BoundedIntersection && not VFuzzyComparePoints(baseSegment.p1(), crosPoint) if (type == QLineF::BoundedIntersection
&& not VFuzzyComparePoints(baseSegment.p2(), crosPoint)) && not VFuzzyComparePoints(baseSegment.p1(), crosPoint)
&& not VFuzzyComparePoints(baseSegment.p2(), crosPoint)
&& not VGObject::IsPointOnLineviaPDP(allowanceSegment.p1(), baseSegment.p1(), baseSegment.p2())
&& not VGObject::IsPointOnLineviaPDP(allowanceSegment.p2(), baseSegment.p1(), baseSegment.p2()))
{ {
return false; return false;