suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use multiple tool shapes for MultiFuse Feature

Browse Source 
issue #1971
This commit is contained in:
Sebastian Hoogen 2015-02-18 20:21:54 +01:00 committed by wmayer
parent 312f63e43e
commit acfafc0b2b
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Mod/Part/App/FeaturePartFuse.cpp
View File

@ -86,6 +86,7 @@ App::DocumentObjectExecReturn *MultiFuse::execute(void)
if (s.size() >= 2) { if (s.size() >= 2) {
try { try {
std::vector<ShapeHistory> history; std::vector<ShapeHistory> history;
#if OCC_VERSION_HEX <= 0x060800
TopoDS_Shape resShape = s.front(); TopoDS_Shape resShape = s.front();
if (resShape.IsNull()) if (resShape.IsNull())
throw Base::Exception("Input shape is null"); throw Base::Exception("Input shape is null");
@ -112,6 +113,25 @@ App::DocumentObjectExecReturn *MultiFuse::execute(void)
history.push_back(hist2); history.push_back(hist2);
} }
} }
#else
BRepAlgoAPI_Fuse mkFuse;
TopTools_ListOfShape shapeArguments,shapeTools;
shapeArguments.Append(s.front());
for (std::vector<TopoDS_Shape>::iterator it = s.begin()+1; it != s.end(); ++it) {
if (it->IsNull())
throw Base::Exception("Input shape is null");
shapeTools.Append(*it);
}
mkFuse.SetArguments(shapeArguments);
mkFuse.SetTools(shapeTools);
mkFuse.Build();
if (!mkFuse.IsDone())
throw Base::Exception("MultiFusion failed");
TopoDS_Shape resShape = mkFuse.Shape();
for (std::vector<TopoDS_Shape>::iterator it = s.begin(); it != s.end(); ++it) {
history.push_back(buildHistory(mkFuse, TopAbs_FACE, resShape, *it));
}
#endif
if (resShape.IsNull()) if (resShape.IsNull())
throw Base::Exception("Resulting shape is null"); throw Base::Exception("Resulting shape is null");