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

Fixed regression with tool "Union details".

Browse Source 
One file in collection contain unpredicted case. For fixing returned old code.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2016-08-20 17:34:49 +03:00
parent afeeca30f6
commit 948ae32dc5
1 changed files with 47 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -676,45 +676,61 @@ VToolUnionDetails* VToolUnionDetails::Create(const quint32 _id, const VDetail &d
QVector<quint32> children = AllChildren(doc, id); QVector<quint32> children = AllChildren(doc, id);
if (not children.isEmpty()) if (not children.isEmpty())
{ {
qint32 i = 0; // This check need for backward compatibility
do // Remove check and "else" part if min version is 0.3.2
Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < CONVERTER_VERSION_CHECK(0, 3, 2),
"Time to refactor the code.");
if (children.size() == countNodeD1 + countNodeD2-1)
{ {
// This check need for backward compatibility qint32 i = 0;
// Remove it if min version is 0.3.2 do
// Instead:
// UpdatePoints(data, d1.RemoveEdge(indexD1), i, children);
Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < CONVERTER_VERSION_CHECK(0, 3, 2),
"Time to refactor the code.");
if (children.size() != countNodeD2)
{ {
UpdatePoints(data, d1.RemoveEdge(indexD1), i, children); UpdatePoints(data, d1.RemoveEdge(indexD1), i, children);
} ++i;
++i; if (i > d1.indexOfNode(det1p1.getId()) && pointsD2 < countNodeD2-1)
if (i > d1.indexOfNode(det1p1.getId()) && pointsD2 < countNodeD2-1)
{
VDetail d2REdge = d2.RemoveEdge(indexD2);
qint32 j = 0;
FindIndexJ(pointsD2, d2, indexD2, j);
do
{ {
if (j >= countNodeD2) VDetail d2REdge = d2.RemoveEdge(indexD2);
qint32 j = 0;
FindIndexJ(pointsD2, d2, indexD2, j);
do
{ {
j=0; if (j >= countNodeD2)
} {
UpdatePoints(data, d2REdge, j, children, dx, dy, det1p1.getId(), angle); j=0;
++pointsD2; }
++j; UpdatePoints(data, d2REdge, j, children, dx, dy, det1p1.getId(), angle);
} while (pointsD2 < countNodeD2-1); ++pointsD2;
// This check need for backward compatibility ++j;
// Remove it if min version is 0.3.2 } while (pointsD2 < countNodeD2-1);
Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < CONVERTER_VERSION_CHECK(0, 3, 2), }
"Time to refactor the code."); } while (i<countNodeD1);
if (children.size() == countNodeD2) }
else // remove if min version is 0.3.2
{
qint32 i = 0;
do
{
++i;
if (i > d1.indexOfNode(det1p1.getId()))
{ {
const int childrenCount = children.size();
VDetail d2REdge = d2.RemoveEdge(indexD2);
qint32 j = 0;
FindIndexJ(pointsD2, d2, indexD2, j);
do
{
if (j >= countNodeD2)
{
j=0;
}
UpdatePoints(data, d2REdge, j, children, dx, dy, det1p1.getId(), angle);
++pointsD2;
++j;
} while (pointsD2 < childrenCount);
break; break;
} }
} } while (i<countNodeD1);
} while (i<countNodeD1); }
} }
} }
return unionDetails; return unionDetails;