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

Automatically disable check for uniqness for the second point after uniting.

Browse Source 
ref #835.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2018-04-07 13:36:56 +03:00
parent e0ecb81932
commit 188db90050
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/libs/vtools/tools/vtooluniondetails.cpp
View File

@ -1913,9 +1913,17 @@ QVector<QPair<bool, VPieceNode> > VToolUnionDetails::CalcUnitedPath(const VPiece
qint32 pointsD2 = 0; //Keeps number points the second detail, that we have already added. qint32 pointsD2 = 0; //Keeps number points the second detail, that we have already added.
qint32 i = 0; qint32 i = 0;
const int det1P1Index = d1Path.indexOfNode(pRotate); const int det1P1Index = d1Path.indexOfNode(pRotate);
bool checkUniqueness = false;
do do
{ {
path.append(qMakePair(true, d1Path.at(i))); VPieceNode node = d1Path.at(i);
if (checkUniqueness)
{
// See issue #835. Union Tool - changes in workpiece tool can't be saved because of double points
node.SetCheckUniqueness(false);
checkUniqueness = false;
}
path.append(qMakePair(true, node));
++i; ++i;
if (i > det1P1Index && pointsD2 < countNodeD2-1) if (i > det1P1Index && pointsD2 < countNodeD2-1)
{ {
@ -1931,6 +1939,7 @@ QVector<QPair<bool, VPieceNode> > VToolUnionDetails::CalcUnitedPath(const VPiece
++pointsD2; ++pointsD2;
++j; ++j;
} while (pointsD2 < countNodeD2-1); } while (pointsD2 < countNodeD2-1);
checkUniqueness = true;
} }
} while (i < countNodeD1); } while (i < countNodeD1);