Salome HOME
Issue #19187: B-Splines - Crash with specific scenario
[modules/shaper.git] / src / SketchPlugin / SketchPlugin_Validators.cpp
index 1d62d8f2418824f22a9c718e5750de700f11d508..9feba7df8772bba8cba3aa638643262b508a9bee 100644 (file)
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2020  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 "SketchPlugin_Validators.h"
 
 #include "SketchPlugin_Arc.h"
+#include "SketchPlugin_BSpline.h"
+#include "SketchPlugin_BSplinePeriodic.h"
 #include "SketchPlugin_Circle.h"
 #include "SketchPlugin_ConstraintCoincidence.h"
+#include "SketchPlugin_ConstraintCoincidenceInternal.h"
 #include "SketchPlugin_ConstraintDistance.h"
 #include "SketchPlugin_ConstraintRigid.h"
 #include "SketchPlugin_ConstraintTangent.h"
 #include "SketchPlugin_Ellipse.h"
+#include "SketchPlugin_EllipticArc.h"
 #include "SketchPlugin_Fillet.h"
 #include "SketchPlugin_Line.h"
 #include "SketchPlugin_MacroArc.h"
 #include <GeomAPI_Lin.h>
 #include <GeomAPI_Edge.h>
 #include <GeomAPI_Vertex.h>
+
 #include <GeomDataAPI_Point2D.h>
+#include <GeomDataAPI_Point2DArray.h>
 
 #include <algorithm>
 #include <cmath>
 
+#ifdef _MSC_VER
+#pragma warning(disable: 4100)
+#endif
+
 const double tolerance = 1.e-7;
 
+static bool isSpline(FeaturePtr theFeature)
+{
+  return theFeature && (theFeature->getKind() == SketchPlugin_BSpline::ID() ||
+                        theFeature->getKind() == SketchPlugin_BSplinePeriodic::ID());
+}
+
+
 bool SketchPlugin_DistanceAttrValidator::isValid(const AttributePtr& theAttribute,
                                                  const std::list<std::string>& theArguments,
                                                  Events_InfoMessage& theError) const
