Salome HOME
Remove default values from properties requests
[modules/shaper.git] / src / SketchPlugin / SketchPlugin_Validators.cpp
index 5f89c141e793e407b88a327145763feb29861981..d42c783606ae58dc8d45bc5f5255c60d55d4c5a0 100755 (executable)
@@ -10,7 +10,7 @@
 #include "SketchPlugin_Circle.h"
 #include "SketchPlugin_ConstraintCoincidence.h"
 #include "SketchPlugin_ConstraintDistance.h"
-#include "SketchPlugin_ConstraintFillet.h"
+#include "SketchPlugin_Fillet.h"
 #include "SketchPlugin_ConstraintRigid.h"
 #include "SketchPlugin_ConstraintTangent.h"
 #include "SketchPlugin_Line.h"
@@ -48,7 +48,7 @@
 
 const double tolerance = 1.e-7;
 
-bool SketchPlugin_DistanceAttrValidator::isValid(const AttributePtr& theAttribute, 
+bool SketchPlugin_DistanceAttrValidator::isValid(const AttributePtr& theAttribute,
                                                  const std::list<std::string>& theArguments,
                                                  Events_InfoMessage& theError) const
 {
@@ -63,7 +63,8 @@ bool SketchPlugin_DistanceAttrValidator::isValid(const AttributePtr& theAttribut
   SessionPtr aMgr = ModelAPI_Session::get();
   ModelAPI_ValidatorsFactory* aFactory = aMgr->validators();
 
-  AttributeRefAttrPtr aRefAttr = std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(theAttribute);
+  AttributeRefAttrPtr aRefAttr = std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>
+                                                                      (theAttribute);
   bool isObject = aRefAttr->isObject();
   if (!isObject) {
     // an attribute is a point. A point value is valid always for the distance
@@ -72,8 +73,9 @@ bool SketchPlugin_DistanceAttrValidator::isValid(const AttributePtr& theAttribut
     // 1. check whether the references object is a linear
     ObjectPtr anObject = aRefAttr->object();
 
-    const ModelAPI_AttributeValidator* aShapeValidator = 
-      dynamic_cast<const ModelAPI_AttributeValidator*>(aFactory->validator("GeomValidators_ShapeType"));
+    const ModelAPI_AttributeValidator* aShapeValidator =
+      dynamic_cast<const ModelAPI_AttributeValidator*>(
+      aFactory->validator("GeomValidators_ShapeType"));
     std::list<std::string> anArguments;
     anArguments.push_back("circle");
     Events_InfoMessage aCircleError;
@@ -83,7 +85,7 @@ bool SketchPlugin_DistanceAttrValidator::isValid(const AttributePtr& theAttribut
       theError = "Circle can not be used in distance constraint";
       return false;
     }
-      
+
     anArguments.clear();
     anArguments.push_back("line");
     Events_InfoMessage aLineError;
@@ -107,58 +109,7 @@ bool SketchPlugin_DistanceAttrValidator::isValid(const AttributePtr& theAttribut
   return true;
 }
 
-static bool isCoincident(FeaturePtr theFeature1, FeaturePtr theFeature2)
-{
-  AttributePtr aFeature1PointAttr[2];
-  if(theFeature1->getKind() == SketchPlugin_Line::ID()) {
-    aFeature1PointAttr[0] = theFeature1->attribute(SketchPlugin_Line::START_ID());
-    aFeature1PointAttr[1] = theFeature1->attribute(SketchPlugin_Line::END_ID());
-  } else if(theFeature1->getKind() == SketchPlugin_Arc::ID()) {
-    aFeature1PointAttr[0] = theFeature1->attribute(SketchPlugin_Arc::START_ID());
-    aFeature1PointAttr[1] = theFeature1->attribute(SketchPlugin_Arc::END_ID());
-  }
-
-  std::set<AttributePtr> aRefsList = theFeature1->data()->refsToMe();
-  for(std::set<AttributePtr>::const_iterator aRefIt = aRefsList.begin();
-      aRefIt != aRefsList.end();
-      ++aRefIt) {
-    // Find constraint 
-    FeaturePtr aRefFeature = std::dynamic_pointer_cast<ModelAPI_Feature>((*aRefIt)->owner());
-    if(aRefFeature->getKind() != SketchPlugin_ConstraintCoincidence::ID())
-      continue;
-    AttributeRefAttrPtr aRefAttr = std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(*aRefIt);
-    AttributePtr anAttr = aRefAttr->attr();
-    if(anAttr != aFeature1PointAttr[0] && anAttr != aFeature1PointAttr[1])
-      continue;
-
-    // Get coincides from constraint.
-    std::set<FeaturePtr> aCoinsides;
-    SketchPlugin_Tools::findCoincidences(aRefFeature,
-                                         SketchPlugin_ConstraintCoincidence::ENTITY_A(),
-                                         aCoinsides);
-    SketchPlugin_Tools::findCoincidences(aRefFeature,
-                                         SketchPlugin_ConstraintCoincidence::ENTITY_B(),
-                                         aCoinsides);
-
-    if(aCoinsides.find(theFeature2) != aCoinsides.end()) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-static bool hasCoincidentPoint(FeaturePtr theFeature1, FeaturePtr theFeature2)
-{
-  if(theFeature1->getKind() == SketchPlugin_Circle::ID() ||
-      theFeature2->getKind() == SketchPlugin_Circle::ID()) {
-    return false;
-  }
-
-  return (isCoincident(theFeature1, theFeature2) && isCoincident(theFeature2, theFeature1));
-}
-
-bool SketchPlugin_TangentAttrValidator::isValid(const AttributePtr& theAttribute, 
+bool SketchPlugin_TangentAttrValidator::isValid(const AttributePtr& theAttribute,
                                                 const std::list<std::string>& theArguments,
                                                 Events_InfoMessage& theError) const
 {
@@ -173,8 +124,10 @@ bool SketchPlugin_TangentAttrValidator::isValid(const AttributePtr& theAttribute
   SessionPtr aMgr = ModelAPI_Session::get();
   ModelAPI_ValidatorsFactory* aFactory = aMgr->validators();
 
-  FeaturePtr anAttributeFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(theAttribute->owner());
-  AttributeRefAttrPtr aRefAttr = std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(theAttribute);
+  FeaturePtr anAttributeFeature =
+    std::dynamic_pointer_cast<ModelAPI_Feature>(theAttribute->owner());
+  AttributeRefAttrPtr aRefAttr =
+    std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(theAttribute);
 
   bool isObject = aRefAttr->isObject();
   ObjectPtr anObject = aRefAttr->object();
@@ -187,11 +140,6 @@ bool SketchPlugin_TangentAttrValidator::isValid(const AttributePtr& theAttribute
     if (!aOtherFea)
       return true;
 
-    if ((aRefFea->getKind() == SketchPlugin_Arc::ID() ||
-        aOtherFea->getKind() == SketchPlugin_Arc::ID()) &&
-        !hasCoincidentPoint(aRefFea, aOtherFea))
-      return false;
-
     if (aRefFea->getKind() == SketchPlugin_Line::ID()) {
       if (aOtherFea->getKind() != SketchPlugin_Arc::ID() &&
           aOtherFea->getKind() != SketchPlugin_Circle::ID()) {
@@ -201,20 +149,15 @@ bool SketchPlugin_TangentAttrValidator::isValid(const AttributePtr& theAttribute
         return false;
       }
     }
-    else if (aRefFea->getKind() == SketchPlugin_Arc::ID()) {
+    else if (aRefFea->getKind() == SketchPlugin_Arc::ID() ||
+             aRefFea->getKind() == SketchPlugin_Circle::ID()) {
       if (aOtherFea->getKind() != SketchPlugin_Line::ID() &&
-        aOtherFea->getKind() != SketchPlugin_Arc::ID()) {
-        theError = "It refers to an %1, but %2 is not a %3 or an %4";
+          aOtherFea->getKind() != SketchPlugin_Arc::ID() &&
+          aOtherFea->getKind() != SketchPlugin_Circle::ID()) {
+        theError = "It refers to an %1, but %2 is not a %3 or an %4 or a %5";
         theError.arg(SketchPlugin_Arc::ID()).arg(aParamA)
-            .arg(SketchPlugin_Line::ID()).arg(SketchPlugin_Arc::ID());
-        return false;
-      }
-    }
-    else if (aRefFea->getKind() == SketchPlugin_Circle::ID()) {
-      if (aOtherFea->getKind() != SketchPlugin_Line::ID()) {
-        theError = "It refers to an %1, but %2 is not a %3";
-        theError.arg(SketchPlugin_Circle::ID()).arg(aParamA)
-            .arg(SketchPlugin_Line::ID());
+            .arg(SketchPlugin_Line::ID()).arg(SketchPlugin_Arc::ID())
+            .arg(SketchPlugin_Circle::ID());
         return false;
       }
     }
@@ -279,7 +222,7 @@ bool SketchPlugin_NotFixedValidator::isValid(const AttributePtr& theAttribute,
   return true;
 }
 
-bool SketchPlugin_EqualAttrValidator::isValid(const AttributePtr& theAttribute, 
+bool SketchPlugin_EqualAttrValidator::isValid(const AttributePtr& theAttribute,
                                               const std::list<std::string>& theArguments,
                                               Events_InfoMessage& theError) const
 {
@@ -336,7 +279,7 @@ bool SketchPlugin_EqualAttrValidator::isValid(const AttributePtr& theAttribute,
   return true;
 }
 
-bool SketchPlugin_MirrorAttrValidator::isValid(const AttributePtr& theAttribute, 
+bool SketchPlugin_MirrorAttrValidator::isValid(const AttributePtr& theAttribute,
                                                const std::list<std::string>& theArguments,
                                                Events_InfoMessage& theError) const
 {
@@ -367,7 +310,7 @@ bool SketchPlugin_MirrorAttrValidator::isValid(const AttributePtr& theAttribute,
   return true;
 }
 
-bool SketchPlugin_CoincidenceAttrValidator::isValid(const AttributePtr& theAttribute, 
+bool SketchPlugin_CoincidenceAttrValidator::isValid(const AttributePtr& theAttribute,
                                                     const std::list<std::string>& theArguments,
                                                     Events_InfoMessage& theError) const
 {
@@ -390,7 +333,8 @@ bool SketchPlugin_CoincidenceAttrValidator::isValid(const AttributePtr& theAttri
     return false;
   }
 
-  AttributeRefAttrPtr aRefAttrB = std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(theAttribute);
+  AttributeRefAttrPtr aRefAttrB =
+    std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(theAttribute);
 
   // first attribute is a point, it may coincide with any object
   if (!aRefAttrA->isObject())
@@ -431,7 +375,7 @@ bool SketchPlugin_CoincidenceAttrValidator::isValid(const AttributePtr& theAttri
 }
 
 
-bool SketchPlugin_CopyValidator::isValid(const AttributePtr& theAttribute, 
+bool SketchPlugin_CopyValidator::isValid(const AttributePtr& theAttribute,
                                          const std::list<std::string>& theArguments,
                                          Events_InfoMessage& theError) const
 {
@@ -442,7 +386,7 @@ bool SketchPlugin_CopyValidator::isValid(const AttributePtr& theAttribute,
   }
 
   FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(theAttribute->owner());
-  AttributeRefListPtr aSelAttr = 
+  AttributeRefListPtr aSelAttr =
     std::dynamic_pointer_cast<ModelAPI_AttributeRefList>(theAttribute);
 
   AttributeRefListPtr aRefListOfInitial = std::dynamic_pointer_cast<ModelAPI_AttributeRefList>(
@@ -473,9 +417,10 @@ bool SketchPlugin_CopyValidator::isValid(const AttributePtr& theAttribute,
   return true;
 }
 
-bool SketchPlugin_SolverErrorValidator::isValid(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                                const std::list<std::string>& theArguments,
-                                                Events_InfoMessage& theError) const
+bool SketchPlugin_SolverErrorValidator::isValid(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature,
+  const std::list<std::string>& theArguments,
+  Events_InfoMessage& theError) const
 {
   AttributeStringPtr aAttributeString = theFeature->string(SketchPlugin_Sketch::SOLVER_ERROR());
 
@@ -487,14 +432,17 @@ bool SketchPlugin_SolverErrorValidator::isValid(const std::shared_ptr<ModelAPI_F
   return true;
 }
 
-bool SketchPlugin_SolverErrorValidator::isNotObligatory(std::string theFeature, std::string theAttribute)
+bool SketchPlugin_SolverErrorValidator::isNotObligatory(std::string theFeature,
+                                                        std::string theAttribute)
 {
   return true;
 }
 
-static bool hasSameTangentFeature(const std::set<AttributePtr>& theRefsList, const FeaturePtr theFeature)
+static bool hasSameTangentFeature(const std::set<AttributePtr>& theRefsList,
+                                  const FeaturePtr theFeature)
 {
-  for(std::set<AttributePtr>::const_iterator anIt = theRefsList.cbegin(); anIt != theRefsList.cend(); ++anIt) {
+  for(std::set<AttributePtr>::const_iterator
+      anIt = theRefsList.cbegin(); anIt != theRefsList.cend(); ++anIt) {
     std::shared_ptr<ModelAPI_Attribute> aAttr = (*anIt);
     FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aAttr->owner());
     if (aFeature->getKind() == SketchPlugin_ConstraintTangent::ID()) {
@@ -535,176 +483,163 @@ bool SketchPlugin_FilletVertexValidator::isValid(const AttributePtr& theAttribut
                                                  const std::list<std::string>& theArguments,
                                                  Events_InfoMessage& theError) const
 {
-  std::shared_ptr<SketchPlugin_ConstraintFillet> aFilletFeature = std::dynamic_pointer_cast<SketchPlugin_ConstraintFillet>(theAttribute->owner());
-  AttributeRefAttrListPtr aPointsRefList = std::dynamic_pointer_cast<ModelAPI_AttributeRefAttrList>(theAttribute);
-  if(aPointsRefList->size() == 0) {
-    theError = "Error: List of points is empty.";
+  AttributeRefAttrPtr aPointRefAttr =
+    std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(theAttribute);
+  if(!aPointRefAttr.get()) {
+    theError = "Error: Point not selected.";
     return false;
   }
 
-  std::map<AttributePtr, SketchPlugin_ConstraintFillet::FilletFeatures> aPointsFeaturesMap = aFilletFeature->pointsFeaturesMap();
-  std::set<AttributePtr> aSetOfPointsOnResultEdges;
-  for(std::map<AttributePtr, SketchPlugin_ConstraintFillet::FilletFeatures>::iterator aPointsIter = aPointsFeaturesMap.begin();
-      aPointsIter != aPointsFeaturesMap.end();
-      ++aPointsIter) {
-    const SketchPlugin_ConstraintFillet::FilletFeatures& aFeatures = aPointsIter->second;
-    const std::list<FeaturePtr>& aResultEdges = aFeatures.resultEdges;
-    for(std::list<FeaturePtr>::const_iterator aResultIter = aResultEdges.cbegin();
-        aResultIter != aResultEdges.cend();
-        ++aResultIter) {
-      FeaturePtr aResultFeature = *aResultIter;
-      if(aResultFeature->getKind() == SketchPlugin_Line::ID()) {
-        aSetOfPointsOnResultEdges.insert(aResultFeature->attribute(SketchPlugin_Line::START_ID()));
-        aSetOfPointsOnResultEdges.insert(aResultFeature->attribute(SketchPlugin_Line::END_ID()));
-      } else if(aResultFeature->getKind() == SketchPlugin_Arc::ID()) {
-        aSetOfPointsOnResultEdges.insert(aResultFeature->attribute(SketchPlugin_Arc::START_ID()));
-        aSetOfPointsOnResultEdges.insert(aResultFeature->attribute(SketchPlugin_Arc::END_ID()));
-      }
-    }
+  AttributePtr aPointAttribute = aPointRefAttr->attr();
+  if (!aPointAttribute.get()) {
+    theError = "Error: Bad point selected.";
+    return false;
   }
+  std::shared_ptr<GeomAPI_Pnt2d> aSelectedPnt =
+    std::dynamic_pointer_cast<GeomDataAPI_Point2D>(aPointAttribute)->pnt();
 
-  std::list<std::pair<ObjectPtr, AttributePtr>> aPointsList = aPointsRefList->list();
-  for(std::list<std::pair<ObjectPtr, AttributePtr>>::const_iterator aPointsIt = aPointsList.cbegin(); aPointsIt != aPointsList.cend(); aPointsIt++) {
-    ObjectPtr anObject = (*aPointsIt).first;
-    AttributePtr aPointAttribute = (*aPointsIt).second;
-    if (!aPointAttribute.get())
-        return false;
-    std::shared_ptr<GeomAPI_Pnt2d> aSelectedPnt = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(aPointAttribute)->pnt();
-
-    // If we alredy have some result then:
-    // - if it is the same point all ok, just skip it
-    // - if it is point on the fillet result edge then it is not valid
-    if(!aPointsFeaturesMap.empty()) {
-      if(aPointsFeaturesMap.find(aPointAttribute) != aPointsFeaturesMap.end()) {
-        continue;
-      }
-
-      // Check that selected point not on the one of the fillet result edge.
-      if(aSetOfPointsOnResultEdges.find(aPointAttribute) != aSetOfPointsOnResultEdges.end()) {
-        return false;
-      }
-    }
-
-    // Obtain constraint coincidence for the fillet point.
-    const std::set<AttributePtr>& aRefsList = aPointAttribute->owner()->data()->refsToMe();
-    FeaturePtr aConstraintCoincidence;
-    for(std::set<AttributePtr>::const_iterator anIt = aRefsList.cbegin(); anIt != aRefsList.cend(); ++anIt) {
-      std::shared_ptr<ModelAPI_Attribute> aAttr = (*anIt);
-      FeaturePtr aConstrFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aAttr->owner());
-      if (aConstrFeature->getKind() == SketchPlugin_ConstraintCoincidence::ID()) {
-        AttributeRefAttrPtr anAttrRefA = std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(
-          aConstrFeature->attribute(SketchPlugin_ConstraintCoincidence::ENTITY_A()));
-        AttributeRefAttrPtr anAttrRefB = std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(
-          aConstrFeature->attribute(SketchPlugin_ConstraintCoincidence::ENTITY_B()));
-        if(anAttrRefA.get() && !anAttrRefA->isObject()) {
-          AttributePtr anAttrA = anAttrRefA->attr();
-          if(aPointAttribute == anAttrA) {
-            aConstraintCoincidence = aConstrFeature;
-            break;
-          }
+  // Obtain constraint coincidence for the fillet point.
+  const std::set<AttributePtr>& aRefsList = aPointAttribute->owner()->data()->refsToMe();
+  FeaturePtr aConstraintCoincidence;
+  for(std::set<AttributePtr>::const_iterator anIt = aRefsList.cbegin();
+      anIt != aRefsList.cend(); ++anIt) {
+    std::shared_ptr<ModelAPI_Attribute> aAttr = (*anIt);
+    FeaturePtr aConstrFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aAttr->owner());
+    if (aConstrFeature->getKind() == SketchPlugin_ConstraintCoincidence::ID()) {
+      AttributeRefAttrPtr anAttrRefA = std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(
+        aConstrFeature->attribute(SketchPlugin_ConstraintCoincidence::ENTITY_A()));
+      AttributeRefAttrPtr anAttrRefB = std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(
+        aConstrFeature->attribute(SketchPlugin_ConstraintCoincidence::ENTITY_B()));
+      if(anAttrRefA.get() && !anAttrRefA->isObject()) {
+        AttributePtr anAttrA = anAttrRefA->attr();
+        if(aPointAttribute == anAttrA) {
+          aConstraintCoincidence = aConstrFeature;
+          break;
         }
-        if(anAttrRefB.get() && !anAttrRefB->isObject()) {
-          AttributePtr anAttrB = anAttrRefB->attr();
-          if(aPointAttribute == anAttrB) {
-            aConstraintCoincidence = aConstrFeature;
-            break;
-          }
+      }
+      if(anAttrRefB.get() && !anAttrRefB->isObject()) {
+        AttributePtr anAttrB = anAttrRefB->attr();
+        if(aPointAttribute == anAttrB) {
+          aConstraintCoincidence = aConstrFeature;
+          break;
         }
       }
     }
+  }
 
-    if(!aConstraintCoincidence.get()) {
-      theError = "Error: one of the selected point does not have coicidence.";
-      return false;
-    }
+  if(!aConstraintCoincidence.get()) {
+    theError = "Error: one of the selected point does not have coicidence.";
+    return false;
+  }
 
-    // Get coincides from constraint.
-    std::set<FeaturePtr> aCoinsides;
-    SketchPlugin_Tools::findCoincidences(aConstraintCoincidence,
-                                         SketchPlugin_ConstraintCoincidence::ENTITY_A(),
-                                         aCoinsides);
-    SketchPlugin_Tools::findCoincidences(aConstraintCoincidence,
-                                         SketchPlugin_ConstraintCoincidence::ENTITY_B(),
-                                         aCoinsides);
-
-    // Remove points from set of coincides.
-    std::set<FeaturePtr> aNewSetOfCoincides;
-    for(std::set<FeaturePtr>::iterator anIt = aCoinsides.begin(); anIt != aCoinsides.end(); ++anIt) {
-      if((*anIt)->getKind() != SketchPlugin_Line::ID() &&
-         (*anIt)->getKind() != SketchPlugin_Arc::ID()) {
-           continue;
-      }
-      if((*anIt)->getKind() == SketchPlugin_Arc::ID()) {
-        AttributePtr anArcCenter = (*anIt)->attribute(SketchPlugin_Arc::CENTER_ID());
-        std::shared_ptr<GeomAPI_Pnt2d> anArcCenterPnt = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(anArcCenter)->pnt();
-        double aDistSelectedArcCenter = aSelectedPnt->distance(anArcCenterPnt);
-        if(aDistSelectedArcCenter < tolerance) {
+  // Get coincides from constraint.
+  std::set<FeaturePtr> aCoinsides;
+  SketchPlugin_Tools::findCoincidences(aConstraintCoincidence,
+                                        SketchPlugin_ConstraintCoincidence::ENTITY_A(),
+                                        aCoinsides);
+  SketchPlugin_Tools::findCoincidences(aConstraintCoincidence,
+                                        SketchPlugin_ConstraintCoincidence::ENTITY_B(),
+                                        aCoinsides);
+
+  // Remove points from set of coincides.
+  std::set<FeaturePtr> aNewSetOfCoincides;
+  for(std::set<FeaturePtr>::iterator anIt = aCoinsides.begin();
+      anIt != aCoinsides.end(); ++anIt) {
+    std::shared_ptr<SketchPlugin_SketchEntity> aSketchEntity =
+      std::dynamic_pointer_cast<SketchPlugin_SketchEntity>(*anIt);
+    if(aSketchEntity.get() && aSketchEntity->isCopy()) {
+      continue;
+    }
+    if((*anIt)->getKind() != SketchPlugin_Line::ID() &&
+        (*anIt)->getKind() != SketchPlugin_Arc::ID()) {
           continue;
-        }
+    }
+    if((*anIt)->getKind() == SketchPlugin_Arc::ID()) {
+      AttributePtr anArcCenter = (*anIt)->attribute(SketchPlugin_Arc::CENTER_ID());
+      std::shared_ptr<GeomAPI_Pnt2d> anArcCenterPnt =
+        std::dynamic_pointer_cast<GeomDataAPI_Point2D>(anArcCenter)->pnt();
+      double aDistSelectedArcCenter = aSelectedPnt->distance(anArcCenterPnt);
+      if(aDistSelectedArcCenter < tolerance) {
+        continue;
       }
-      aNewSetOfCoincides.insert(*anIt);
     }
-    aCoinsides = aNewSetOfCoincides;
+    aNewSetOfCoincides.insert(*anIt);
+  }
+  aCoinsides = aNewSetOfCoincides;
 
-    // If we still have more than two coincides remove auxilary entities from set of coincides.
-    if(aCoinsides.size() > 2) {
-      aNewSetOfCoincides.clear();
-      for(std::set<FeaturePtr>::iterator anIt = aCoinsides.begin(); anIt != aCoinsides.end(); ++anIt) {
-        if(!(*anIt)->boolean(SketchPlugin_SketchEntity::AUXILIARY_ID())->value()) {
-          aNewSetOfCoincides.insert(*anIt);
-        }
+  // If we still have more than two coincides remove auxilary entities from set of coincides.
+  if(aCoinsides.size() > 2) {
+    aNewSetOfCoincides.clear();
+    for(std::set<FeaturePtr>::iterator anIt = aCoinsides.begin();
+        anIt != aCoinsides.end(); ++anIt) {
+      if(!(*anIt)->boolean(SketchPlugin_SketchEntity::AUXILIARY_ID())->value()) {
+        aNewSetOfCoincides.insert(*anIt);
       }
-      aCoinsides = aNewSetOfCoincides;
     }
+    aCoinsides = aNewSetOfCoincides;
+  }
 
-    if(aCoinsides.size() != 2) {
-      theError = "Error: One of the selected points does not have two suitable edges for fillet.";
-      return false;
-    }
+  if(aCoinsides.size() != 2) {
+    theError = "Error: One of the selected points does not have two suitable edges for fillet.";
+    return false;
+  }
+
+  // Check that selected edges don't have tangent constraint.
+  std::set<FeaturePtr>::iterator anIt = aCoinsides.begin();
+  FeaturePtr aFirstFeature = *anIt++;
+  FeaturePtr aSecondFeature = *anIt;
+  const std::set<AttributePtr>& aFirstFeatureRefsList = aFirstFeature->data()->refsToMe();
+  if(hasSameTangentFeature(aFirstFeatureRefsList, aSecondFeature)) {
+    theError = "Error: Edges in selected point has tangent constraint.";
+    return false;
+  }
 
-    // Check that selected edges don't have tangent constraint.
-    std::set<FeaturePtr>::iterator anIt = aCoinsides.begin();
-    FeaturePtr aFirstFeature = *anIt++;
-    FeaturePtr aSecondFeature = *anIt;
-    const std::set<AttributePtr>& aFirstFeatureRefsList = aFirstFeature->data()->refsToMe();
-    if(hasSameTangentFeature(aFirstFeatureRefsList, aSecondFeature)) {
+  std::list<ResultPtr> aFirstResults = aFirstFeature->results();
+  for(std::list<ResultPtr>::iterator aResIt = aFirstResults.begin();
+      aResIt != aFirstResults.end(); ++aResIt) {
+    ResultPtr aRes = *aResIt;
+    const std::set<AttributePtr>& aResRefsList = aRes->data()->refsToMe();
+    if(hasSameTangentFeature(aResRefsList, aSecondFeature)) {
       theError = "Error: Edges in selected point has tangent constraint.";
       return false;
     }
+  }
 
-    std::list<ResultPtr> aFirstResults = aFirstFeature->results();
-    for(std::list<ResultPtr>::iterator aResIt = aFirstResults.begin(); aResIt != aFirstResults.end(); ++aResIt) {
-      ResultPtr aRes = *aResIt;
-      const std::set<AttributePtr>& aResRefsList = aRes->data()->refsToMe();
-      if(hasSameTangentFeature(aResRefsList, aSecondFeature)) {
-        theError = "Error: Edges in selected point has tangent constraint.";
-        return false;
-      }
-    }
-
-    // Check that lines not collinear
-    if(aFirstFeature->getKind() == SketchPlugin_Line::ID() && aSecondFeature->getKind() == SketchPlugin_Line::ID()) {
-      std::string aStartAttr = SketchPlugin_Line::START_ID();
-      std::string anEndAttr = SketchPlugin_Line::END_ID();
-      std::shared_ptr<GeomAPI_Pnt2d> aFirstStartPnt, aFirstEndPnt, aSecondStartPnt, aSecondEndPnt;
-      aFirstStartPnt = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(aFirstFeature->attribute(aStartAttr))->pnt();
-      aFirstEndPnt = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(aFirstFeature->attribute(anEndAttr))->pnt();
-      aSecondStartPnt = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(aSecondFeature->attribute(aStartAttr))->pnt();
-      aSecondEndPnt = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(aSecondFeature->attribute(anEndAttr))->pnt();
-      double aCheck1 = abs((aFirstEndPnt->x() - aFirstStartPnt->x()) * (aSecondStartPnt->y() - aFirstStartPnt->y()) -
-        (aSecondStartPnt->x() - aFirstStartPnt->x()) * (aFirstEndPnt->y() - aFirstStartPnt->y()));
-      double aCheck2 = abs((aFirstEndPnt->x() - aFirstStartPnt->x()) * (aSecondEndPnt->y() - aFirstStartPnt->y()) -
-        (aSecondEndPnt->x() - aFirstStartPnt->x()) * (aFirstEndPnt->y() - aFirstStartPnt->y()));
-      if(aCheck1 < 1.e-7 && aCheck2 < 1.e-7) {
-        return false;
-      }
+  // Check that lines not collinear
+  if(aFirstFeature->getKind() == SketchPlugin_Line::ID() &&
+      aSecondFeature->getKind() == SketchPlugin_Line::ID()) {
+    std::string aStartAttr = SketchPlugin_Line::START_ID();
+    std::string anEndAttr = SketchPlugin_Line::END_ID();
+    std::shared_ptr<GeomAPI_Pnt2d> aFirstStartPnt, aFirstEndPnt, aSecondStartPnt, aSecondEndPnt;
+    aFirstStartPnt =
+      std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
+      aFirstFeature->attribute(aStartAttr))->pnt();
+    aFirstEndPnt =
+      std::dynamic_pointer_cast<GeomDataAPI_Point2D>(aFirstFeature->attribute(anEndAttr))->pnt();
+    aSecondStartPnt =
+      std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
+      aSecondFeature->attribute(aStartAttr))->pnt();
+    aSecondEndPnt =
+      std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
+      aSecondFeature->attribute(anEndAttr))->pnt();
+    double aCheck1 =
+      fabs((aFirstEndPnt->x() - aFirstStartPnt->x()) *
+      (aSecondStartPnt->y() - aFirstStartPnt->y()) -
+      (aSecondStartPnt->x() - aFirstStartPnt->x()) * (aFirstEndPnt->y() - aFirstStartPnt->y()));
+    double aCheck2 =
+      fabs((aFirstEndPnt->x() - aFirstStartPnt->x()) *
+      (aSecondEndPnt->y() - aFirstStartPnt->y()) -
+      (aSecondEndPnt->x() - aFirstStartPnt->x()) * (aFirstEndPnt->y() - aFirstStartPnt->y()));
+    if(aCheck1 < 1.e-7 && aCheck2 < 1.e-7) {
+      return false;
     }
   }
 
+
   return true;
 }
 
-bool SketchPlugin_MiddlePointAttrValidator::isValid(const AttributePtr& theAttribute, 
+bool SketchPlugin_MiddlePointAttrValidator::isValid(const AttributePtr& theAttribute,
                                                     const std::list<std::string>& theArguments,
                                                     Events_InfoMessage& theError) const
 {
@@ -719,7 +654,8 @@ bool SketchPlugin_MiddlePointAttrValidator::isValid(const AttributePtr& theAttri
   SessionPtr aMgr = ModelAPI_Session::get();
   ModelAPI_ValidatorsFactory* aFactory = aMgr->validators();
 
-  FeaturePtr anAttributeFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(theAttribute->owner());
+  FeaturePtr anAttributeFeature =
+    std::dynamic_pointer_cast<ModelAPI_Feature>(theAttribute->owner());
   AttributeRefAttrPtr aRefAttr = std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(theAttribute);
   AttributeRefAttrPtr anOtherAttr = anAttributeFeature->data()->refattr(aParamA);
 
@@ -820,11 +756,12 @@ bool SketchPlugin_IntersectionValidator::isValid(const AttributePtr& theAttribut
     return false;
   }
   AttributeSelectionPtr aLineAttr =
-                              std::dynamic_pointer_cast<ModelAPI_AttributeSelection>(theAttribute);
+                       std::dynamic_pointer_cast<ModelAPI_AttributeSelection>(theAttribute);
   std::shared_ptr<GeomAPI_Edge> anEdge;
   if(aLineAttr && aLineAttr->value() && aLineAttr->value()->isEdge()) {
     anEdge = std::shared_ptr<GeomAPI_Edge>(new GeomAPI_Edge(aLineAttr->value()));
-  } else if(aLineAttr->context() && aLineAttr->context()->shape() && aLineAttr->context()->shape()->isEdge()) {
+  } else if(aLineAttr->context() &&
+            aLineAttr->context()->shape() && aLineAttr->context()->shape()->isEdge()) {
     anEdge = std::shared_ptr<GeomAPI_Edge>(new GeomAPI_Edge(aLineAttr->context()->shape()));
   }
 
@@ -882,21 +819,22 @@ bool SketchPlugin_SplitValidator::isValid(const AttributePtr& theAttribute,
       aKind == SketchPlugin_Arc::ID() ||
       aKind == SketchPlugin_Circle::ID()) {
 
-    std::set<GeomShapePtr> anEdgeShapes;
+    std::set<ResultPtr> anEdgeShapes;
     ModelAPI_Tools::shapesOfType(anAttrFeature, GeomAPI_Shape::EDGE, anEdgeShapes);
     if (anEdgeShapes.empty() || anEdgeShapes.size() > 1 /*there case has not existed yet*/)
       return aValid;
 
     // coincidences to the feature
     std::set<std::shared_ptr<GeomDataAPI_Point2D> > aRefAttributes;
-    ModelGeomAlgo_Point2D::getPointsOfReference(anAttrFeature, SketchPlugin_ConstraintCoincidence::ID(),
-                         aRefAttributes, SketchPlugin_Point::ID(), SketchPlugin_Point::COORD_ID());
+    ModelGeomAlgo_Point2D::getPointsOfReference(anAttrFeature,
+                        SketchPlugin_ConstraintCoincidence::ID(),
+                        aRefAttributes, SketchPlugin_Point::ID(), SketchPlugin_Point::COORD_ID());
 
-    GeomShapePtr anAttrShape = *anEdgeShapes.begin();
+    GeomShapePtr anAttrShape = (*anEdgeShapes.begin())->shape();
     std::shared_ptr<SketchPlugin_Feature> aSFeature =
                                  std::dynamic_pointer_cast<SketchPlugin_Feature>(anAttrFeature);
     SketchPlugin_Sketch* aSketch = aSFeature->sketch();
-    
+
     std::shared_ptr<ModelAPI_Data> aData = aSketch->data();
     std::shared_ptr<GeomDataAPI_Point> aC = std::dynamic_pointer_cast<GeomDataAPI_Point>(
         aData->attribute(SketchPlugin_Sketch::ORIGIN_ID()));
@@ -905,13 +843,15 @@ bool SketchPlugin_SplitValidator::isValid(const AttributePtr& theAttribute,
     std::shared_ptr<GeomDataAPI_Dir> aNorm = std::dynamic_pointer_cast<GeomDataAPI_Dir>(
         aData->attribute(SketchPlugin_Sketch::NORM_ID()));
     std::shared_ptr<GeomAPI_Dir> aDirY(new GeomAPI_Dir(aNorm->dir()->cross(aX->dir())));
-    
-    std::list<std::shared_ptr<GeomAPI_Pnt> > aPoints;
-    std::map<std::shared_ptr<GeomDataAPI_Point2D>, std::shared_ptr<GeomAPI_Pnt> > aPointToAttributes;
-    ModelGeomAlgo_Point2D::getPointsInsideShape(anAttrShape, aRefAttributes, aC->pnt(),
-                                                aX->dir(), aDirY, aPoints, aPointToAttributes);
 
-    int aCoincidentToFeature = (int)aPoints.size();
+    typedef std::map<std::shared_ptr<GeomAPI_Pnt>,
+                     std::pair<std::list<std::shared_ptr<GeomDataAPI_Point2D> >,
+                               std::list<std::shared_ptr<ModelAPI_Object> > > > PointToRefsMap;
+    PointToRefsMap aPointsInfo;
+
+    ModelGeomAlgo_Point2D::getPointsInsideShape(anAttrShape, aRefAttributes, aC->pnt(),
+                                                aX->dir(), aDirY, aPointsInfo);
+    int aCoincidentToFeature = (int)aPointsInfo.size();
     if (aKind == SketchPlugin_Circle::ID())
       aValid = aCoincidentToFeature >= 2;
     else