X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_WidgetPoint2d.cpp;h=8c7d1031b4d2a7c05410e47a27883d1bc65b8aaa;hb=32208dedf0b2b5bd50b5b86c464f37a8e0eb07d0;hp=82f7683c2919e7787f2f0d88a5787be182c1673f;hpb=935d92397da8acd3bc317a6318572b508c118dc3;p=modules%2Fshaper.git

diff --git a/src/PartSet/PartSet_WidgetPoint2d.cpp b/src/PartSet/PartSet_WidgetPoint2d.cpp
index 82f7683c2..8c7d1031b 100644
--- a/src/PartSet/PartSet_WidgetPoint2d.cpp
+++ b/src/PartSet/PartSet_WidgetPoint2d.cpp
@@ -7,6 +7,7 @@
 #include "PartSet_WidgetPoint2d.h"
 #include <PartSet_Tools.h>
 #include <PartSet_Module.h>
+#include <PartSet_SketcherReetntrantMgr.h>
 
 #include <XGUI_Tools.h>
 #include <XGUI_Workshop.h>
@@ -17,6 +18,9 @@
 #include <ModuleBase_IViewer.h>
 #include <ModuleBase_IViewWindow.h>
 #include <ModuleBase_ISelection.h>
+#include <ModuleBase_ViewerPrs.h>
+#include <ModuleBase_WidgetValidator.h>
+#include <ModuleBase_LabelValue.h>
 
 #include <Config_Keywords.h>
 #include <Config_WidgetAPI.h>
@@ -31,6 +35,9 @@
 #include <GeomDataAPI_Point2D.h>
 #include <GeomAPI_Pnt2d.h>
 
+#include <GeomAPI_ShapeExplorer.h>
+#include <GeomAPI_Vertex.h>
+
 #include <SketchPlugin_Feature.h>
 #include <SketchPlugin_ConstraintCoincidence.h>
 #include <SketchPlugin_Line.h>
@@ -56,7 +63,7 @@ const double MaxCoordinate = 1e12;
 
 static QStringList MyFeaturesForCoincedence;
 
