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

Fixed broken checking intersection workpieces.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2015-05-04 10:57:38 +03:00
parent 6ce904d652
commit 7e6809557b
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/vlayout/vlayoutpaper.cpp
View File

@ -190,8 +190,6 @@ bool VLayoutPaper::AddToSheet(const VLayoutDetail &detail, bool &stop)
{ {
for (int i=1; i<= detail.EdgesCount(); i++) for (int i=1; i<= detail.EdgesCount(); i++)
{ {
//QCoreApplication::processEvents();
VPosition *thread = new VPosition(d->globalContour, j, detail, i, &stop, d->rotate, d->rotationIncrease); VPosition *thread = new VPosition(d->globalContour, j, detail, i, &stop, d->rotate, d->rotationIncrease);
//Info for debug //Info for debug
#ifdef LAYOUT_DEBUG #ifdef LAYOUT_DEBUG

21
src/libs/vlayout/vposition.cpp
View File

@ -375,6 +375,9 @@ VPosition::CrossingType VPosition::Crossing(const VLayoutDetail &detail, const i
return CrossingType::EdgeError; return CrossingType::EdgeError;
} }
const QLineF gEdge = gContour.GlobalEdge(globalI);
const QLineF dEdge = detail.Edge(detailI);
for (int i = 1; i <= globalEdgesCount; i++) for (int i = 1; i <= globalEdgesCount; i++)
{ {
const QLineF globalEdge = gContour.GlobalEdge(i); const QLineF globalEdge = gContour.GlobalEdge(i);
@ -397,11 +400,9 @@ VPosition::CrossingType VPosition::Crossing(const VLayoutDetail &detail, const i
} }
QPointF xPoint; QPointF xPoint;
QLineF::IntersectType type = globalEdge.intersect(detailEdge, &xPoint); if (globalEdge.intersect(detailEdge, &xPoint) == QLineF::BoundedIntersection)
if (type == QLineF::BoundedIntersection)
{ {
if (TrueIntersection(gContour.GlobalEdge(globalI), detail.Edge(detailI), xPoint)) if (TrueIntersection(gEdge, dEdge, xPoint))
{ {
return CrossingType::Intersection; return CrossingType::Intersection;
} }
@ -653,12 +654,24 @@ void VPosition::Rotate(int increase)
bool VPosition::TrueIntersection(const QLineF &gEdge, const QLineF &dEdge, const QPointF &p) const bool VPosition::TrueIntersection(const QLineF &gEdge, const QLineF &dEdge, const QPointF &p) const
{ {
const QPointF pX = RoundedPoint(p); const QPointF pX = RoundedPoint(p);
QPointF xPoint;
if (gEdge.intersect(dEdge, &xPoint) == QLineF::NoIntersection)
{
const QPointF gP1 = RoundedPoint(gEdge.p1()); const QPointF gP1 = RoundedPoint(gEdge.p1());
const QPointF gP2 = RoundedPoint(gEdge.p2()); const QPointF gP2 = RoundedPoint(gEdge.p2());
const QPointF dP1 = RoundedPoint(dEdge.p1()); const QPointF dP1 = RoundedPoint(dEdge.p1());
const QPointF dP2 = RoundedPoint(dEdge.p2()); const QPointF dP2 = RoundedPoint(dEdge.p2());
// If two edges are same line ignorring all intersection point that are equal to the start or the end point
return !(pX == gP1 || pX == gP2 || pX == dP1 || pX == dP2); return !(pX == gP1 || pX == gP2 || pX == dP1 || pX == dP2);
} }
else
{
// Rotation case. Ignore intersection only in the point of edges intersection.
return pX != RoundedPoint(xPoint);
}
}
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
QPointF VPosition::RoundedPoint(const QPointF &p) const QPointF VPosition::RoundedPoint(const QPointF &p) const