-// Copyright (C) 2014-2022 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
: ModelHighAPI_Interface(theFeature)
{
if(initialize()) {
- bool aUseFuzzy = (theFuzzy.value() > 0);
- ModelHighAPI_Double aFuzzy = (aUseFuzzy ? theFuzzy : ModelHighAPI_Double(DEFAULT_FUZZY));
- fillAttribute(theBaseObjects, mybaseObjects);
- fillAttribute(aUseFuzzy, myuseFuzzy);
- fillAttribute(aFuzzy, myfuzzyParam);
+ fillAttribute(theBaseObjects, VAR_NAME(baseObjects));
+ 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();
}
}
//==================================================================================================
void FeaturesAPI_Partition::setBase(const std::list<ModelHighAPI_Selection>& theBaseObjects)
{
- fillAttribute(theBaseObjects, mybaseObjects);
+ fillAttribute(theBaseObjects, VAR_NAME(baseObjects));
execute();
}
//==================================================================================================
void FeaturesAPI_Partition::setUseFuzzy(bool theUseFuzzy)
{
- fillAttribute(theUseFuzzy, myuseFuzzy);
+ fillAttribute(theUseFuzzy, VAR_NAME(useFuzzy));
execute();
}
//==================================================================================================
void FeaturesAPI_Partition::setFuzzy(const ModelHighAPI_Double& theFuzzy)
{
- fillAttribute(theFuzzy, myfuzzyParam);
+ fillAttribute(theFuzzy, VAR_NAME(fuzzyParam));
execute();
}
AttributeSelectionListPtr anAttrObjects =
aBase->selectionList(FeaturesPlugin_Partition::BASE_OBJECTS_ID());
bool aUseFuzzy = aBase->boolean(FeaturesPlugin_Partition::USE_FUZZY_ID())->value();
- double aFuzzy = aBase->real(FeaturesPlugin_Partition::FUZZY_PARAM_ID())->value();
+ AttributeDoublePtr aFuzzy = aBase->real(FeaturesPlugin_Partition::FUZZY_PARAM_ID());
theDumper << aBase << " = model.addPartition(" << aDocName << ", " << anAttrObjects;
//==================================================================================================
PartitionPtr addPartition(const std::shared_ptr<ModelAPI_Document>& thePart,
const std::list<ModelHighAPI_Selection>& theBaseObjects,
- const ModelHighAPI_Double& fuzzyParam,
+ const ModelHighAPI_Double& theFuzzy,
const bool keepSubResults)
{
std::shared_ptr<ModelAPI_Feature> aFeature = thePart->addFeature(FeaturesAPI_Partition::ID());
if (!keepSubResults)
aFeature->data()->setVersion("");
- return PartitionPtr(new FeaturesAPI_Partition(aFeature, theBaseObjects, fuzzyParam));
+ return PartitionPtr(new FeaturesAPI_Partition(aFeature, theBaseObjects, theFuzzy));
}