-PartSet_WidgetPoint2D::PartSet_WidgetPoint2D(QWidget* theParent, 
+PartSet_WidgetPoint2D::PartSet_WidgetPoint2D(QWidget* theParent,
                                              ModuleBase_IWorkshop* theWorkshop,
                                              const Config_WidgetAPI* theData)
 : ModuleBase_ModelWidget(theParent, theData), myWorkshop(theWorkshop),
@@ -72,7 +79,6 @@ PartSet_WidgetPoint2D::PartSet_WidgetPoint2D(QWidget* theParent,
 
   // the control should accept the focus, so the boolean flag is corrected to be true
   myIsObligatory = true;
-  //myOptionParam = theData->getProperty(PREVIOUS_FEATURE_PARAM);
   QString aPageName = QString::fromStdString(theData->getProperty(CONTAINER_PAGE_NAME));
   myGroupBox = new QGroupBox(aPageName, theParent);
   myGroupBox->setFlat(false);
@@ -85,42 +91,93 @@ PartSet_WidgetPoint2D::PartSet_WidgetPoint2D(QWidget* theParent,
   aGroupLay->setColumnStretch(1, 1);
   {
     QLabel* aLabel = new QLabel(myGroupBox);
-    aLabel->setText(tr("X "));
-    aGroupLay->addWidget(aLabel, 0, 0);
-
-    myXSpin = new ModuleBase_ParamSpinBox(myGroupBox);
-    myXSpin->setAcceptVariables(aAcceptVariables);
-    myXSpin->setMinimum(-DBL_MAX);
-    myXSpin->setMaximum(DBL_MAX);
-    myXSpin->setToolTip(tr("X"));
+
+    myXSpin = new ModuleBase_LabelValue(myGroupBox, tr("X"));
+    //ModuleBase_ParamSpinBox(myGroupBox);
+    //myXSpin->setAcceptVariables(aAcceptVariables);
+    //myXSpin->setMinimum(-DBL_MAX);
+    //myXSpin->setMaximum(DBL_MAX);
+    //myXSpin->setToolTip(tr("X"));
     aGroupLay->addWidget(myXSpin, 0, 1);
 
-    connect(myXSpin, SIGNAL(valueChanged(const QString&)), this, SIGNAL(valuesModified()));
+    //connect(myXSpin, SIGNAL(textChanged(const QString&)), this, SIGNAL(valuesModified()));
+    //myXSpin->setValueEnabled(isValueEnabled());
   }
   {
-    QLabel* aLabel = new QLabel(myGroupBox);
-    aLabel->setText(tr("Y "));
-    aGroupLay->addWidget(aLabel, 1, 0);
-
-    myYSpin = new ModuleBase_ParamSpinBox(myGroupBox);
-    myYSpin->setAcceptVariables(aAcceptVariables);
-    myYSpin->setMinimum(-DBL_MAX);
-    myYSpin->setMaximum(DBL_MAX);
-    myYSpin->setToolTip(tr("Y"));
+    //QLabel* aLabel = new QLabel(myGroupBox);
+    //aLabel->setText(tr("Y "));
+    //aGroupLay->addWidget(aLabel, 1, 0);
+
+    myYSpin = new ModuleBase_LabelValue(myGroupBox, tr("Y"));
+    //ModuleBase_ParamSpinBox(myGroupBox);
+    //myYSpin = new ModuleBase_ParamSpinBox(myGroupBox);
+    //myYSpin->setAcceptVariables(aAcceptVariables);
+    //myYSpin->setMinimum(-DBL_MAX);
+    //myYSpin->setMaximum(DBL_MAX);
+    //myYSpin->setToolTip(tr("Y"));
     aGroupLay->addWidget(myYSpin, 1, 1);
 
-    connect(myYSpin, SIGNAL(valueChanged(const QString&)), this, SIGNAL(valuesModified()));
+    //connect(myYSpin, SIGNAL(textChanged(const QString&)), this, SIGNAL(valuesModified()));
+    //myYSpin->setValueEnabled(isValueEnabled());
   }
   QVBoxLayout* aLayout = new QVBoxLayout(this);
   ModuleBase_Tools::zeroMargins(aLayout);
   aLayout->addWidget(myGroupBox);
   setLayout(aLayout);
+
+  myWidgetValidator = new ModuleBase_WidgetValidator(this, myWorkshop);
+}
+
+bool PartSet_WidgetPoint2D::isValidSelectionCustom(const ModuleBase_ViewerPrsPtr& theValue)
+{
+  bool aValid = true;
+
+  PartSet_Module* aModule = dynamic_cast<PartSet_Module*>(myWorkshop->module());
+  if (aModule->sketchReentranceMgr()->isInternalEditActive())
+    return true; /// when internal edit is started a new feature is created. I has not results, AIS
+
+  /// the selection is not possible if the current feature has no presentation for the current
+  /// attribute not in AIS not in results. If so, no object in current feature where make
+  /// coincidence, so selection is not necessary
+  bool aFoundPoint = false;
+  GeomShapePtr anAISShape;
+  GeomPresentablePtr aPrs = std::dynamic_pointer_cast<GeomAPI_IPresentable>(myFeature);
+  if (aPrs.get()) {
+    AISObjectPtr anAIS;
+    anAIS = aPrs->getAISObject(anAIS);
+    if (anAIS.get()) {
+      anAISShape = anAIS->getShape();
+    }
+  }
+  const std::list<std::shared_ptr<ModelAPI_Result> >& aResults = myFeature->results();
+  if (!anAISShape.get() && aResults.empty())
+    return true;
+
+  /// analysis of AIS
+  std::shared_ptr<ModelAPI_Data> aData = myFeature->data();
+  std::shared_ptr<GeomDataAPI_Point2D> aPointAttr = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
+      aData->attribute(attributeID()));
+  std::shared_ptr<GeomAPI_Pnt2d> aPoint = aPointAttr->pnt();
+  if (anAISShape.get())
+    aFoundPoint = shapeContainsPoint(anAISShape, aPoint, mySketch);
+
+  /// analysis of results
+  std::list<std::shared_ptr<ModelAPI_Result> >::const_iterator aRIter = aResults.cbegin();
+  for (; aRIter != aResults.cend() && !aFoundPoint; aRIter++) {
+    ResultPtr aResult = *aRIter;
+    if (aResult.get() && aResult->shape().get()) {
+      GeomShapePtr aShape = aResult->shape();
+      aFoundPoint = shapeContainsPoint(aShape, aPoint, mySketch);
+    }
+  }
+  return aFoundPoint;
 }
 
 bool PartSet_WidgetPoint2D::resetCustom()
 {
   bool aDone = false;
-  if (!isUseReset() || isComputedDefault() || myXSpin->hasVariable() || myYSpin->hasVariable()) {
+  if (!isUseReset() || isComputedDefault()
+      /*|| myXSpin->hasVariable() || myYSpin->hasVariable()*/) {
     aDone = false;
   }
   else {
@@ -128,14 +185,18 @@ bool PartSet_WidgetPoint2D::resetCustom()
       // if the restored value should be hidden, aDone = true to set
       // reset state for the widget in the parent
       aDone = restoreCurentValue();
+      emit objectUpdated();
     }
     else {
       bool isOk;
       double aDefValue = QString::fromStdString(getDefaultValue()).toDouble(&isOk);
       // it is important to block the spin box control in order to do not through out the
       // locking of the validating state.
-      ModuleBase_Tools::setSpinValue(myXSpin, isOk ? aDefValue : 0.0);
-      ModuleBase_Tools::setSpinValue(myYSpin, isOk ? aDefValue : 0.0);
+      myXSpin->setValue(isOk ? aDefValue : 0.0);
+      myYSpin->setValue(isOk ? aDefValue : 0.0);
+
+      //ModuleBase_Tools::setSpinValue(myXSpin, isOk ? aDefValue : 0.0);
+      //ModuleBase_Tools::setSpinValue(myYSpin, isOk ? aDefValue : 0.0);
       storeValueCustom();
       aDone = true;
     }
@@ -147,47 +208,30 @@ PartSet_WidgetPoint2D::~PartSet_WidgetPoint2D()
 {
 }
 
-bool PartSet_WidgetPoint2D::setSelection(QList<ModuleBase_ViewerPrs>& theValues,
+bool PartSet_WidgetPoint2D::setSelection(QList<ModuleBase_ViewerPrsPtr>& theValues,
                                          const bool theToValidate)
 {
   bool isDone = false;
   if (theValues.empty())
     return isDone;
 
-  ModuleBase_ViewerPrs aValue = theValues.takeFirst();
-  TopoDS_Shape aShape = aValue.shape();
-  if (!aShape.IsNull()) {
+  ModuleBase_ViewerPrsPtr aValue = theValues.takeFirst();
+  GeomShapePtr aShape = aValue->shape();
+  if (aShape.get() && !aShape->isNull()) {
     Handle(V3d_View) aView = myWorkshop->viewer()->activeView();
     double aX, aY;
-    if (getPoint2d(aView, aShape, aX, aY)) {
+    const TopoDS_Shape& aTDShape = aShape->impl<TopoDS_Shape>();
+    if (getPoint2d(aView, aTDShape, aX, aY)) {
       isDone = setPoint(aX, aY);
       PartSet_Tools::setConstraints(mySketch, feature(), attributeID(), aX, aY);
     }
   }
-  else if (canBeActivatedByMove()) {
-    if (feature()->getKind() == SketchPlugin_Line::ID()) {
-      FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aValue.object());
-      // Initialize new line with first point equal to end of previous
-      if (aFeature.get()) {
-        std::shared_ptr<ModelAPI_Data> aData = aFeature->data();
-        std::shared_ptr<GeomDataAPI_Point2D> aPoint = 
-          std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
-                                       aData->attribute(SketchPlugin_Line::END_ID()));
-        if (aPoint) {
-          setPoint(aPoint->x(), aPoint->y());
-          PartSet_Tools::setConstraints(mySketch, feature(), attributeID(), aPoint->x(),
-                                        aPoint->y());
-          isDone = true;
-        }
-      }
-    }
-  }
   return isDone;
 }
 
 void PartSet_WidgetPoint2D::selectContent()
 {
-  myXSpin->selectAll();
+ // myXSpin->selectAll();
 }
 
 bool PartSet_WidgetPoint2D::setPoint(double theX, double theY)
@@ -197,14 +241,17 @@ bool PartSet_WidgetPoint2D::setPoint(double theX, double theY)
   if (fabs(theY) >= MaxCoordinate)
     return false;
 
-  ModuleBase_Tools::setSpinValue(myXSpin, theX);
-  ModuleBase_Tools::setSpinValue(myYSpin, theY);
+  myXSpin->setValue(theX);
+  myYSpin->setValue(theY);
+
+  //ModuleBase_Tools::setSpinValue(myXSpin, theX);
+  //ModuleBase_Tools::setSpinValue(myYSpin, theY);
 
   storeValue();
   return true;
 }
 
-bool PartSet_WidgetPoint2D::storeValueCustom() const
+bool PartSet_WidgetPoint2D::storeValueCustom()
 {
   std::shared_ptr<ModelAPI_Data> aData = myFeature->data();
   if (!aData) // can be on abort of sketcher element
@@ -218,10 +265,11 @@ bool PartSet_WidgetPoint2D::storeValueCustom() const
 
   // if text is not empty then setValue will be ignored
   // so we should set the text at first
-  aPoint->setText(myXSpin->hasVariable() ? myXSpin->text().toStdString() : "",
-                  myYSpin->hasVariable() ? myYSpin->text().toStdString() : "");
-  aPoint->setValue(!myXSpin->hasVariable() ? myXSpin->value() : aPoint->x(),
-                   !myYSpin->hasVariable() ? myYSpin->value() : aPoint->y());
+  //aPoint->setText(myXSpin->hasVariable() ? myXSpin->text().toStdString() : "",
+  //                myYSpin->hasVariable() ? myYSpin->text().toStdString() : "");
+  //aPoint->setValue(!myXSpin->hasVariable() ? myXSpin->value() : aPoint->x(),
+  //                 !myYSpin->hasVariable() ? myYSpin->value() : aPoint->y());
+  aPoint->setValue(myXSpin->value(), myYSpin->value());
 
   // after movement the solver will call the update event: optimization
   moveObject(myFeature);
@@ -236,44 +284,19 @@ bool PartSet_WidgetPoint2D::restoreValueCustom()
   std::shared_ptr<ModelAPI_Data> aData = myFeature->data();
   std::shared_ptr<GeomDataAPI_Point2D> aPoint = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
       aData->attribute(attributeID()));
-  QString aTextX = QString::fromStdString(aPoint->textX());
-  QString aTextY = QString::fromStdString(aPoint->textY());
-
-  bool isDouble = false;
-  double aVal = 0;
-  if (aTextX.isEmpty()) {
-    ModuleBase_Tools::setSpinValue(myXSpin, aPoint->x());
-  } else {
-    aVal = aTextX.toDouble(&isDouble);
-    if (isDouble)
-      ModuleBase_Tools::setSpinValue(myXSpin, aVal);
-    else
-      ModuleBase_Tools::setSpinText(myXSpin, aTextX);
-  }
-  if (aTextY.isEmpty()) {
-    ModuleBase_Tools::setSpinValue(myYSpin, aPoint->y());
-  } else {
-    aVal = aTextY.toDouble(&isDouble);
-    if (isDouble)
-      ModuleBase_Tools::setSpinValue(myYSpin, aVal);
-    else
-      ModuleBase_Tools::setSpinText(myYSpin, aTextY);
-  }
-  //if (aTextX.empty() || aTextY.empty()) {
-  //  ModuleBase_Tools::setSpinValue(myXSpin, aPoint->x());
-  //  ModuleBase_Tools::setSpinValue(myYSpin, aPoint->y());
-  //} else {
-  //  ModuleBase_Tools::setSpinText(myXSpin, QString::fromStdString(aTextX));
-  //  ModuleBase_Tools::setSpinText(myYSpin, QString::fromStdString(aTextY));
-  //}
+  double aValueX = aPoint->isInitialized() ? aPoint->x() : 0.;
+  double aValueY = aPoint->isInitialized() ? aPoint->y() : 0.;
+  myXSpin->setValue(aValueX);
+  myYSpin->setValue(aValueY);
+
   return true;
 }
 
 void PartSet_WidgetPoint2D::storeCurentValue()
 {
   // do not use cash if a variable is used
-  if (myXSpin->hasVariable() || myYSpin->hasVariable())
-    return;
+  //if (myXSpin->hasVariable() || myYSpin->hasVariable())
+  //  return;
 
   myValueIsCashed = true;
   myIsFeatureVisibleInCash = XGUI_Displayer::isVisible(
@@ -291,8 +314,10 @@ bool PartSet_WidgetPoint2D::restoreCurentValue()
 
   myValueIsCashed = false;
   myIsFeatureVisibleInCash = true;
-  ModuleBase_Tools::setSpinValue(myXSpin, myXValueInCash);
-  ModuleBase_Tools::setSpinValue(myYSpin, myYValueInCash);
+  myXSpin->setValue(myXValueInCash);
+  myYSpin->setValue(myYValueInCash);
+  //ModuleBase_Tools::setSpinValue(myXSpin, myXValueInCash);
+  //ModuleBase_Tools::setSpinValue(myYSpin, myYValueInCash);
 
   // store value to the model
   storeValueCustom();
@@ -317,12 +342,6 @@ QList<QWidget*> PartSet_WidgetPoint2D::getControls() const
 
 void PartSet_WidgetPoint2D::activateCustom()
 {
-  ModuleBase_IViewer* aViewer = myWorkshop->viewer();
-  connect(aViewer, SIGNAL(mouseMove(ModuleBase_IViewWindow*, QMouseEvent*)), 
-          this, SLOT(onMouseMove(ModuleBase_IViewWindow*, QMouseEvent*)));
-  connect(aViewer, SIGNAL(mouseRelease(ModuleBase_IViewWindow*, QMouseEvent*)), 
-          this, SLOT(onMouseRelease(ModuleBase_IViewWindow*, QMouseEvent*)));
-
   QIntList aModes;
   aModes << TopAbs_VERTEX;
   aModes << TopAbs_EDGE;
@@ -335,14 +354,8 @@ void PartSet_WidgetPoint2D::activateCustom()
   }
 }
 
-bool PartSet_WidgetPoint2D::canBeActivatedByMove()
+void PartSet_WidgetPoint2D::setHighlighted(bool isHighlighted)
 {
-  bool aCanBeActivated = false;
-  if (feature()->getKind() == SketchPlugin_Line::ID() &&
-      attributeID() == SketchPlugin_Line::START_ID())
-    aCanBeActivated = true;
-
-  return aCanBeActivated;
 }
 
 void PartSet_WidgetPoint2D::deactivate()
@@ -356,17 +369,11 @@ void PartSet_WidgetPoint2D::deactivate()
     storeValue();
 
   ModuleBase_ModelWidget::deactivate();
-  ModuleBase_IViewer* aViewer = myWorkshop->viewer();
-  disconnect(aViewer, SIGNAL(mouseMove(ModuleBase_IViewWindow*, QMouseEvent*)),
-             this, SLOT(onMouseMove(ModuleBase_IViewWindow*, QMouseEvent*)));
-  disconnect(aViewer, SIGNAL(mouseRelease(ModuleBase_IViewWindow*, QMouseEvent*)), 
-             this, SLOT(onMouseRelease(ModuleBase_IViewWindow*, QMouseEvent*)));
-
   myWorkshop->deactivateSubShapesSelection();
 }
 
-bool PartSet_WidgetPoint2D::getPoint2d(const Handle(V3d_View)& theView, 
-                                       const TopoDS_Shape& theShape, 
+bool PartSet_WidgetPoint2D::getPoint2d(const Handle(V3d_View)& theView,
+                                       const TopoDS_Shape& theShape,
                                        double& theX, double& theY) const
 {
   if (!theShape.IsNull()) {
@@ -423,22 +430,28 @@ bool PartSet_WidgetPoint2D::setConstraintWith(const ObjectPtr& theObject)
   return true;
 }
 
-void PartSet_WidgetPoint2D::onMouseRelease(ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent)
+void PartSet_WidgetPoint2D::mouseReleased(ModuleBase_IViewWindow* theWindow, QMouseEvent* theEvent)
 {
   // the contex menu release by the right button should not be processed by this widget
   if (theEvent->button() != Qt::LeftButton)
     return;
 
   ModuleBase_ISelection* aSelection = myWorkshop->selection();
-  Handle(V3d_View) aView = theWnd->v3dView();
-  // TODO: This fragment doesn't work because bug in OCC Viewer. It can be used after fixing.
-  NCollection_List<TopoDS_Shape> aShapes;
-  std::list<ObjectPtr> aObjects;
-  aSelection->selectedShapes(aShapes, aObjects);
+  Handle(V3d_View) aView = theWindow->v3dView();
+
+  QList<ModuleBase_ViewerPrsPtr> aList = aSelection->getSelected(ModuleBase_ISelection::Viewer);
+  ModuleBase_ViewerPrsPtr aFirstValue =
+    aList.size() > 0 ? aList.first() : ModuleBase_ViewerPrsPtr();
+  if (!aFirstValue.get() && myPreSelected.get()) {
+    aFirstValue = myPreSelected;
+  }
   // if we have selection and use it
-  if (aShapes.Extent() > 0 && useSelectedShapes()) {
-    TopoDS_Shape aShape = aShapes.First();
-    ObjectPtr aObject = aObjects.front();
+  if (aFirstValue.get() && isValidSelectionCustom(aFirstValue) &&
+      aFirstValue->shape().get()) { /// Trihedron Axis may be selected, but shape is empty
+    GeomShapePtr aGeomShape = aFirstValue->shape();
+    TopoDS_Shape aShape = aGeomShape->impl<TopoDS_Shape>();
+    ObjectPtr aObject = aFirstValue->object();
+
     FeaturePtr aSelectedFeature = ModelAPI_Feature::feature(aObject);
     bool anExternal = false;
     std::shared_ptr<SketchPlugin_Feature> aSPFeature;
@@ -465,19 +478,31 @@ void PartSet_WidgetPoint2D::onMouseRelease(ModuleBase_IViewWindow* theWnd, QMous
           bool anOrphanPoint = aShape.ShapeType() == TopAbs_VERTEX ||
                                isOrphanPoint(aSelectedFeature, mySketch, aX, aY);
           if (anExternal) {
-            anOrphanPoint = true; // we should not stop reentrant operation on external objects because
+            // we should not stop reentrant operation on external objects because
+            anOrphanPoint = true;
             // they are not participate in the contour creation excepting external vertices
             if (aShape.ShapeType() == TopAbs_VERTEX) {
               FeaturePtr aFixedFeature = ModelAPI_Feature::feature(aFixedObject);
               if (aFixedFeature.get() && aFixedFeature->getKind() == SketchPlugin_Point::ID()) {
-                anOrphanPoint = isOrphanPoint(aFixedFeature, mySketch, aX, aY, true);
+                anOrphanPoint = isOrphanPoint(aFixedFeature, mySketch, aX, aY);
               }
             }
+            else {
+              // point is taken from mouse event and set in attribute.
+              // It should be done before setting
+              // coinident constraint to the external line. If a point is created, it should be
+              // in the mouse clicked point
+              gp_Pnt aPoint =
+                PartSet_Tools::convertClickToPoint(theEvent->pos(), theWindow->v3dView());
+              double aX, anY;
+              PartSet_Tools::convertTo2D(aPoint, mySketch, aView, aX, anY);
+              setPoint(aX, anY);
+            }
           }
           if (aFixedObject.get())
             setConstraintWith(aFixedObject);
-          // fignal updated should be flushed in order to visualize possible created external objects
-          // e.g. selection of trihedron axis when input end arc point
+          // fignal updated should be flushed in order to visualize possible created
+          // external objects e.g. selection of trihedron axis when input end arc point
           updateObject(feature());
 
           if (!anOrphanPoint)
@@ -506,21 +531,17 @@ void PartSet_WidgetPoint2D::onMouseRelease(ModuleBase_IViewWindow* theWnd, QMous
           PartSet_Tools::setConstraints(mySketch, feature(), attributeID(), aX, aY);
         }
         else if (aShape.ShapeType() == TopAbs_EDGE) {
-          if (!setConstraintWith(aObject)) {
-            gp_Pnt aPoint = PartSet_Tools::convertClickToPoint(theEvent->pos(), theWnd->v3dView());
-            PartSet_Tools::convertTo2D(aPoint, mySketch, aView, aX, aY);
-            setPoint(aX, aY);
-          }
+          // point is taken from mouse event and set in attribute. It should be done before setting
+          // coinident constraint to the external line. If a point is created, it should be in
+          // the mouse clicked point
+          gp_Pnt aPoint = PartSet_Tools::convertClickToPoint(theEvent->pos(), theWindow->v3dView());
+          PartSet_Tools::convertTo2D(aPoint, mySketch, aView, aX, aY);
+          setPoint(aX, aY);
+          setConstraintWith(aObject);
           setValueState(Stored); // in case of edge selection, Apply state should also be updated
-
-          FeaturePtr anObjectFeature = ModelAPI_Feature::feature(aObject);
-          std::string anAuxiliaryAttribute = SketchPlugin_SketchEntity::AUXILIARY_ID();
-          AttributeBooleanPtr anAuxiliaryAttr = std::dynamic_pointer_cast<ModelAPI_AttributeBoolean>(
-                                            anObjectFeature->data()->attribute(anAuxiliaryAttribute));
-          if (anAuxiliaryAttr.get())
-            isAuxiliaryFeature = anAuxiliaryAttr->value();
+          isAuxiliaryFeature = PartSet_Tools::isAuxiliarySketchEntity(aObject);
         }
-        // it is important to perform updateObject() in order to the current value is 
+        // it is important to perform updateObject() in order to the current value is
         // processed by Sketch Solver. Test case: line is created from a previous point
         // to some distance, but in the area of the highlighting of the point. Constraint
         // coincidence is created, after the solver is performed, the distance between the
@@ -536,7 +557,7 @@ void PartSet_WidgetPoint2D::onMouseRelease(ModuleBase_IViewWindow* theWnd, QMous
   // End of Bug dependent fragment
   else {
     // A case when point is taken from mouse event
-    gp_Pnt aPoint = PartSet_Tools::convertClickToPoint(theEvent->pos(), theWnd->v3dView());
+    gp_Pnt aPoint = PartSet_Tools::convertClickToPoint(theEvent->pos(), theWindow->v3dView());
     double aX, anY;
     PartSet_Tools::convertTo2D(aPoint, mySketch, aView, aX, anY);
 
@@ -551,7 +572,7 @@ void PartSet_WidgetPoint2D::onMouseRelease(ModuleBase_IViewWindow* theWnd, QMous
     //aIgnore.append(feature());
 
     //double aTolerance = aView->Convert(7);
-    //std::shared_ptr<GeomDataAPI_Point2D> aAttrPnt = 
+    //std::shared_ptr<GeomDataAPI_Point2D> aAttrPnt =
     //  PartSet_Tools::findAttributePoint(mySketch, aX, anY, aTolerance, aIgnore);
     //if (aAttrPnt.get() != NULL) {
     //  aFeaturePoint->setValue(aAttrPnt->pnt());
@@ -563,19 +584,26 @@ void PartSet_WidgetPoint2D::onMouseRelease(ModuleBase_IViewWindow* theWnd, QMous
   }
 }
 
+void PartSet_WidgetPoint2D::setPreSelection(
+  const std::shared_ptr<ModuleBase_ViewerPrs>& thePreSelected)
+{
+  myPreSelected = thePreSelected;
+}
 
-void PartSet_WidgetPoint2D::onMouseMove(ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent)
+void PartSet_WidgetPoint2D::mouseMoved(ModuleBase_IViewWindow* theWindow, QMouseEvent* theEvent)
 {
-  if (isEditingMode())
+  PartSet_Module* aModule = dynamic_cast<PartSet_Module*>(myWorkshop->module());
+
+  if (isEditingMode() || aModule->sketchReentranceMgr()->isInternalEditStarted())
     return;
 
-  gp_Pnt aPoint = PartSet_Tools::convertClickToPoint(theEvent->pos(), theWnd->v3dView());
+  gp_Pnt aPoint = PartSet_Tools::convertClickToPoint(theEvent->pos(), theWindow->v3dView());
 
   double aX, anY;
-  PartSet_Tools::convertTo2D(aPoint, mySketch, theWnd->v3dView(), aX, anY);
+  PartSet_Tools::convertTo2D(aPoint, mySketch, theWindow->v3dView(), aX, anY);
   if (myState != ModifiedInViewer)
     storeCurentValue();
-  // we need to block the value state change 
+  // we need to block the value state change
   bool isBlocked = blockValueState(true);
   setPoint(aX, anY);
   blockValueState(isBlocked);
@@ -603,7 +631,7 @@ bool PartSet_WidgetPoint2D::isFeatureContainsPoint(const FeaturePtr& theFeature,
 
   AttributePtr aWidgetAttribute = myFeature->attribute(attributeID());
 
-  std::shared_ptr<GeomAPI_Pnt2d> aPnt2d = 
+  std::shared_ptr<GeomAPI_Pnt2d> aPnt2d =
                                     std::shared_ptr<GeomAPI_Pnt2d>(new GeomAPI_Pnt2d(theX, theY));
   std::list<AttributePtr> anAttributes =
                                 myFeature->data()->attributes(GeomDataAPI_Point2D::typeId());
@@ -631,7 +659,8 @@ void PartSet_WidgetPoint2D::initializeValueByActivate()
 
 bool PartSet_WidgetPoint2D::processEnter()
 {
-  bool isModified = getValueState() == ModifiedInPP;
+  return false;
+  /*bool isModified = getValueState() == ModifiedInPP;
   if (isModified) {
     bool isXModified = myXSpin->hasFocus();
     emit valuesChanged();
@@ -640,7 +669,7 @@ bool PartSet_WidgetPoint2D::processEnter()
     else
       myYSpin->selectAll();
   }
-  return isModified;
+  return isModified;*/
 }
 
 bool PartSet_WidgetPoint2D::useSelectedShapes() const
@@ -650,7 +679,7 @@ bool PartSet_WidgetPoint2D::useSelectedShapes() const
 
 bool PartSet_WidgetPoint2D::isOrphanPoint(const FeaturePtr& theFeature,
                                           const CompositeFeaturePtr& theSketch,
-                                          double theX, double theY, const bool theSearchInResults)
+                                          double theX, double theY)
 {
   bool anOrphanPoint = false;
   if (theFeature.get()) {
@@ -681,14 +710,15 @@ bool PartSet_WidgetPoint2D::isOrphanPoint(const FeaturePtr& theFeature,
       std::shared_ptr<GeomAPI_Pnt2d> aPoint = aPointAttr->pnt();
       // we need to find coincidence features in results also, because external object(point)
       // uses refs to me in another feature.
-      FeaturePtr aCoincidence = PartSet_Tools::findFirstCoincidence(theFeature, aPoint, theSearchInResults);
+      FeaturePtr aCoincidence = PartSet_Tools::findFirstCoincidence(theFeature, aPoint);
       anOrphanPoint = true;
       // if there is at least one concident line to the point, the point is not an orphant
       if (aCoincidence.get()) {
         QList<FeaturePtr> aCoinsideLines;
-        PartSet_Tools::findCoincidences(aCoincidence, aCoinsideLines,
+        QList<FeaturePtr> aCoins;
+        PartSet_Tools::findCoincidences(aCoincidence, aCoinsideLines, aCoins,
                                         SketchPlugin_ConstraintCoincidence::ENTITY_A());
-        PartSet_Tools::findCoincidences(aCoincidence, aCoinsideLines,
+        PartSet_Tools::findCoincidences(aCoincidence, aCoinsideLines, aCoins,
                                         SketchPlugin_ConstraintCoincidence::ENTITY_B());
         QList<FeaturePtr>::const_iterator anIt = aCoinsideLines.begin(),
                                           aLast = aCoinsideLines.end();
@@ -700,3 +730,20 @@ bool PartSet_WidgetPoint2D::isOrphanPoint(const FeaturePtr& theFeature,
   }
   return anOrphanPoint;
 }
+
+bool PartSet_WidgetPoint2D::shapeContainsPoint(const GeomShapePtr& theShape,
+                                               const std::shared_ptr<GeomAPI_Pnt2d>& thePoint,
+                                               const CompositeFeaturePtr& theSketch)
+{
+  std::shared_ptr<GeomAPI_Pnt> aPoint = PartSet_Tools::point3D(thePoint, theSketch);
+
+  bool aContainPoint = false;
+  GeomAPI_ShapeExplorer anExp(theShape, GeomAPI_Shape::VERTEX);
+  for(; anExp.more() && !aContainPoint; anExp.next()) {
+    std::shared_ptr<GeomAPI_Shape> aVertexInCompSolid = anExp.current();
+    std::shared_ptr<GeomAPI_Vertex> aVertex(new GeomAPI_Vertex(aVertexInCompSolid));
+    if (aVertex.get())
+      aContainPoint = aPoint->isEqual(aVertex->point());
+  }
+  return aContainPoint;
+}