-// Copyright (C) 2014-2019 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2023 CEA, EDF
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
#include "FeaturesPlugin_BooleanFill.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 <algorithm>
#include <map>
+
//=================================================================================================
FeaturesPlugin_BooleanFill::FeaturesPlugin_BooleanFill()
: FeaturesPlugin_Boolean(FeaturesPlugin_Boolean::BOOL_FILL)
void FeaturesPlugin_BooleanFill::initAttributes()
{
FeaturesPlugin_Boolean::initAttributes();
- initVersion(THE_VERSION_1, selectionList(OBJECT_LIST_ID()), selectionList(TOOL_LIST_ID()));
+ initVersion(BOP_VERSION_9_4(), selectionList(OBJECT_LIST_ID()), selectionList(TOOL_LIST_ID()));
}
//=================================================================================================
void FeaturesPlugin_BooleanFill::execute()
{
std::string anError;
- ObjectHierarchy anObjects, aTools;
+ GeomAPI_ShapeHierarchy anObjects, aTools;
ListOfShape aPlanes;
// Getting objects.
int aResultIndex = 0;
- if (anObjects.IsEmpty() || (aTools.IsEmpty() && aPlanes.empty())) {
+ if (anObjects.empty() || (aTools.empty() && aPlanes.empty())) {
std::string aFeatureError = "Error: Not enough objects for boolean operation.";
setError(aFeatureError);
return;
}
- // version of Split feature
- int aSplitVersion = version();
-
- std::vector<FeaturesPlugin_Tools::ResultBaseAlgo> aResultBaseAlgoList;
+ std::vector<ModelAPI_Tools::ResultBaseAlgo> aResultBaseAlgoList;
ListOfShape aResultShapesList;
std::shared_ptr<GeomAlgoAPI_MakeShapeList> aMakeShapeList(new GeomAlgoAPI_MakeShapeList());
GeomShapePtr aResultCompound;
- if (aSplitVersion == THE_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);
+
// 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, false);
+ GeomShapePtr aParent = anObjects.parent(anObject, false);
if (aParent && aParent->shapeType() == GeomAPI_Shape::COMPSOLID) {
// get parent once again to mark it and the subs as processed
- aParent = anObjects.Parent(anObject);
+ aParent = anObjects.parent(anObject);
// compsolid handling
isOk = processCompsolid(GeomAlgoAPI_Tools::BOOL_PARTITION,
- anObjects, aParent, aTools.Objects(), aPlanes,
+ anObjects, aParent, aTools.objects(), aPlanes,
+ aFuzzy,
aResultIndex, aResultBaseAlgoList, aResultShapesList,
aResultCompound);
} else {
// process object as is
isOk = processObject(GeomAlgoAPI_Tools::BOOL_PARTITION,
- anObject, aTools.Objects(), aPlanes,
+ anObject, aTools.objects(), aPlanes,
+ aFuzzy,
aResultIndex, aResultBaseAlgoList, aResultShapesList,
aResultCompound);
}
}
- storeResult(anObjects.Objects(), aTools.Objects(), aResultCompound, aResultIndex,
+ storeResult(anObjects.objects(), aTools.objects(), 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,
+ aTools.objects(),
+ aResultCompound);
// remove the rest results if there were produced in the previous pass
removeResults(aResultIndex);