-// Copyright (C) 2014-2019 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2021 CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
#include <ModelAPI_ResultBody.h>
#include <ModelAPI_AttributeBoolean.h>
+#include <ModelAPI_AttributeInteger.h>
#include <ModelAPI_AttributeSelectionList.h>
#include <ModelAPI_AttributeString.h>
#include <ModelAPI_Session.h>
#include <GeomAlgoAPI_Boolean.h>
#include <GeomAlgoAPI_MakeShapeList.h>
#include <GeomAlgoAPI_PaveFiller.h>
+#include <GeomAlgoAPI_ShapeBuilder.h>
#include <GeomAlgoAPI_ShapeTools.h>
#include <GeomAlgoAPI_Tools.h>
#include <GeomAlgoAPI_UnifySameDomain.h>
+
#include <GeomAPI_ShapeExplorer.h>
+#include <GeomAPI_ShapeIterator.h>
+
+static void explodeCompound(const GeomShapePtr& theShape, ListOfShape& theResult)
+{
+ if (theShape->shapeType() == GeomAPI_Shape::COMPOUND) {
+ GeomAPI_ShapeIterator it(theShape);
+ for (; it.more(); it.next())
+ theResult.push_back(it.current());
+ } else
+ theResult.push_back(theShape);
+}
+
+static void collectSolids(const ListOfShape& theShapes, ListOfShape& theResult)
+{
+ for (ListOfShape::const_iterator it = theShapes.begin(); it != theShapes.end(); ++it)
+ explodeCompound(*it, theResult);
+}
//==================================================================================================
FeaturesPlugin_BooleanFuse::FeaturesPlugin_BooleanFuse()
ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), OBJECT_LIST_ID());
ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), TOOL_LIST_ID());
+
+ initVersion(BOP_VERSION_9_4(), selectionList(OBJECT_LIST_ID()), selectionList(TOOL_LIST_ID()));
}
//==================================================================================================
void FeaturesPlugin_BooleanFuse::execute()
{
std::string anError;
- ObjectHierarchy anObjectsHierarchy, aToolsHierarchy;
+ GeomAPI_ShapeHierarchy anObjectsHierarchy, aToolsHierarchy;
ListOfShape aPlanes;
bool isSimpleCreation = false;
ListOfShape anObjects, aTools, anEdgesAndFaces;
// all objects except edges and faces
- anObjectsHierarchy.ObjectsByType(anEdgesAndFaces, anObjects,
+ anObjectsHierarchy.objectsByType(anEdgesAndFaces, anObjects,
GeomAPI_Shape::FACE, GeomAPI_Shape::EDGE);
- aToolsHierarchy.ObjectsByType(anEdgesAndFaces, aTools,
+ aToolsHierarchy.objectsByType(anEdgesAndFaces, aTools,
GeomAPI_Shape::FACE, GeomAPI_Shape::EDGE);
if ((anObjects.size() + aTools.size() + anEdgesAndFaces.size()) < 2) {
return;
}
+ // version of FUSE feature
+ const std::string aFuseVersion = data()->version();
+
// Collecting all solids which will be fused.
+ // We explode the top-level compounds here because of issue #19931. It performs Fuse operation
+ // on a set of compounds, one of which is treated as self-intersected.
+ // But this problem is eliminated after the exploding, because in this case,
+ // the shapes are intersected, but not self-intersected.
ListOfShape aSolidsToFuse;
- aSolidsToFuse.insert(aSolidsToFuse.end(), anObjects.begin(), anObjects.end());
- aSolidsToFuse.insert(aSolidsToFuse.end(), aTools.begin(), aTools.end());
+ collectSolids(anObjects, aSolidsToFuse);
+ collectSolids(aTools, aSolidsToFuse);
// Collecting solids from compsolids which will not be modified
// in boolean operation and will be added to result.
+ bool isProcessCompsolid = !isSimpleCreation || !aFuseVersion.empty();
ListOfShape aShapesToAdd;
- for (ObjectHierarchy::Iterator anObjectsIt = anObjectsHierarchy.Begin();
- !isSimpleCreation && anObjectsIt != anObjectsHierarchy.End();
+ int aNbCompsolids = 0; // number of compsolids, which subs is taken into operation
+ bool hasSeparateSolids = false; // are solids or full results exist
+ for (GeomAPI_ShapeHierarchy::iterator anObjectsIt = anObjectsHierarchy.begin();
+ isProcessCompsolid && anObjectsIt != anObjectsHierarchy.end();
++anObjectsIt) {
GeomShapePtr anObject = *anObjectsIt;
- GeomShapePtr aParent = anObjectsHierarchy.Parent(anObject, false);
+ GeomShapePtr aParent = anObjectsHierarchy.parent(anObject, false);
if (aParent && aParent->shapeType() == GeomAPI_Shape::COMPSOLID) {
+ ++aNbCompsolids;
// mark all subs of this parent as precessed to avoid handling twice
- aParent = anObjectsHierarchy.Parent(anObject);
+ aParent = anObjectsHierarchy.parent(anObject);
ListOfShape aUsed, aNotUsed;
- anObjectsHierarchy.SplitCompound(aParent, aUsed, aNotUsed);
+ anObjectsHierarchy.splitCompound(aParent, aUsed, aNotUsed);
aShapesToAdd.insert(aShapesToAdd.end(), aNotUsed.begin(), aNotUsed.end());
}
+ else
+ hasSeparateSolids = true;
}
+ bool isSingleCompsolid = aNbCompsolids == 1 && !hasSeparateSolids;
ListOfShape anOriginalShapes = aSolidsToFuse;
anOriginalShapes.insert(anOriginalShapes.end(), aShapesToAdd.begin(), aShapesToAdd.end());
aMakeShapeList->appendAlgo(aCutAlgo);
}
}
- anOriginalShapes.insert(anOriginalShapes.end(), anEdgesAndFaces.begin(),
- anEdgesAndFaces.end());
+
+ if (aShapesToAdd.empty() || !aCuttedEdgesAndFaces) {
+ anOriginalShapes.insert(anOriginalShapes.end(), anEdgesAndFaces.begin(),
+ anEdgesAndFaces.end());
+ }
// If we have compsolids then cut with not used solids all others.
- if (!aShapesToAdd.empty()) {
+ if (!aShapesToAdd.empty() && !isSingleCompsolid) {
aSolidsToFuse.clear();
for (ListOfShape::iterator
anIt = anOriginalShapes.begin(); anIt != anOriginalShapes.end(); anIt++) {
std::shared_ptr<GeomAlgoAPI_Boolean> aCutAlgo(
new GeomAlgoAPI_Boolean(aOneObjectList, aShapesToAdd, GeomAlgoAPI_Tools::BOOL_CUT));
- if (GeomAlgoAPI_ShapeTools::volume(aCutAlgo->shape()) > 1.e-27) {
+ if (GeomAlgoAPI_ShapeTools::area(aCutAlgo->shape()) > 1.e-27) {
aSolidsToFuse.push_back(aCutAlgo->shape());
aMakeShapeList->appendAlgo(aCutAlgo);
}
aMakeShapeList->appendAlgo(aUnifyAlgo);
}
+ if (aFuseVersion == BOP_VERSION_9_4()) {
+ // merge hierarchies of compounds containing objects and tools
+ // and append the result of the FUSE operation
+ aShape = keepUnusedSubsOfCompound(aShape, anObjectsHierarchy, aToolsHierarchy, aMakeShapeList);
+ }
+
int aResultIndex = 0;
ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex);
