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

Fix seam allowance bug.

Browse Source 
--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2016-11-17 11:00:04 +02:00
parent cf5afffd60
commit 4237456228
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -446,6 +446,25 @@ QVector<QPointF> VAbstractPiece::EkvPoint(const VSAPoint &p1Line1, const VSAPoin
} }
} }
else else
{
const qreal result1 = PointPosition(CrosPoint, QLineF(p1Line1, p2Line1));
const qreal result2 = PointPosition(CrosPoint, QLineF(p2Line2, p1Line2));
if (result1 <=0 && result2 <= 0)
{
if (line.length() >= localWidth)
{
points.append(CrosPoint);
return points;
}
else
{
line.setLength(localWidth);
points.append(line.p2());
return points;
}
}
else
{ {
const QLineF bigEdge = ParallelLine(bigLine1.p2(), bigLine2.p1(), localWidth ); const QLineF bigEdge = ParallelLine(bigLine1.p2(), bigLine2.p1(), localWidth );
points.append(bigEdge.p1()); points.append(bigEdge.p1());
@ -453,6 +472,7 @@ QVector<QPointF> VAbstractPiece::EkvPoint(const VSAPoint &p1Line1, const VSAPoin
return points; return points;
} }
} }
}
break; break;
} }
case (QLineF::NoIntersection): case (QLineF::NoIntersection):