X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_Fillet.cpp;h=2e55f8c0c2ae6e4b4975098b8a7af3c6bb5005f2;hb=4cb749258f33b7de231da5bb50140407c0599d30;hp=9507cad1a9970b0b557863383d559d498b114031;hpb=77d6e03555d0d46232e09ace4178f66f8c9b40ee;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_Fillet.cpp b/src/SketchPlugin/SketchPlugin_Fillet.cpp index 9507cad1a..2e55f8c0c 100644 --- a/src/SketchPlugin/SketchPlugin_Fillet.cpp +++ b/src/SketchPlugin/SketchPlugin_Fillet.cpp @@ -223,6 +223,18 @@ bool SketchPlugin_Fillet::calculateFilletParameters() if (anOwner && !anOwner->isExternal()) aFilletFeatures.insert(anOwner); } + // remove auxilary entities from set of coincident features + if (aFilletFeatures.size() > 2) { + std::set::iterator anIt = aFilletFeatures.begin(); + while (anIt != aFilletFeatures.end()) { + if ((*anIt)->boolean(SketchPlugin_SketchEntity::AUXILIARY_ID())->value()) { + std::set::iterator aRemoveIt = anIt++; + aFilletFeatures.erase(aRemoveIt); + } + else + ++anIt; + } + } if (aFilletFeatures.size() != 2) { setError("Error: Selected point does not have two suitable edges for fillet."); return false;