@@ -144,8 +161,6 @@ bool SketchPlugin_TangentAttrValidator::isValid(const AttributePtr& theAttribute
 
   // there is a check whether the feature contains a point and a linear edge or two point values
   std::string aParamA = theArguments.front();
-  SessionPtr aMgr = ModelAPI_Session::get();
-  ModelAPI_ValidatorsFactory* aFactory = aMgr->validators();
 
   FeaturePtr anAttributeFeature =
     std::dynamic_pointer_cast<ModelAPI_Feature>(theAttribute->owner());
@@ -154,28 +169,87 @@ bool SketchPlugin_TangentAttrValidator::isValid(const AttributePtr& theAttribute
 
   bool isObject = aRefAttr->isObject();
   ObjectPtr anObject = aRefAttr->object();
-  if (isObject && anObject.get()) {
-    FeaturePtr aRefFea = ModelAPI_Feature::feature(anObject);
+  if (!isObject || !anObject.get()) {
+    theError = "It uses an empty object";
+    return false;
+  }
 
-    AttributeRefAttrPtr aOtherAttr = anAttributeFeature->data()->refattr(aParamA);
-    ObjectPtr aOtherObject = aOtherAttr->object();
-    FeaturePtr aOtherFea = ModelAPI_Feature::feature(aOtherObject);
-    if (!aOtherFea)
-      return true;
+  FeaturePtr aRefFea = ModelAPI_Feature::feature(anObject);
 
-    if (aRefFea->getKind() == SketchPlugin_Line::ID() &&
-        aOtherFea->getKind() == SketchPlugin_Line::ID()) {
-      theError = "Two segments cannot be tangent";
-      return false;
-    }
+  AttributeRefAttrPtr aOtherAttr = anAttributeFeature->data()->refattr(aParamA);
+  ObjectPtr aOtherObject = aOtherAttr->object();
+  FeaturePtr aOtherFea = ModelAPI_Feature::feature(aOtherObject);
+  if (!aOtherFea)
     return true;
+
+  if (aRefFea->getKind() == SketchPlugin_Line::ID() &&
+      aOtherFea->getKind() == SketchPlugin_Line::ID()) {
+    theError = "Two segments cannot be tangent";
+    return false;
   }
-  else {
-    theError = "It uses an empty object";
+  else if (isSpline(aRefFea) && isSpline(aOtherFea)) {
+    theError = "Two B-splines cannot be tangent";
     return false;
   }
 
-  return true;
+  bool isValid = true;
+  bool hasSpline = isSpline(aRefFea);
+  if (!hasSpline && isSpline(aOtherFea)) {
+    hasSpline = true;
+    std::swap(aRefFea, aOtherFea);
+  }
+  if (hasSpline) {
+    auto isApplicableCoincidence = [](FeaturePtr theFeature, const std::string& theAttrName) {
+      AttributeRefAttrPtr aRefAttr = theFeature->refattr(theAttrName);
+      if (aRefAttr->isObject())
+        return false;
+      AttributePtr anAttr = aRefAttr->attr();
+      FeaturePtr anOwner = ModelAPI_Feature::feature(anAttr->owner());
+      AttributePoint2DPtr aPointAttr = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(anAttr);
+      if (aPointAttr) {
+        return anOwner->getKind() == SketchPlugin_BSpline::ID() &&
+              (aPointAttr->id() == SketchPlugin_BSpline::START_ID() ||
+               aPointAttr->id() == SketchPlugin_BSpline::END_ID());
+      }
+
+      AttributePoint2DArrayPtr aPntArray =
+          std::dynamic_pointer_cast<GeomDataAPI_Point2DArray>(anAttr);
+      if (aPntArray && anOwner->getKind() == SketchPlugin_BSpline::ID()) {
+        // check index of the pole
+        AttributeIntegerPtr anIndex = theAttrName == SketchPlugin_Constraint::ENTITY_A() ?
+            theFeature->integer(SketchPlugin_ConstraintCoincidenceInternal::INDEX_ENTITY_A()) :
+            theFeature->integer(SketchPlugin_ConstraintCoincidenceInternal::INDEX_ENTITY_B());
+        return anIndex && (anIndex->value() == 0 || anIndex->value() == aPntArray->size() - 1);
+      }
+      return false;
+    };
+
+    isValid = false;
+    AttributePoint2DArrayPtr aBSplinePoles = std::dynamic_pointer_cast<GeomDataAPI_Point2DArray>(
+        aRefFea->attribute(SketchPlugin_BSplineBase::POLES_ID()));
+    // additional check the B-spline edge and the other edge have a coincident boundary point
+    std::set<FeaturePtr> aCoincidences = SketchPlugin_Tools::findCoincidentConstraints(aRefFea);
+    for (std::set<FeaturePtr>::iterator anIt = aCoincidences.begin();
+         anIt != aCoincidences.end() && !isValid; ++anIt) {
+      std::set<FeaturePtr> aCoinc;
+      if (isApplicableCoincidence(*anIt, SketchPlugin_Constraint::ENTITY_A()))
+        SketchPlugin_Tools::findCoincidences(*anIt, SketchPlugin_Constraint::ENTITY_B(),
+                                             aCoinc, true);
+      else if (isApplicableCoincidence(*anIt, SketchPlugin_Constraint::ENTITY_B()))
+        SketchPlugin_Tools::findCoincidences(*anIt, SketchPlugin_Constraint::ENTITY_A(),
+                                             aCoinc, true);
+
+      std::set<FeaturePtr>::iterator aFoundCoinc = aCoinc.find(aOtherFea);
+      if (aFoundCoinc != aCoinc.end()) {
+        // do not take into account internal constraints
+        AttributeReferencePtr aParent =
+            (*aFoundCoinc)->reference(SketchPlugin_SketchEntity::PARENT_ID());
+        isValid = !aParent || !aParent->isInitialized() || aParent->value() != aRefFea;
+      }
+    }
+  }
+
+  return isValid;
 }
 
 bool SketchPlugin_PerpendicularAttrValidator::isValid(const AttributePtr& theAttribute,
@@ -189,8 +263,6 @@ bool SketchPlugin_PerpendicularAttrValidator::isValid(const AttributePtr& theAtt
   }
 
   std::string aParamA = theArguments.front();
-  SessionPtr aMgr = ModelAPI_Session::get();
-  ModelAPI_ValidatorsFactory* aFactory = aMgr->validators();
 
   FeaturePtr anOwner = std::dynamic_pointer_cast<ModelAPI_Feature>(theAttribute->owner());
   AttributeRefAttrPtr aRefAttr =
@@ -204,15 +276,17 @@ bool SketchPlugin_PerpendicularAttrValidator::isValid(const AttributePtr& theAtt
     AttributeRefAttrPtr aOtherAttr = anOwner->refattr(aParamA);
     ObjectPtr aOtherObject = aOtherAttr->object();
     FeaturePtr aOtherFea = ModelAPI_Feature::feature(aOtherObject);
-    if (!aOtherFea)
-      return true;
 
     // at least one feature should be a line
     if (aRefFea->getKind() != SketchPlugin_Line::ID() &&
-        aOtherFea->getKind() != SketchPlugin_Line::ID()) {
+        aOtherFea && aOtherFea->getKind() != SketchPlugin_Line::ID()) {
       theError = "At least one feature should be a line";
       return false;
     }
+    else if (isSpline(aRefFea) || isSpline(aOtherFea)) {
+      theError = "B-spline is not supported";
+      return false;
+    }
   }
   else {
     theError = "It uses an empty object";
@@ -291,27 +365,18 @@ bool SketchPlugin_EqualAttrValidator::isValid(const AttributePtr& theAttribute,
   std::string aType[2];
   std::list<std::string> anArguments;
   for (int i = 0; i < 2; i++) {
-    ObjectPtr anObject = aRefAttr[i]->object();
-    if (!anObject.get()) {
-      theError = "An empty object is used.";
-      return false;
-    }
-
-    aFeature = ModelAPI_Feature::feature(anObject);
-    if (!aFeature.get()) {
-      theError = "An empty feature is used.";
-      return false;
-    }
+    aFeature = ModelAPI_Feature::feature(aRefAttr[i]->object());
+    if (!aFeature.get())
+      return true;
 
     aType[i] = aFeature->getKind();
     if (aFeature->getKind() != SketchPlugin_Line::ID() &&
         aFeature->getKind() != SketchPlugin_Circle::ID() &&
         aFeature->getKind() != SketchPlugin_Arc::ID() &&
-        aFeature->getKind() != SketchPlugin_Ellipse::ID()) {
-      theError = "The %1 feature kind of attribute is wrong. It should be %2 or %3 or %4 or %5";
-      theError.arg(aFeature->getKind()).arg(SketchPlugin_Line::ID())
-          .arg(SketchPlugin_Circle::ID()).arg(SketchPlugin_Arc::ID())
-          .arg(SketchPlugin_Ellipse::ID());
+        aFeature->getKind() != SketchPlugin_Ellipse::ID() &&
+        aFeature->getKind() != SketchPlugin_EllipticArc::ID()) {
+      theError = "The %1 feature is not supported by the Equal constraint.";
+      theError.arg(aFeature->getKind());
       // wrong type of attribute
       return false;
     }
@@ -325,10 +390,11 @@ bool SketchPlugin_EqualAttrValidator::isValid(const AttributePtr& theAttribute,
   }
   if (!isOk) {
     // ellipse and elliptic arc may be equal
-    // TODO
+    isOk = (aType[0] == SketchPlugin_EllipticArc::ID() && aType[1] == SketchPlugin_Ellipse::ID())
+        || (aType[0] == SketchPlugin_Ellipse::ID() && aType[1] == SketchPlugin_EllipticArc::ID());
   }
   if (!isOk) {
-    theError = "Feature with kinds %1 and %2 can not be equal.";
+    theError = "Features with kinds %1 and %2 can not be equal.";
     theError.arg(aType[0]).arg(aType[1]);
     return false;
   }
@@ -354,6 +420,15 @@ bool SketchPlugin_MirrorAttrValidator::isValid(const AttributePtr& theAttribute,
 
   for(int anInd = 0; anInd < aSelAttr->size(); anInd++) {
     ObjectPtr aSelObject = aSelAttr->object(anInd);
+
+    // B-splines are not supported in Mirror yet
+    FeaturePtr aSelFeature = ModelAPI_Feature::feature(aSelObject);
+    if (aSelFeature && (aSelFeature->getKind() == SketchPlugin_BSpline::ID() ||
+        aSelFeature->getKind() == SketchPlugin_BSplinePeriodic::ID())) {
+      theError = "Not supported";
+      return false;
+    }
+
     std::string aName = aSelObject.get() ? aSelObject->data()->name() : "";
     std::list<ObjectPtr>::iterator aMirIter = aMirroredObjects.begin();
     for (; aMirIter != aMirroredObjects.end(); aMirIter++)
@@ -378,8 +453,6 @@ bool SketchPlugin_CoincidenceAttrValidator::isValid(const AttributePtr& theAttri
 
   // there is a check whether the feature contains a point and a linear edge or two point values
   std::string aParamA = theArguments.front();
-  SessionPtr aMgr = ModelAPI_Session::get();
-  ModelAPI_ValidatorsFactory* aFactory = aMgr->validators();
 
   FeaturePtr aConstraint = std::dynamic_pointer_cast<ModelAPI_Feature>(theAttribute->owner());
   AttributeRefAttrPtr aRefAttrA = aConstraint->data()->refattr(aParamA);
@@ -461,6 +534,15 @@ bool SketchPlugin_CopyValidator::isValid(const AttributePtr& theAttribute,
         break;
     if (anObjIter != anInitialObjects.end())
       continue;
+
+    // B-splines are not supported in Copying features
+    FeaturePtr aSelFeature = ModelAPI_Feature::feature(aSelObject);
+    if (aSelFeature && (aSelFeature->getKind() == SketchPlugin_BSpline::ID() ||
+        aSelFeature->getKind() == SketchPlugin_BSplinePeriodic::ID())) {
+      theError = "Not supported";
+      return false;
+    }
+
     anObjIter = aCopiedObjects.begin();
     for (; anObjIter != aCopiedObjects.end(); anObjIter++)
       if (aSelObject == *anObjIter) {
@@ -605,7 +687,7 @@ bool SketchPlugin_FilletVertexValidator::isValid(const AttributePtr& theAttribut
   }
 
   if(!aConstraintCoincidence.get()) {
-    theError = "Error: one of the selected point does not have coicidence.";
+    theError = "Error: one of the selected point does not have coincidence.";
     return false;
   }
 
@@ -745,8 +827,6 @@ bool SketchPlugin_MiddlePointAttrValidator::isValid(const AttributePtr& theAttri
 
   // there is a check whether the feature contains a point and a linear edge or two point values
   std::string aParamA = theArguments.front();
-  SessionPtr aMgr = ModelAPI_Session::get();
-  ModelAPI_ValidatorsFactory* aFactory = aMgr->validators();
 
   FeaturePtr anAttributeFeature =
     std::dynamic_pointer_cast<ModelAPI_Feature>(theAttribute->owner());
@@ -770,7 +850,8 @@ bool SketchPlugin_MiddlePointAttrValidator::isValid(const AttributePtr& theAttri
       if (aFeature->getKind() == SketchPlugin_Point::ID())
         ++aNbPoints;
       else if (aFeature->getKind() == SketchPlugin_Line::ID() ||
-               aFeature->getKind() == SketchPlugin_Arc::ID())
+               aFeature->getKind() == SketchPlugin_Arc::ID() ||
+               aFeature->getKind() == SketchPlugin_EllipticArc::ID())
         ++aNbLines;
     }
   }
@@ -869,7 +950,7 @@ bool SketchPlugin_ArcTransversalPointValidator::isValid(
     }
   }
   else {
-    theError = "Unable to build transversal arc on %1";
+    theError = "Unable to build perpendicular arc on %1";
     theError.arg(anAttrFeature->getKind());
     return false;
   }
@@ -944,56 +1025,68 @@ bool SketchPlugin_SplitValidator::isValid(const AttributePtr& theAttribute,
   }
   AttributeReferencePtr aFeatureAttr =
             std::dynamic_pointer_cast<ModelAPI_AttributeReference>(theAttribute);
+  std::shared_ptr<SketchPlugin_Feature> aSplitFeature =
+    std::dynamic_pointer_cast<SketchPlugin_Feature>(theAttribute->owner());
 
   ObjectPtr anAttrObject = aFeatureAttr->value();
+  if (!anAttrObject) {
+    AttributePtr aPreviewAttr = aSplitFeature->attribute(SketchPlugin_Trim::PREVIEW_OBJECT());
+    aFeatureAttr = std::dynamic_pointer_cast<ModelAPI_AttributeReference>(aPreviewAttr);
+    anAttrObject = aFeatureAttr->value();
+  }
+
   FeaturePtr anAttrFeature = ModelAPI_Feature::feature(anAttrObject);
   if (!anAttrFeature)
     return aValid;
 
-  std::string aKind = anAttrFeature->getKind();
-  if (aKind == SketchPlugin_Line::ID() ||
-      aKind == SketchPlugin_Arc::ID() ||
-      aKind == SketchPlugin_Circle::ID()) {
-
-    std::set<ResultPtr> anEdgeShapes;
-    ModelGeomAlgo_Shape::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());
-
-    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()));
-    std::shared_ptr<GeomDataAPI_Dir> aX = std::dynamic_pointer_cast<GeomDataAPI_Dir>(
-        aData->attribute(SketchPlugin_Sketch::DIRX_ID()));
-    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())));
-
-    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
-      aValid = aCoincidentToFeature >= 1;
+  // B-splines are not supported by the Split yet
+  if (anAttrFeature->getKind() == SketchPlugin_BSpline::ID() ||
+      anAttrFeature->getKind() == SketchPlugin_BSplinePeriodic::ID()) {
+    theError = "Not supported";
+    return false;
   }
 
+  std::set<ResultPtr> anEdgeShapes;
+  ModelGeomAlgo_Shape::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());
+
+  GeomShapePtr anAttrShape = (*anEdgeShapes.begin())->shape();
+  std::shared_ptr<SketchPlugin_Feature> aSFeature =
+                                std::dynamic_pointer_cast<SketchPlugin_Feature>(anAttrFeature);
+  if (!aSFeature || aSFeature->isCopy())
+    return false;
+  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()));
+  std::shared_ptr<GeomDataAPI_Dir> aX = std::dynamic_pointer_cast<GeomDataAPI_Dir>(
+      aData->attribute(SketchPlugin_Sketch::DIRX_ID()));
+  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())));
+
+  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 (anAttrFeature->getKind() == SketchPlugin_Circle::ID() ||
+      anAttrFeature->getKind() == SketchPlugin_Ellipse::ID())
+    aValid = aCoincidentToFeature >= 2;
+  else
+    aValid = aCoincidentToFeature >= 1;
+
   return aValid;
 }
 
