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

Fix adding a piece to global contour.

Browse Source 
In case of combine we must skip one edge. In case of rotation we must add right
number of edges.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2019-07-21 10:40:41 +03:00
parent a01490b4f4
commit 9f6bb49a22
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/libs/vlayout/vcontour.cpp
View File

@ -179,24 +179,26 @@ QVector<QPointF> VContour::UniteWithContour(const VLayoutPiece &detail, int glob
return QVector<QPointF>();
}
const int i2 = globalI == d->globalContour.count() ? 0 : globalI;
int i=0;
while (i < d->globalContour.count())
{
if (i == i2)
{
AppendToContour(newContour, d->globalContour.at(i));
if (type == BestFrom::Rotation)
{
if (i == globalI)
{
AppendWhole(newContour, detail, detJ);
}
}
else
{
if (i == globalI-1)
{
InsertDetail(newContour, detail, detJ);
}
}
AppendToContour(newContour, d->globalContour.at(i));
++i;
}
}
@ -303,21 +305,22 @@ void VContour::AppendWhole(QVector<QPointF> &contour, const VLayoutPiece &detail
{
int processedEdges = 0;
const int nD = detail.LayoutEdgesCount();
int j = detJ+1;
int j = detJ;
do
{
if (j > nD)
if (j >= nD)
{
j=1;
j=0;
}
const QVector<QPointF> points = CutEdge(detail.LayoutEdge(j));
for (int i = 0; i < points.size()-1; ++i)
for(auto &point : CutEdge(detail.LayoutEdge(j+1)))
{
contour.append(points.at(i));
AppendToContour(contour, point);
}
++processedEdges;
++j;
}while (processedEdges < nD);
}
while (processedEdges < nD);
}
//---------------------------------------------------------------------------------------------------------------------
@ -325,16 +328,17 @@ void VContour::InsertDetail(QVector<QPointF> &contour, const VLayoutPiece &detai
{
int processedEdges = 0;
const int nD = detail.LayoutEdgesCount();
int j = detJ+1;
int j = detJ;
do
{
if (j > nD)
if (j >= nD)
{
j=1;
j=0;
}
if (j != detJ)
if (j != detJ-1)
{
for(auto &point : CutEdge(detail.LayoutEdge(j)))
for(auto &point : CutEdge(detail.LayoutEdge(j+1)))
{
AppendToContour(contour, point);
}
@ -342,7 +346,7 @@ void VContour::InsertDetail(QVector<QPointF> &contour, const VLayoutPiece &detai
++processedEdges;
++j;
}
while (processedEdges <= nD);
while (processedEdges < nD);
}
//---------------------------------------------------------------------------------------------------------------------