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

Union Details tool. Small improvements and bug fixes.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2017-02-01 13:27:38 +02:00
parent b5d50288a8
commit 4831d263b9
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -349,7 +349,7 @@ quint32 AddNodePoint(const VPieceNode &node, const VToolUnionDetailsInitData &in
children.append(idObject); children.append(idObject);
point1->setMode(Draw::Modeling); point1->setMode(Draw::Modeling);
const quint32 id = initData.data->AddGObject(point1.take()); const quint32 id = initData.data->AddGObject(point1.take());
VNodePoint::Create(initData.doc, initData.data, initData.scene, id, idObject, Document::FullParse, Source::FromGui, VNodePoint::Create(initData.doc, initData.data, initData.scene, id, idObject, Document::FullParse, Source::FromTool,
drawName, idTool); drawName, idTool);
return id; return id;
} }
@ -391,7 +391,8 @@ quint32 AddNodeArc(const VPieceNode &node, const VToolUnionDetailsInitData &init
arc2->setMode(Draw::Modeling); arc2->setMode(Draw::Modeling);
const quint32 id = initData.data->AddGObject(arc2.take()); const quint32 id = initData.data->AddGObject(arc2.take());
VNodeArc::Create(initData.doc, initData.data, id, idObject, Document::FullParse, Source::FromGui, drawName, idTool); VNodeArc::Create(initData.doc, initData.data, id, idObject, Document::FullParse, Source::FromTool, drawName,
idTool);
return id; return id;
} }
@ -434,7 +435,7 @@ quint32 AddNodeElArc(const VPieceNode &node, const VToolUnionDetailsInitData &in
arc2->setMode(Draw::Modeling); arc2->setMode(Draw::Modeling);
const quint32 id = initData.data->AddGObject(arc2.take()); const quint32 id = initData.data->AddGObject(arc2.take());
VNodeEllipticalArc::Create(initData.doc, initData.data, id, idObject, Document::FullParse, Source::FromGui, VNodeEllipticalArc::Create(initData.doc, initData.data, id, idObject, Document::FullParse, Source::FromTool,
drawName, idTool); drawName, idTool);
return id; return id;
} }
@ -469,7 +470,7 @@ quint32 AddNodeSpline(const VPieceNode &node, const VToolUnionDetailsInitData &i
VSpline *spl1 = new VSpline(*spl); VSpline *spl1 = new VSpline(*spl);
spl1->setMode(Draw::Modeling); spl1->setMode(Draw::Modeling);
const quint32 id = initData.data->AddGObject(spl1); const quint32 id = initData.data->AddGObject(spl1);
VNodeSpline::Create(initData.doc, initData.data, id, idObject, Document::FullParse, Source::FromGui, drawName, VNodeSpline::Create(initData.doc, initData.data, id, idObject, Document::FullParse, Source::FromTool, drawName,
idTool); idTool);
return id; return id;
} }
@ -533,7 +534,7 @@ quint32 AddNodeSplinePath(const VPieceNode &node, const VToolUnionDetailsInitDat
path1->setMode(Draw::Modeling); path1->setMode(Draw::Modeling);
const quint32 id = initData.data->AddGObject(path1.take()); const quint32 id = initData.data->AddGObject(path1.take());
VNodeSplinePath::Create(initData.doc, initData.data, id, idObject, Document::FullParse, Source::FromGui, drawName, VNodeSplinePath::Create(initData.doc, initData.data, id, idObject, Document::FullParse, Source::FromTool, drawName,
idTool); idTool);
return id; return id;
} }
@ -997,8 +998,6 @@ void CreateUnitedCSA(VPiece &newDetail, const VPiece &d1, const VPiece &d2, quin
QVector<quint32> children; QVector<quint32> children;
CreateUnitedDetailCSA(newDetail, d2, children, id, drawName, initData, dx, dy, pRotate, angle); CreateUnitedDetailCSA(newDetail, d2, children, id, drawName, initData, dx, dy, pRotate, angle);
SCASSERT(not children.isEmpty())
SaveCSAChildren(initData.doc, id, children); SaveCSAChildren(initData.doc, id, children);
} }
@ -1044,7 +1043,6 @@ void CreateUnitedInternalPaths(VPiece &newDetail, const VPiece &d1, const VPiece
QVector<quint32> children; QVector<quint32> children;
CreateUnitedDetailInternalPaths(newDetail, d2, children, id, drawName, initData, dx, dy, pRotate, angle); CreateUnitedDetailInternalPaths(newDetail, d2, children, id, drawName, initData, dx, dy, pRotate, angle);
SCASSERT(not children.isEmpty())
SaveInternalPathsChildren(initData.doc, id, children); SaveInternalPathsChildren(initData.doc, id, children);
} }