@@ -1030,11 +1123,12 @@ bool SketchPlugin_TrimValidator::isValid(const AttributePtr& theAttribute,
   if (!aSketchFeature.get() || aSketchFeature->isCopy())
     return aValid;
 
-  std::string aKind = aBaseFeature->getKind();
-  if (aKind != SketchPlugin_Line::ID() &&
-      aKind != SketchPlugin_Arc::ID() &&
-      aKind != SketchPlugin_Circle::ID())
-    return aValid;
+  // B-splines are not supported by the Trim yet
+  if (aBaseFeature->getKind() == SketchPlugin_BSpline::ID() ||
+      aBaseFeature->getKind() == SketchPlugin_BSplinePeriodic::ID()) {
+    theError = "Not supported";
+    return false;
+  }
 
   // point on feature
   AttributePoint2DPtr aPoint = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
@@ -1050,8 +1144,8 @@ bool SketchPlugin_TrimValidator::isValid(const AttributePtr& theAttribute,
   std::map<ObjectPtr, std::map<std::shared_ptr<GeomAPI_Pnt>,
            std::pair<std::list<std::shared_ptr<GeomDataAPI_Point2D> >,
                      std::list<std::shared_ptr<ModelAPI_Object> > > > > anObjectToPoints;
-  SketchPlugin_Trim::fillObjectShapes(aBaseObject, aSketch->data()->owner(),
-                                      aCashedShapes, anObjectToPoints);
+  SketchPlugin_SegmentationTools::fillObjectShapes(
+      aTrimFeature.get(), aBaseObject, aCashedShapes, anObjectToPoints);
   const std::set<GeomShapePtr>& aShapes = aCashedShapes[aBaseObject];
 
   return aShapes.size() > 1;
@@ -1069,20 +1163,21 @@ bool SketchPlugin_ProjectionValidator::isValid(const AttributePtr& theAttribute,
 
   AttributeSelectionPtr aFeatureAttr =
       std::dynamic_pointer_cast<ModelAPI_AttributeSelection>(theAttribute);
+  std::shared_ptr<GeomAPI_Vertex> aVertex;
   std::shared_ptr<GeomAPI_Edge> anEdge;
   std::shared_ptr<SketchPlugin_Feature> aSketchFeature;
   if (aFeatureAttr.get()) {
     GeomShapePtr aVal = aFeatureAttr->value();
     ResultPtr aRes = aFeatureAttr->context();
     if (aVal && aVal->isVertex())
-      return true; // vertex is always could be projected
-    if (aVal && aVal->isEdge()) {
-      anEdge = std::shared_ptr<GeomAPI_Edge>(new GeomAPI_Edge(aFeatureAttr->value()));
+      aVertex = std::shared_ptr<GeomAPI_Vertex>(new GeomAPI_Vertex(aVal));
+    else if (aVal && aVal->isEdge()) {
+      anEdge = std::shared_ptr<GeomAPI_Edge>(new GeomAPI_Edge(aVal));
     } else if(aRes && aRes->shape()) {
       if (aRes->shape()->isVertex())
-        return true; // vertex is always could be projected
+        aVertex = std::shared_ptr<GeomAPI_Vertex>(new GeomAPI_Vertex(aRes->shape()));
       else if (aRes->shape()->isEdge())
-        anEdge = std::shared_ptr<GeomAPI_Edge>(new GeomAPI_Edge(aFeatureAttr->context()->shape()));
+        anEdge = std::shared_ptr<GeomAPI_Edge>(new GeomAPI_Edge(aRes->shape()));
     }
 
     // try to convert result to sketch feature
@@ -1091,7 +1186,7 @@ bool SketchPlugin_ProjectionValidator::isValid(const AttributePtr& theAttribute,
         std::dynamic_pointer_cast<SketchPlugin_Feature>(ModelAPI_Feature::feature(aRes));
     }
   }
-  if (!anEdge) {
+  if (!aVertex && !anEdge) {
     theError = "The attribute %1 should be an edge or vertex";
     theError.arg(theAttribute->id());
     return false;
@@ -1122,38 +1217,37 @@ bool SketchPlugin_ProjectionValidator::isValid(const AttributePtr& theAttribute,
   std::shared_ptr<GeomAPI_Dir> aNormal = aPlane->direction();
   std::shared_ptr<GeomAPI_Pnt> anOrigin = aPlane->location();
 
-  if (anEdge->isLine()) {
+  bool aValid = true;
+  if (aVertex)
+    aValid = true; // vertex is always could be projected
+  else if (anEdge->isLine()) {
     std::shared_ptr<GeomAPI_Lin> aLine = anEdge->line();
     std::shared_ptr<GeomAPI_Dir> aLineDir = aLine->direction();
     double aDot = fabs(aNormal->dot(aLineDir));
-    bool aValid = fabs(aDot - 1.0) >= tolerance * tolerance;
+    aValid = fabs(aDot - 1.0) >= tolerance * tolerance;
     if (!aValid)
       theError = "Error: Line is orthogonal to the sketch plane.";
-    return aValid;
   }
   else if (anEdge->isCircle() || anEdge->isArc()) {
     std::shared_ptr<GeomAPI_Circ> aCircle = anEdge->circle();
     std::shared_ptr<GeomAPI_Dir> aCircNormal = aCircle->normal();
     double aDot = fabs(aNormal->dot(aCircNormal));
-    bool aValid = aDot >= tolerance * tolerance;
+    aValid = aDot >= tolerance * tolerance;
     if (!aValid)
       theError.arg(anEdge->isCircle() ? "Error: Circle is orthogonal to the sketch plane."
                                       : "Error: Arc is orthogonal to the sketch plane.");
-    return aValid;
   }
   else if (anEdge->isEllipse()) {
     std::shared_ptr<GeomAPI_Ellipse> anEllipse = anEdge->ellipse();
     std::shared_ptr<GeomAPI_Dir> anEllipseNormal = anEllipse->normal();
     double aDot = fabs(aNormal->dot(anEllipseNormal));
-    bool aValid = aDot >= tolerance * tolerance;
+    aValid = fabs(aDot - 1.0) <= tolerance * tolerance;
     if (!aValid)
-      theError.arg(anEdge->isEllipse() ? "Error: Ellipse is orthogonal to the sketch plane."
-                                       : "Error: Elliptic Arc is orthogonal to the sketch plane.");
-    return aValid;
+      theError.arg(anEdge->isClosed() ? "Error: Ellipse is orthogonal to the sketch plane."
+                                      : "Error: Elliptic Arc is orthogonal to the sketch plane.");
   }
 
-  theError = "Error: Selected object is not line, circle or arc.";
-  return false;
+  return aValid;
 }
 
 
@@ -1691,8 +1785,20 @@ bool SketchPlugin_ReplicationReferenceValidator::isValid(
   if (!aCopyAttr || !aCopyAttr->value())
     return true; // feature is not a copy, thus valid
 
-  // check the copy feature is already referred by the "Multi" feature
   FeaturePtr aMultiFeature = ModelAPI_Feature::feature(theAttribute->owner());
+  // Collect original entities
+  std::set<FeaturePtr> anOriginalFeatures;
+  if (theArguments.size() > 1) {
+    AttributeRefListPtr anOrigList = aMultiFeature->reflist(theArguments.back());
+    for (int i = 0; i < anOrigList->size(); ++i)
+    {
+      FeaturePtr aFeature = ModelAPI_Feature::feature(anOrigList->object(i));
+      if (aFeature == anAttrOwnerFeature)
+        return true;
+    }
+  }
+
+  // check the copy feature is already referred by the "Multi" feature
   AttributeRefListPtr aRefList = aMultiFeature->reflist(theArguments.front());
   for (int i = 0; i < aRefList->size(); ++i)
   {
@@ -1711,31 +1817,41 @@ bool SketchPlugin_SketchFeatureValidator::isValid(const AttributePtr& theAttribu
                                                   const std::list<std::string>& theArguments,
                                                   Events_InfoMessage& theError) const
 {
-  if (theAttribute->attributeType() != ModelAPI_AttributeRefAttr::typeId()) {
+  if (theAttribute->attributeType() != ModelAPI_AttributeRefAttr::typeId() &&
+      theAttribute->attributeType() != ModelAPI_AttributeReference::typeId()) {
     theError = "The attribute with the %1 type is not processed";
     theError.arg(theAttribute->attributeType());
     return false;
   }
 
   // check the attribute refers to a sketch feature
+  bool isSketchFeature = false;
   AttributeRefAttrPtr aRefAttr =
       std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(theAttribute);
-  bool isSketchFeature = aRefAttr->isObject();
-  if (isSketchFeature) {
-    FeaturePtr aFeature = ModelAPI_Feature::feature(aRefAttr->object());
-    isSketchFeature = aFeature.get() != NULL;
+  if (aRefAttr) {
+    isSketchFeature = aRefAttr->isObject();
     if (isSketchFeature) {
-      std::shared_ptr<SketchPlugin_Feature> aSketchFeature =
-          std::dynamic_pointer_cast<SketchPlugin_Feature>(aFeature);
-      isSketchFeature = aSketchFeature.get() != NULL;
+      FeaturePtr aFeature = ModelAPI_Feature::feature(aRefAttr->object());
+      isSketchFeature = aFeature.get() != NULL;
+      if (isSketchFeature) {
+        std::shared_ptr<SketchPlugin_Feature> aSketchFeature =
+            std::dynamic_pointer_cast<SketchPlugin_Feature>(aFeature);
+        isSketchFeature = aSketchFeature.get() != NULL;
+      }
+    }
+  }
+  else {
+    AttributeReferencePtr aReference =
+      std::dynamic_pointer_cast<ModelAPI_AttributeReference>(theAttribute);
+    if (aReference) {
+      FeaturePtr aFeature = ModelAPI_Feature::feature(aReference->value());
+      isSketchFeature = aFeature.get() && aFeature->getKind() == SketchPlugin_Sketch::ID();
     }
   }
 
-  if (isSketchFeature)
-    return true;
-
-  theError = "The object selected is not a sketch feature";
-  return false;
+  if (!isSketchFeature)
+    theError = "The object selected is not a sketch feature";
+  return isSketchFeature;
 }
 
 bool SketchPlugin_MultiRotationAngleValidator::isValid(const AttributePtr& theAttribute,
@@ -1778,3 +1894,20 @@ bool SketchPlugin_MultiRotationAngleValidator::isValid(const AttributePtr& theAt
 
   return true;
 }
+
+bool SketchPlugin_BSplineValidator::isValid(const AttributePtr& theAttribute,
+                                            const std::list<std::string>& theArguments,
+                                            Events_InfoMessage& theError) const
+{
+  AttributePoint2DArrayPtr aPolesArray =
+      std::dynamic_pointer_cast<GeomDataAPI_Point2DArray>(theAttribute);
+  if (!aPolesArray)
+    return false;
+
+  if (aPolesArray->size() < 2) {
+    theError = "Number of B-spline poles should be 2 or more";
+    return false;
+  }
+
+  return true;
+}