-// Copyright (C) 2014-2019 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2022 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 "FeaturesPlugin_BooleanCut.h"
-#include "FeaturesPlugin_Tools.h"
-
#include <ModelAPI_ResultBody.h>
+#include <ModelAPI_AttributeBoolean.h>
+#include <ModelAPI_AttributeDouble.h>
#include <ModelAPI_AttributeSelectionList.h>
#include <ModelAPI_Tools.h>
#include <GeomAPI_ShapeExplorer.h>
#include <GeomAPI_ShapeIterator.h>
-static const int THE_CUT_VERSION_1 = 20190506;
+
+static const ListOfShape ExplodeCompounds(const ListOfShape &aList)
+{
+ ListOfShape subShapes;
+ for (auto shp = aList.cbegin(); shp != aList.cend(); ++shp)
+ {
+ if ((*shp).get() && (*shp)->isCompound()) {
+ // Use all sub shapes of the compound
+ for (GeomAPI_ShapeIterator anExp(*shp); anExp.more(); anExp.next()) {
+ GeomShapePtr aCurrent = anExp.current();
+ subShapes.push_back(aCurrent);
+ }
+ }
+ else
+ subShapes.push_back(*shp);
+ }
+
+ return subShapes;
+}
//==================================================================================================
FeaturesPlugin_BooleanCut::FeaturesPlugin_BooleanCut()
void FeaturesPlugin_BooleanCut::initAttributes()
{
FeaturesPlugin_Boolean::initAttributes();
- initVersion(THE_CUT_VERSION_1);
+ initVersion(BOP_VERSION_9_4(), selectionList(OBJECT_LIST_ID()), selectionList(TOOL_LIST_ID()));
}
//==================================================================================================
void FeaturesPlugin_BooleanCut::execute()
{
- ObjectHierarchy anObjects, aTools;
+ GeomAPI_ShapeHierarchy anObjects, aTools;
ListOfShape aPlanes;
// Getting objects and tools
int aResultIndex = 0;
- if(anObjects.IsEmpty() || aTools.IsEmpty()) {
+ if(anObjects.empty() || aTools.empty()) {
std::string aFeatureError = "Error: Not enough objects for boolean operation.";
setError(aFeatureError);
return;
}
- // version of CUT feature
- int aCutVersion = version();
-
- std::vector<FeaturesPlugin_Tools::ResultBaseAlgo> aResultBaseAlgoList;
+ std::vector<ModelAPI_Tools::ResultBaseAlgo> aResultBaseAlgoList;
ListOfShape aResultShapesList;
std::string anError;
std::shared_ptr<GeomAlgoAPI_MakeShapeList> aMakeShapeList(new GeomAlgoAPI_MakeShapeList());
GeomShapePtr aResultCompound;
- if (aCutVersion == THE_CUT_VERSION_1) {
+ if (data()->version() == BOP_VERSION_9_4()) {
// merge hierarchies of compounds containing objects and tools
aResultCompound =
keepUnusedSubsOfCompound(GeomShapePtr(), anObjects, aTools, aMakeShapeList);
}
+ // Getting fuzzy parameter.
+ // Used as additional tolerance to eliminate tiny results.
+ // Using -1 as fuzzy value in the GeomAlgoAPI means to ignore it during the boolean operation!
+ bool aUseFuzzy = boolean(USE_FUZZY_ID())->value();
+ double aFuzzy = (aUseFuzzy ? real(FUZZY_PARAM_ID())->value() : -1);
+
+ // When selecting a compound tool object, use its exploded subshapes as tool object instead.
+ const ListOfShape aToolList = ExplodeCompounds(aTools.objects());
+
// For solids cut each object with all tools.
bool isOk = true;
- for (ObjectHierarchy::Iterator anObjectsIt = anObjects.Begin();
- anObjectsIt != anObjects.End() && isOk;
+ for (GeomAPI_ShapeHierarchy::iterator anObjectsIt = anObjects.begin();
+ anObjectsIt != anObjects.end() && isOk;
++anObjectsIt) {
GeomShapePtr anObject = *anObjectsIt;
- GeomShapePtr aParent = anObjects.Parent(anObject);
+ GeomShapePtr aParent = anObjects.parent(anObject);
if (aParent) {
GeomAPI_Shape::ShapeType aShapeType = aParent->shapeType();
if (aShapeType == GeomAPI_Shape::COMPOUND) {
// Compound handling
isOk = processCompound(GeomAlgoAPI_Tools::BOOL_CUT,
- anObjects, aParent, aTools.Objects(),
+ anObjects, aParent, aToolList,
+ aFuzzy,
aResultIndex, aResultBaseAlgoList, aResultShapesList,
aResultCompound);
}
else if (aShapeType == GeomAPI_Shape::COMPSOLID) {
// Compsolid handling
isOk = processCompsolid(GeomAlgoAPI_Tools::BOOL_CUT,
- anObjects, aParent, aTools.Objects(), ListOfShape(),
+ anObjects, aParent, aToolList, ListOfShape(),
+ aFuzzy,
aResultIndex, aResultBaseAlgoList, aResultShapesList,
aResultCompound);
}
} else {
// process object as is
isOk = processObject(GeomAlgoAPI_Tools::BOOL_CUT,
- anObject, aTools.Objects(), aPlanes,
+ anObject, aToolList, aPlanes,
+ aFuzzy,
aResultIndex, aResultBaseAlgoList, aResultShapesList,
aResultCompound);
}
}
- GeomAPI_ShapeIterator aShapeIt(aResultCompound);
- if (aShapeIt.more()) {
- std::shared_ptr<ModelAPI_ResultBody> aResultBody =
- document()->createBody(data(), aResultIndex);
-
- ListOfShape anObjectList = anObjects.Objects();
- ListOfShape aToolsList = aTools.Objects();
- FeaturesPlugin_Tools::loadModifiedShapes(aResultBody,
- anObjectList,
- aToolsList,
- aMakeShapeList,
- aResultCompound);
- setResult(aResultBody, aResultIndex++);
-
- // merge algorithms
- FeaturesPlugin_Tools::ResultBaseAlgo aRBA;
- aRBA.resultBody = aResultBody;
- aRBA.baseShape = anObjectList.front();
- for (std::vector<FeaturesPlugin_Tools::ResultBaseAlgo>::iterator
- aRBAIt = aResultBaseAlgoList.begin();
- aRBAIt != aResultBaseAlgoList.end(); ++aRBAIt) {
- aMakeShapeList->appendAlgo(aRBAIt->makeShape);
- }
- aRBA.makeShape = aMakeShapeList;
- aResultBaseAlgoList.clear();
- aResultBaseAlgoList.push_back(aRBA);
- }
+ storeResult(anObjects.objects(), aToolList, aResultCompound, aResultIndex,
+ aMakeShapeList, aResultBaseAlgoList);
// Store deleted shapes after all results has been proceeded. This is to avoid issue when in one
// result shape has been deleted, but in another it was modified or stayed.
if (!aResultCompound)
aResultCompound = GeomAlgoAPI_CompoundBuilder::compound(aResultShapesList);
- FeaturesPlugin_Tools::loadDeletedShapes(aResultBaseAlgoList,
- aTools.Objects(),
- aResultCompound);
+ ModelAPI_Tools::loadDeletedShapes(aResultBaseAlgoList,
+ aToolList,
+ aResultCompound);
// remove the rest results if there were produced in the previous pass
removeResults(aResultIndex);