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

Fixed issue #515. Seam allowance wrong way.

Browse Source 
--HG--
branch : release
This commit is contained in:
Roman Telezhynskyi 2016-06-17 15:44:45 +03:00
parent 41df3faeff
commit 470ffcf767
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog.txt
View File

@ -6,7 +6,8 @@
- [#492] Valentina crashes when add an increment. - [#492] Valentina crashes when add an increment.
- [#493] Error in seam allowance drawing. - [#493] Error in seam allowance drawing.
- [#468] Error - Tape 'Save As' should set 'Read Only' to false. - [#468] Error - Tape 'Save As' should set 'Read Only' to false.
- [#501] Rename Window->Close Window to Window->Close pattern - [#501] Rename Window->Close Window to Window->Close pattern.
- [#515] Seam allowance wrong way.
# Version 0.4.4 April 12, 2016 # Version 0.4.4 April 12, 2016
- Updated measurement templates with all measurements. Added new template Aldrich/Women measurements. - Updated measurement templates with all measurements. Added new template Aldrich/Women measurements.

16
src/libs/vlayout/vabstractdetail.cpp
View File

@ -310,12 +310,6 @@ QVector<QPointF> VAbstractDetail::CheckLoops(const QVector<QPointF> &points)
return points; return points;
} }
bool closed = false;
if (points.first() == points.last())
{
closed = true;
}
QVector<QPointF> ekvPoints; QVector<QPointF> ekvPoints;
qint32 i, j; qint32 i, j;
@ -323,7 +317,7 @@ QVector<QPointF> VAbstractDetail::CheckLoops(const QVector<QPointF> &points)
{ {
/*Last three points no need check.*/ /*Last three points no need check.*/
/*Triangle has not contain loops*/ /*Triangle has not contain loops*/
if (i >= count-3) if (i > count-3)
{ {
ekvPoints.append(points.at(i)); ekvPoints.append(points.at(i));
continue; continue;
@ -336,9 +330,11 @@ QVector<QPointF> VAbstractDetail::CheckLoops(const QVector<QPointF> &points)
const QLineF line1(points.at(i), points.at(i+1)); const QLineF line1(points.at(i), points.at(i+1));
// Because a path can contains several loops we will seek the last and only then remove the loop(s) // Because a path can contains several loops we will seek the last and only then remove the loop(s)
// That's why we parse from the end // That's why we parse from the end
for (j = count-2; j >= i+2; --j) for (j = count-1; j >= i+2; --j)
{ {
const QLineF line2(points.at(j), points.at(j+1)); QLineF line2;
j == count-1 ? line2 = QLineF(points.at(j), points.at(0)) : line2 = QLineF(points.at(j), points.at(j+1));
const QLineF::IntersectType intersect = line1.intersect(line2, &crosPoint); const QLineF::IntersectType intersect = line1.intersect(line2, &crosPoint);
if (intersect == QLineF::NoIntersection) if (intersect == QLineF::NoIntersection)
{ // According to the documentation QLineF::NoIntersection indicates that the lines do not intersect; { // According to the documentation QLineF::NoIntersection indicates that the lines do not intersect;
@ -372,7 +368,7 @@ QVector<QPointF> VAbstractDetail::CheckLoops(const QVector<QPointF> &points)
} }
} }
} }
else if (intersect == QLineF::BoundedIntersection && not (i == 0 && j+1 == count-1 && closed)) else if (intersect == QLineF::BoundedIntersection && not (i == 0 && j == count-1))
{ // Break, but not if intersects the first edge and the last edge in closed path { // Break, but not if intersects the first edge and the last edge in closed path
if (line1.p1() != crosPoint && line1.p2() != crosPoint && if (line1.p1() != crosPoint && line1.p2() != crosPoint &&
line2.p1() != crosPoint && line2.p2() != crosPoint) line2.p1() != crosPoint && line2.p2() != crosPoint)