Fix for the issue #2753 : error when dump/load script

[modules/shaper.git] / src / SketchPlugin / SketchPlugin_Fillet.cpp

diff --git a/src/SketchPlugin/SketchPlugin_Fillet.cpp b/src/SketchPlugin/SketchPlugin_Fillet.cpp
index 106b3a7cf45b5441efbd6a6291c5347fe9676f77..3373df8c6df0504ea4a39d8531c6cb8e5c534a10 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_Fillet.cpp
+++ b/src/SketchPlugin/SketchPlugin_Fillet.cpp
@@ -203,8 +203,17 @@ bool SketchPlugin_Fillet::calculateFilletParameters()
   if (!aFilletPoint2D.get())
     return false;
 
-  std::set<FeaturePtr> aFilletFeatures =
-      SketchPlugin_Tools::findFeaturesCoincidentToPoint(aFilletPoint2D);
+  std::set<AttributePoint2DPtr> aCoincidentPoints =
+      SketchPlugin_Tools::findPointsCoincidentToPoint(aFilletPoint2D);
+  std::set<FeaturePtr> aFilletFeatures;
+  for (std::set<AttributePoint2DPtr>::iterator aCPIt = aCoincidentPoints.begin();
+       aCPIt != aCoincidentPoints.end(); ++aCPIt) {
+    std::shared_ptr<SketchPlugin_Feature> anOwner =
+        std::dynamic_pointer_cast<SketchPlugin_Feature>(
+        ModelAPI_Feature::feature((*aCPIt)->owner()));
+    if (anOwner && !anOwner->isExternal())
+      aFilletFeatures.insert(anOwner);
+  }
   if (aFilletFeatures.size() != 2) {
     setError("Error: Selected point does not have two suitable edges for fillet.");
     return false;
@@ -556,7 +565,7 @@ double calculateFilletRadius(FeaturePtr theFilletFeatures[2])
     if (anEdge)
       aLengths[i] = anEdge->length();
   }
-  return std::min(aLengths[0], aLengths[1]) / 6.0;
+  return (aLengths[0] < aLengths[1] ? aLengths[0] : aLengths[1]) / 6.0;
 }
 
 std::set<FeaturePtr> findFeaturesToRemove(const FeaturePtr theFeature,