diff --git a/src/Mod/Part/App/FeaturePartFuse.cpp b/src/Mod/Part/App/FeaturePartFuse.cpp
index 82f4a423b4..448a2f0578 100644
--- a/src/Mod/Part/App/FeaturePartFuse.cpp
+++ b/src/Mod/Part/App/FeaturePartFuse.cpp
@@ -35,7 +35,7 @@
#include
#include "FeaturePartFuse.h"
-#include "TopoShapeOpCode.h"
+#include "TopoShape.h"
#include "modelRefine.h"
#include "TopoShapeOpCode.h"
@@ -91,42 +91,42 @@ short MultiFuse::mustExecute() const
App::DocumentObjectExecReturn *MultiFuse::execute()
{
#ifndef FC_USE_TNP_FIX
- std::vector s;
+ std::vector shapes;
std::vector obj = Shapes.getValues();
std::vector::iterator it;
for (it = obj.begin(); it != obj.end(); ++it) {
- s.push_back(Feature::getShape(*it));
+ shapes.push_back(Feature::getShape(*it));
}
bool argumentsAreInCompound = false;
TopoDS_Shape compoundOfArguments;
//if only one source shape, and it is a compound - fuse children of the compound
- if (s.size() == 1){
- compoundOfArguments = s[0];
+ if (shapes.size() == 1){
+ compoundOfArguments = shapes[0];
if (compoundOfArguments.ShapeType() == TopAbs_COMPOUND){
- s.clear();
+ shapes.clear();
TopoDS_Iterator it2(compoundOfArguments);
for (; it2.More(); it2.Next()) {
const TopoDS_Shape& aChild = it2.Value();
- s.push_back(aChild);
+ shapes.push_back(aChild);
}
argumentsAreInCompound = true;
}
}
- if (s.size() >= 2) {
+ if (shapes.size() >= 2) {
try {
std::vector history;
BRepAlgoAPI_Fuse mkFuse;
TopTools_ListOfShape shapeArguments,shapeTools;
- const TopoDS_Shape& shape = s.front();
+ const TopoDS_Shape& shape = shapes.front();
if (shape.IsNull())
throw Base::RuntimeError("Input shape is null");
shapeArguments.Append(shape);
- for (auto it2 = s.begin()+1; it2 != s.end(); ++it2) {
+ for (auto it2 = shapes.begin()+1; it2 != shapes.end(); ++it2) {
if (it2->IsNull())
throw Base::RuntimeError("Input shape is null");
shapeTools.Append(*it2);
@@ -139,7 +139,7 @@ App::DocumentObjectExecReturn *MultiFuse::execute()
throw Base::RuntimeError("MultiFusion failed");
TopoDS_Shape resShape = mkFuse.Shape();
- for (const auto & it2 : s) {
+ for (const auto & it2 : shapes) {
history.push_back(buildHistory(mkFuse, TopAbs_FACE, resShape, it2));
}
if (resShape.IsNull())
@@ -179,7 +179,7 @@ App::DocumentObjectExecReturn *MultiFuse::execute()
for (std::size_t iChild = 0; iChild < history.size(); iChild++){ //loop over children of source compound
//for each face of a child, find the inex of the face in compound, and assign the corresponding right-hand-size of the history
TopTools_IndexedMapOfShape facesOfChild;
- TopExp::MapShapes(s[iChild], type, facesOfChild);
+ TopExp::MapShapes(shapes[iChild], type, facesOfChild);
for(std::pair &histitem: history[iChild].shapeMap){ //loop over elements of history - that is - over faces of the child of source compound
int iFaceInChild = histitem.first;
ShapeHistory::List &iFacesInResult = histitem.second;
@@ -204,44 +204,132 @@ App::DocumentObjectExecReturn *MultiFuse::execute()
return App::DocumentObject::StdReturn;
#else
std::vector shapes;
- for (auto obj : Shapes.getValues()) {
- TopoShape sh = Feature::getTopoShape(obj);
- if (sh.isNull()) {
- return new App::DocumentObjectExecReturn("Input shape is null");
+ std::vector obj = Shapes.getValues();
+
+ std::vector::iterator it;
+ for (it = obj.begin(); it != obj.end(); ++it) {
+ shapes.push_back(Feature::getTopoShape(*it));
+ }
+
+ bool argumentsAreInCompound = false;
+ TopoShape compoundOfArguments;
+
+ // if only one source shape, and it is a compound - fuse children of the compound
+ if (shapes.size() == 1) {
+ compoundOfArguments = shapes[0];
+ if (compoundOfArguments.getShape().ShapeType() == TopAbs_COMPOUND) {
+ shapes.clear();
+ shapes = compoundOfArguments.getSubTopoShapes();
+ argumentsAreInCompound = true;
}
- if (!sh.hasSubShape(TopAbs_SOLID)) {
- if (FC_LOG_INSTANCE.isEnabled(FC_LOGLEVEL_LOG)) {
- FC_WARN("fusion of non solid: " << obj->getFullName());
+ }
+
+ if (shapes.size() >= 2) {
+ try {
+ std::vector history;
+ BRepAlgoAPI_Fuse mkFuse;
+ TopTools_ListOfShape shapeArguments, shapeTools;
+ const TopoShape& shape = shapes.front();
+ if (shape.isNull()) {
+ throw Base::RuntimeError("Input shape is null");
}
- else {
- FC_MSG("fusion of non solid: " << obj->getFullName());
+ shapeArguments.Append(shape.getShape());
+
+ for (auto it2 = shapes.begin() + 1; it2 != shapes.end(); ++it2) {
+ if (it2->isNull()) {
+ throw Base::RuntimeError("Input shape is null");
+ }
+ shapeTools.Append(it2->getShape());
}
+
+ mkFuse.SetArguments(shapeArguments);
+ mkFuse.SetTools(shapeTools);
+ mkFuse.Build();
+
+ if (!mkFuse.IsDone()) {
+ throw Base::RuntimeError("MultiFusion failed");
+ }
+
+ // TopoDS_Shape resShape = mkFuse.Shape();
+ TopoShape res(0);
+ res.makeShapeWithElementMap(mkFuse.Shape(), MapperMaker(mkFuse), shapes, OpCodes::Fuse);
+
+ for (const auto& it2 : shapes) {
+ history.push_back(
+ buildHistory(mkFuse, TopAbs_FACE, res.getShape(), it2.getShape()));
+ }
+ if (res.isNull()) {
+ throw Base::RuntimeError("Resulting shape is null");
+ }
+
+ Base::Reference hGrp = App::GetApplication()
+ .GetUserParameter()
+ .GetGroup("BaseApp")
+ ->GetGroup("Preferences")
+ ->GetGroup("Mod/Part/Boolean");
+ if (hGrp->GetBool("CheckModel", false)) {
+ BRepCheck_Analyzer aChecker(res.getShape());
+ if (!aChecker.IsValid()) {
+ return new App::DocumentObjectExecReturn("Resulting shape is invalid");
+ }
+ }
+ if (this->Refine.getValue()) {
+ try {
+ TopoDS_Shape oldShape = res.getShape();
+ BRepBuilderAPI_RefineModel mkRefine(oldShape);
+ res.setShape(mkRefine.Shape());
+ ShapeHistory hist =
+ buildHistory(mkRefine, TopAbs_FACE, res.getShape(), oldShape);
+ for (auto& jt : history) {
+ jt = joinHistory(jt, hist);
+ }
+ }
+ catch (Standard_Failure&) {
+ // do nothing
+ }
+ }
+
+ if (argumentsAreInCompound) {
+ // combine histories of every child of source compound into one
+ ShapeHistory overallHist;
+ TopTools_IndexedMapOfShape facesOfCompound;
+ TopAbs_ShapeEnum type = TopAbs_FACE;
+ TopExp::MapShapes(compoundOfArguments.getShape(), type, facesOfCompound);
+ for (std::size_t iChild = 0; iChild < history.size();
+ iChild++) { // loop over children of source compound
+ // for each face of a child, find the inex of the face in compound, and assign
+ // the corresponding right-hand-size of the history
+ TopTools_IndexedMapOfShape facesOfChild;
+ TopExp::MapShapes(shapes[iChild].getShape(), type, facesOfChild);
+ for (std::pair& histitem :
+ history[iChild].shapeMap) { // loop over elements of history - that is -
+ // over faces of the child of source compound
+ int iFaceInChild = histitem.first;
+ ShapeHistory::List& iFacesInResult = histitem.second;
+ const TopoDS_Shape& srcFace = facesOfChild(
+ iFaceInChild
+ + 1); //+1 to convert our 0-based to OCC 1-bsed conventions
+ int iFaceInCompound = facesOfCompound.FindIndex(srcFace) - 1;
+ overallHist.shapeMap[iFaceInCompound] =
+ iFacesInResult; // this may overwrite existing info if the same face is
+ // used in several children of compound. This shouldn't
+ // be a problem, because the histories should match
+ // anyway...
+ }
+ }
+ history.clear();
+ history.push_back(overallHist);
+ }
+ this->Shape.setValue(res);
+ this->History.setValues(history);
+ return Part::Feature::execute();
}
- shapes.push_back(sh);
- }
-
- TopoShape res(0);
- res.makeElementBoolean(Part::OpCodes::Fuse, shapes);
- if (res.isNull()) {
- throw Base::RuntimeError("Resulting shape is null");
- }
-
- Base::Reference hGrp = App::GetApplication()
- .GetUserParameter()
- .GetGroup("BaseApp")
- ->GetGroup("Preferences")
- ->GetGroup("Mod/Part/Boolean");
- if (hGrp->GetBool("CheckModel", false)) {
- BRepCheck_Analyzer aChecker(res.getShape());
- if (!aChecker.IsValid()) {
- return new App::DocumentObjectExecReturn("Resulting shape is invalid");
+ catch (Standard_Failure& e) {
+ return new App::DocumentObjectExecReturn(e.GetMessageString());
}
}
-
- if (this->Refine.getValue()) {
- res = res.makeElementRefine();
+ else {
+ throw Base::CADKernelError("Not enough shape objects linked");
}
- this->Shape.setValue(res);
- return Part::Feature::execute();
#endif
}
diff --git a/src/Mod/Part/parttests/TopoShapeTest.py b/src/Mod/Part/parttests/TopoShapeTest.py
index 0234e4e66b..c5cc6b21e7 100644
--- a/src/Mod/Part/parttests/TopoShapeTest.py
+++ b/src/Mod/Part/parttests/TopoShapeTest.py
@@ -375,7 +375,7 @@ class TopoShapeTest(unittest.TestCase, TopoShapeAssertions):
# Assert elementMap
if surface1.ElementMapVersion != "": # Should be '4' as of Mar 2023.
self.assertEqual(surface1.ElementMapSize, 6)
- self.assertBounds(surface1, App.BoundBox(-5, -5, 0, 5, 5, 10))
+ self.assertBounds(surface1, App.BoundBox(-5, -5, 0, 5, 5, 10), precision=2)
else:
# Todo: WHY is the actual sweep different? That's BAD. However, the "New" approach
# above, which uses BRepOffsetAPI_MakePipe appears to be correct over the older