-// Copyright (C) 2014-2022 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2023 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 <ModelHighAPI_Selection.h>
#include <ModelHighAPI_Tools.h>
+
+static const double DEFAULT_FUZZY = 1.e-5;
+
+
//==================================================================================================
FeaturesAPI_BooleanSmash::FeaturesAPI_BooleanSmash(
const std::shared_ptr<ModelAPI_Feature>& theFeature)
: ModelHighAPI_Interface(theFeature)
{
if(initialize()) {
- fillAttribute(theMainObjects, mymainObjects);
- fillAttribute(theToolObjects, mytoolObjects);
- fillAttribute(theFuzzy, myfuzzyParam);
+ fillAttribute(theMainObjects, VAR_NAME(mainObjects));
+ fillAttribute(theToolObjects, VAR_NAME(toolObjects));
+ fillAttribute(theFuzzy, VAR_NAME(fuzzyParam));
+
+ // Get the evaluated fuzzy parameter from the attribute!!
+ bool aUseFuzzy = (fuzzyParam()->value() > 0);
+ fillAttribute(aUseFuzzy, VAR_NAME(useFuzzy));
+ if (!aUseFuzzy) {
+ ModelHighAPI_Double aFuzzy(DEFAULT_FUZZY);
+ fillAttribute(aFuzzy, VAR_NAME(fuzzyParam));
+ }
execute(false);
}
void FeaturesAPI_BooleanSmash::setMainObjects(
const std::list<ModelHighAPI_Selection>& theMainObjects)
{
- fillAttribute(theMainObjects, mymainObjects);
+ fillAttribute(theMainObjects, VAR_NAME(mainObjects));
execute();
}
void FeaturesAPI_BooleanSmash::setToolObjects(
const std::list<ModelHighAPI_Selection>& theToolObjects)
{
- fillAttribute(theToolObjects, mytoolObjects);
+ fillAttribute(theToolObjects, VAR_NAME(toolObjects));
+
+ execute();
+}
+
+//==================================================================================================
+void FeaturesAPI_BooleanSmash::setUseFuzzy(bool theUseFuzzy)
+{
+ fillAttribute(theUseFuzzy, VAR_NAME(useFuzzy));
execute();
}
//==================================================================================================
void FeaturesAPI_BooleanSmash::setFuzzyValue(const ModelHighAPI_Double& theFuzzy)
{
- fillAttribute(theFuzzy, myfuzzyParam);
+ fillAttribute(theFuzzy, VAR_NAME(fuzzyParam));
execute();
}
aBase->selectionList(FeaturesPlugin_BooleanSmash::OBJECT_LIST_ID());
AttributeSelectionListPtr aTools =
aBase->selectionList(FeaturesPlugin_BooleanSmash::TOOL_LIST_ID());
- double aFuzzy = aBase->real(FeaturesPlugin_BooleanSmash::FUZZY_PARAM_ID())->value();
+ bool aUseFuzzy = aBase->boolean(FeaturesPlugin_BooleanSmash::USE_FUZZY_ID())->value();
+ AttributeDoublePtr aFuzzy = aBase->real(FeaturesPlugin_BooleanSmash::FUZZY_PARAM_ID());
theDumper << "(" << aDocName << ", " << anObjects << ", " << aTools;
- theDumper << ", fuzzyParam = " << aFuzzy;
+ if (aUseFuzzy)
+ theDumper << ", fuzzyParam = " << aFuzzy;
if (!aBase->data()->version().empty())
theDumper << ", keepSubResults = True";
BooleanSmashPtr addSmash(const std::shared_ptr<ModelAPI_Document>& thePart,
const std::list<ModelHighAPI_Selection>& theMainObjects,
const std::list<ModelHighAPI_Selection>& theToolObjects,
- const ModelHighAPI_Double& fuzzyParam,
+ const ModelHighAPI_Double& theFuzzy,
const bool keepSubResults)
{
std::shared_ptr<ModelAPI_Feature> aFeature = thePart->addFeature(FeaturesAPI_BooleanSmash::ID());
if (!keepSubResults)
aFeature->data()->setVersion("");
- return BooleanSmashPtr(new FeaturesAPI_BooleanSmash(aFeature, theMainObjects, theToolObjects, fuzzyParam));
+ return BooleanSmashPtr(new FeaturesAPI_BooleanSmash(aFeature, theMainObjects, theToolObjects, theFuzzy));
}