Salome HOME
updated copyright message
[modules/shaper.git] / src / PartSet / PartSet_WidgetPoint2d.cpp
index e83e75751a2c18ad28dc32890978230b4e1281f8..9ba1d659a46c8d5b7ab0397aef82a0dff18fb568 100644 (file)
@@ -1,13 +1,28 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        PartSet_WidgetPoint2D.cpp
-// Created:     25 Apr 2014
-// Author:      Natalia ERMOLAEVA
+// Copyright (C) 2014-2023  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
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include "PartSet_WidgetPoint2d.h"
 #include <PartSet_Tools.h>
 #include <PartSet_Module.h>
-#include <PartSet_SketcherReetntrantMgr.h>
+#include <PartSet_SketcherReentrantMgr.h>
+#include <PartSet_ExternalObjectsMgr.h>
+#include <PartSet_CenterPrs.h>
 
 #include <XGUI_Tools.h>
 #include <XGUI_Workshop.h>
 #include <ModuleBase_ISelection.h>
 #include <ModuleBase_ViewerPrs.h>
 #include <ModuleBase_WidgetValidator.h>
+#include <ModuleBase_WidgetValidated.h>
+#include <ModuleBase_LabelValue.h>
 
 #include <Config_Keywords.h>
 #include <Config_WidgetAPI.h>
 
 #include <Events_Loop.h>
+#include <Events_InfoMessage.h>
 #include <ModelAPI_Events.h>
 #include <ModelAPI_AttributeBoolean.h>
+#include <ModelAPI_AttributeRefAttr.h>
+#include <ModelAPI_AttributeRefList.h>
+#include <ModelAPI_Validator.h>
+#include <ModelAPI_Session.h>
 
 #include <ModelAPI_Feature.h>
 #include <ModelAPI_Data.h>
@@ -54,6 +76,7 @@
 #include <TopoDS.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <BRep_Tool.hxx>
+#include <Geom_Point.hxx>
 
 #include <cfloat>
 #include <climits>
@@ -62,13 +85,14 @@ 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),
   myValueIsCashed(false), myIsFeatureVisibleInCash(true),
   myXValueInCash(0), myYValueInCash(0)
 {
+  myRefAttribute = theData->getProperty("reference_attribute");
   if (MyFeaturesForCoincedence.isEmpty()) {
     MyFeaturesForCoincedence << SketchPlugin_Line::ID().c_str()
       << SketchPlugin_Arc::ID().c_str()
@@ -78,66 +102,44 @@ PartSet_WidgetPoint2D::PartSet_WidgetPoint2D(QWidget* theParent,
 
   // the control should accept the focus, so the boolean flag is corrected to be true
   myIsObligatory = true;
-  QString aPageName = QString::fromStdString(theData->getProperty(CONTAINER_PAGE_NAME));
+  QString aPageName = translate(theData->getProperty(CONTAINER_PAGE_NAME));
   myGroupBox = new QGroupBox(aPageName, theParent);
   myGroupBox->setFlat(false);
 
-  bool aAcceptVariables = theData->getBooleanAttribute(DOUBLE_WDG_ACCEPT_EXPRESSIONS, true);
+#ifdef _DEBUG
+  bool aAcceptVariables =
+#endif
+    theData->getBooleanAttribute(DOUBLE_WDG_ACCEPT_EXPRESSIONS, true);
 
   QGridLayout* aGroupLay = new QGridLayout(myGroupBox);
   ModuleBase_Tools::adjustMargins(aGroupLay);
   aGroupLay->setSpacing(2);
   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"));
-    aGroupLay->addWidget(myXSpin, 0, 1);
-
-    connect(myXSpin, SIGNAL(valueChanged(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"));
-    aGroupLay->addWidget(myYSpin, 1, 1);
-
-    connect(myYSpin, SIGNAL(valueChanged(const QString&)), this, SIGNAL(valuesModified()));
-    myYSpin->setValueEnabled(isValueEnabled());
-  }
+
+  myXSpin = new ModuleBase_LabelValue(myGroupBox, tr("X"));
+  aGroupLay->addWidget(myXSpin, 0, 1);
+  myYSpin = new ModuleBase_LabelValue(myGroupBox, tr("Y"));
+  aGroupLay->addWidget(myYSpin, 1, 1);
+
   QVBoxLayout* aLayout = new QVBoxLayout(this);
   ModuleBase_Tools::zeroMargins(aLayout);
   aLayout->addWidget(myGroupBox);
   setLayout(aLayout);
 
   myWidgetValidator = new ModuleBase_WidgetValidator(this, myWorkshop);
+  myExternalObjectMgr = new PartSet_ExternalObjectsMgr(theData->getProperty("use_external"),
+                                         theData->getProperty("can_create_external"), true);
 }
 
 bool PartSet_WidgetPoint2D::isValidSelectionCustom(const ModuleBase_ViewerPrsPtr& theValue)
 {
-  bool aValid = true;
-
   PartSet_Module* aModule = dynamic_cast<PartSet_Module*>(myWorkshop->module());
-  if (aModule->sketchReentranceMgr()->isInternalEditActive()) 
+  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()) {
@@ -151,30 +153,91 @@ bool PartSet_WidgetPoint2D::isValidSelectionCustom(const ModuleBase_ViewerPrsPtr
   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);
+  AttributeRefAttrPtr aRefAttr = attributeRefAttr();
+  if (aRefAttr.get())
+    return isValidSelectionForAttribute_(theValue, myFeature->attribute(attributeID()));
+  else {
+    bool aFoundPoint = false;
+    /// Avoid coincidence build to passed point. Coincidence is build later only if there are no
+    /// reference attribute.
+    /// The condition is that the selected feature has shape that has after explore a point
+    /// equal to clicked one.
+    std::shared_ptr<ModelAPI_Data> aData = myFeature->data();
+    AttributePoint2DPtr aPointAttr = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
+        aData->attribute(attributeID()));
+    std::shared_ptr<GeomAPI_Pnt2d> aPoint = aPointAttr->pnt();
+    if (anAISShape.get())
+      aFoundPoint = shapeExploreHasVertex(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 = shapeExploreHasVertex(aShape, aPoint, mySketch);
+      }
+    }
+    return aFoundPoint;
+  }
+  return true;
+}
+
+//********************************************************************
+bool PartSet_WidgetPoint2D::isValidSelectionForAttribute_(
+                                            const ModuleBase_ViewerPrsPtr& theValue,
+                                            const AttributePtr& theAttribute)
+{
+  bool aValid = false;
+
+  // stores the current values of the widget attribute
+  bool isFlushesActived, isAttributeSetInitializedBlocked, isAttributeSendUpdatedBlocked;
+
+  AttributeRefAttrPtr aRefAttr = attributeRefAttr();
+  ModuleBase_WidgetValidated::blockFeatureAttribute(aRefAttr, myFeature, true,
+      isFlushesActived, isAttributeSetInitializedBlocked, isAttributeSendUpdatedBlocked);
+  myWidgetValidator->storeAttributeValue(aRefAttr);
+
+  // saves the owner value to the widget attribute
+  aValid = setSelectionCustom(theValue);
+  if (aValid)
+    // checks the attribute validity
+    aValid = myWidgetValidator->isValidAttribute(theAttribute);
+
+  // restores the current values of the widget attribute
+  myWidgetValidator->restoreAttributeValue(aRefAttr, aValid);
+  myExternalObjectMgr->removeExternal(sketch(), myFeature, myWorkshop, true);
+
+  ModuleBase_WidgetValidated::blockFeatureAttribute(aRefAttr, myFeature, false, isFlushesActived,
+                                isAttributeSetInitializedBlocked, isAttributeSendUpdatedBlocked);
+  return aValid;
+}
+
+bool PartSet_WidgetPoint2D::setSelectionCustom(const ModuleBase_ViewerPrsPtr& theValue)
+{
+  bool isDone = false;
+  GeomShapePtr aShape = theValue->shape();
+  if (aShape.get() && !aShape->isNull()) {
+    Handle(V3d_View) aView = myWorkshop->viewer()->activeView();
+    const TopoDS_Shape& aTDShape = aShape->impl<TopoDS_Shape>();
+    GeomPnt2dPtr aPnt = PartSet_Tools::getPnt2d(aView, aTDShape, mySketch);
+    if (aPnt) {
+      fillRefAttribute(aPnt->x(), aPnt->y(), theValue);
+      isDone = true;
+    }
+    else if (aTDShape.ShapeType() == TopAbs_EDGE) {
+      fillRefAttribute(theValue);
+      isDone = true;
     }
   }
-  return aFoundPoint;
+  return isDone;
 }
 
 bool PartSet_WidgetPoint2D::resetCustom()
 {
   bool aDone = false;
-  if (!isUseReset() || isComputedDefault() || myXSpin->hasVariable() || myYSpin->hasVariable()) {
+  if (!isUseReset() || isComputedDefault()
+      /*|| myXSpin->hasVariable() || myYSpin->hasVariable()*/) {
     aDone = false;
   }
   else {
@@ -189,8 +252,11 @@ bool PartSet_WidgetPoint2D::resetCustom()
       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;
     }
@@ -200,6 +266,7 @@ bool PartSet_WidgetPoint2D::resetCustom()
 
 PartSet_WidgetPoint2D::~PartSet_WidgetPoint2D()
 {
+  delete myExternalObjectMgr;
 }
 
 bool PartSet_WidgetPoint2D::setSelection(QList<ModuleBase_ViewerPrsPtr>& theValues,
@@ -210,23 +277,29 @@ bool PartSet_WidgetPoint2D::setSelection(QList<ModuleBase_ViewerPrsPtr>& theValu
     return isDone;
 
   ModuleBase_ViewerPrsPtr aValue = theValues.takeFirst();
-  GeomShapePtr aShape = aValue->shape();
-  if (aShape.get() && !aShape->isNull()) {
-    Handle(V3d_View) aView = myWorkshop->viewer()->activeView();
-    double 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);
+
+  if (!theToValidate || myWidgetValidator->isValidSelection(aValue)) {
+    GeomShapePtr aShape = aValue->shape();
+    if (aShape.get() && !aShape->isNull()) {
+      Handle(V3d_View) aView = myWorkshop->viewer()->activeView();
+      const TopoDS_Shape& aTDShape = aShape->impl<TopoDS_Shape>();
+      GeomPnt2dPtr aPnt = PartSet_Tools::getPnt2d(aView, aTDShape, mySketch);
+
+      if (aPnt) {
+        //isDone = setPoint(aPnt->x(), aPnt->y());
+        //setConstraintToPoint(aPnt->x(), aPnt->y(), aValue);
+        processSelection(aValue, aPnt->x(), aPnt->y());
+        isDone = true;
+      }
     }
   }
   return isDone;
 }
 
-void PartSet_WidgetPoint2D::selectContent()
-{
-  myXSpin->selectAll();
-}
+//void PartSet_WidgetPoint2D::selectContent()
+//{
+// // myXSpin->selectAll();
+//}
 
 bool PartSet_WidgetPoint2D::setPoint(double theX, double theY)
 {
@@ -235,8 +308,11 @@ 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;
@@ -245,9 +321,9 @@ bool PartSet_WidgetPoint2D::setPoint(double theX, double theY)
 bool PartSet_WidgetPoint2D::storeValueCustom()
 {
   std::shared_ptr<ModelAPI_Data> aData = myFeature->data();
-  if (!aData) // can be on abort of sketcher element
+  if (!aData || !aData->isValid()) // can be on abort of sketcher element
     return false;
-  std::shared_ptr<GeomDataAPI_Point2D> aPoint = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
+  AttributePoint2DPtr aPoint = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
       aData->attribute(attributeID()));
 
   PartSet_WidgetPoint2D* that = (PartSet_WidgetPoint2D*) this;
@@ -256,13 +332,28 @@ bool PartSet_WidgetPoint2D::storeValueCustom()
 
   // 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());
+
+  if (myFeature->isMacro()) {
+    // Moving points of macro-features has been processed directly (without solver)
+    aPoint->setValue(myXSpin->value(), myYSpin->value());
+    updateObject(myFeature);
+
+  } else {
+    if (!aPoint->isInitialized())
+      aPoint->setValue(0., 0.);
+
+    std::shared_ptr<ModelAPI_ObjectMovedMessage> aMessage(
+        new ModelAPI_ObjectMovedMessage(this));
+    aMessage->setMovedAttribute(aPoint);
+    aMessage->setOriginalPosition(aPoint->pnt());
+    aMessage->setCurrentPosition(myXSpin->value(), myYSpin->value());
+    Events_Loop::loop()->send(aMessage);
+  }
 
-  // after movement the solver will call the update event: optimization
-  moveObject(myFeature);
   aPoint->setImmutable(isImmutable);
   that->blockSignals(isBlocked);
 
@@ -272,46 +363,21 @@ bool PartSet_WidgetPoint2D::storeValueCustom()
 bool PartSet_WidgetPoint2D::restoreValueCustom()
 {
   std::shared_ptr<ModelAPI_Data> aData = myFeature->data();
-  std::shared_ptr<GeomDataAPI_Point2D> aPoint = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
+  AttributePoint2DPtr aPoint = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
       aData->attribute(attributeID()));
-  QString aTextX = QString::fromStdString(aPoint->isInitialized() ? aPoint->textX() : "0");
-  QString aTextY = QString::fromStdString(aPoint->isInitialized() ? aPoint->textY() : "0");
+  double aValueX = aPoint->isInitialized() ? aPoint->x() : 0.;
+  double aValueY = aPoint->isInitialized() ? aPoint->y() : 0.;
+  myXSpin->setValue(aValueX);
+  myYSpin->setValue(aValueY);
 
-  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));
-  //}
   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(
@@ -329,8 +395,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();
@@ -352,14 +420,17 @@ QList<QWidget*> PartSet_WidgetPoint2D::getControls() const
   return aControls;
 }
 
+//********************************************************************
+void PartSet_WidgetPoint2D::selectionModes(int& theModuleSelectionModes, QIntList& theModes)
+{
+  theModuleSelectionModes = -1;
+  theModes << TopAbs_VERTEX;
+  theModes << TopAbs_EDGE;
+}
 
+//********************************************************************
 void PartSet_WidgetPoint2D::activateCustom()
 {
-  QIntList aModes;
-  aModes << TopAbs_VERTEX;
-  aModes << TopAbs_EDGE;
-  myWorkshop->activateSubShapesSelection(aModes);
-
   if (!isEditingMode()) {
     FeaturePtr aFeature = feature();
     if (aFeature.get() && aFeature->getKind() == SketchPlugin_Point::ID())
@@ -367,6 +438,10 @@ void PartSet_WidgetPoint2D::activateCustom()
   }
 }
 
+void PartSet_WidgetPoint2D::setHighlighted(bool isHighlighted)
+{
+}
+
 void PartSet_WidgetPoint2D::deactivate()
 {
   // the value of the control should be stored to model if it was not
@@ -378,64 +453,91 @@ void PartSet_WidgetPoint2D::deactivate()
     storeValue();
 
   ModuleBase_ModelWidget::deactivate();
-  myWorkshop->deactivateSubShapesSelection();
 }
 
-bool PartSet_WidgetPoint2D::getPoint2d(const Handle(V3d_View)& theView, 
-                                       const TopoDS_Shape& theShape, 
-                                       double& theX, double& theY) const
+bool PartSet_WidgetPoint2D::setConstraintToPoint(double theClickedX, double theClickedY,
+                                  const std::shared_ptr<ModuleBase_ViewerPrs>& theValue)
 {
-  if (!theShape.IsNull()) {
-    if (theShape.ShapeType() == TopAbs_VERTEX) {
-      const TopoDS_Vertex& aVertex = TopoDS::Vertex(theShape);
-      if (!aVertex.IsNull()) {
-        // A case when point is taken from existing vertex
-        gp_Pnt aPoint = BRep_Tool::Pnt(aVertex);
-        PartSet_Tools::convertTo2D(aPoint, mySketch, theView, theX, theY);
-        return true;
-      }
+  AttributeRefAttrPtr aRefAttr = attributeRefAttr();
+  if (aRefAttr.get())
+    fillRefAttribute(theClickedX, theClickedY, theValue);
+  else {
+    FeaturePtr aFeature = feature();
+    std::string anAttribute = attributeID();
+
+    if (!aFeature.get())
+      return false;
+
+    std::shared_ptr<GeomAPI_Pnt2d> aClickedPoint = std::shared_ptr<GeomAPI_Pnt2d>(
+                                     new GeomAPI_Pnt2d(theClickedX, theClickedY));
+    AttributePoint2DPtr aClickedFeaturePoint = findFirstEqualPointInSketch(mySketch,
+                                                           aFeature, aClickedPoint);
+    if (!aClickedFeaturePoint.get())
+      return false;
+
+  //  aRefAttr->setAttr(aClickedFeaturePoint);
+  //else {
+    // find a feature point by the selection mode
+    AttributePoint2DPtr aFeaturePoint;
+    if (aFeature->isMacro()) {
+      // the macro feature will be removed after the operation is stopped, so we need to build
+      // coincidence to possible sub-features
+      aFeaturePoint = findFirstEqualPointInArgumentFeatures(aFeature, aClickedPoint);
+    }
+    else {
+      aFeaturePoint = std::dynamic_pointer_cast<
+                                     GeomDataAPI_Point2D>(aFeature->data()->attribute(anAttribute));
     }
+    if (!aFeaturePoint.get())
+      return false;
+
+    PartSet_Tools::createConstraint(mySketch, aClickedFeaturePoint, aFeaturePoint);
   }
-  return false;
+  return true;
 }
 
-bool PartSet_WidgetPoint2D::setConstraintWith(const ObjectPtr& theObject)
+bool PartSet_WidgetPoint2D::setConstraintToObject(const ObjectPtr& theObject)
 {
-  std::shared_ptr<GeomDataAPI_Point2D> aFeaturePoint;
-  if (feature()->isMacro()) {
-    AttributePtr aThisAttr = feature()->data()->attribute(attributeID());
-    std::shared_ptr<GeomDataAPI_Point2D> anAttrPoint =
-                               std::dynamic_pointer_cast<GeomDataAPI_Point2D>(aThisAttr);
-    if (anAttrPoint.get()) {
-      // the macro feature will be removed after the operation is stopped, so we need to build
-      // coicidence to possible sub-features
-      aFeaturePoint = PartSet_Tools::findFirstEqualPointInArgumentFeatures(feature(),
-                                                                 anAttrPoint->pnt());
-    }
+  AttributeRefAttrPtr aRefAttr = attributeRefAttr();
+  if (aRefAttr.get()) {
+    fillRefAttribute(theObject);
   }
   else {
-    AttributePtr aThisAttr = feature()->data()->attribute(attributeID());
-    aFeaturePoint = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(aThisAttr);
-  }
-  if (!aFeaturePoint.get())
-    return false;
-
-  // Create point-edge coincedence
-  FeaturePtr aFeature = mySketch->addFeature(SketchPlugin_ConstraintCoincidence::ID());
-  std::shared_ptr<ModelAPI_Data> aData = aFeature->data();
+    AttributePoint2DPtr aFeaturePoint;
+
+    if (feature()->isMacro()) {
+      AttributePtr aThisAttr = feature()->data()->attribute(attributeID());
+      AttributePoint2DPtr anAttrPoint = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(aThisAttr);
+      if (anAttrPoint.get()) {
+        // the macro feature will be removed after the operation is stopped, so we need to build
+        // coincidence to possible sub-features
+        aFeaturePoint = findFirstEqualPointInArgumentFeatures(feature(),
+                                                                   anAttrPoint->pnt());
+      }
+    }
+    else {
+      AttributePtr aThisAttr = feature()->data()->attribute(attributeID());
+      aFeaturePoint = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(aThisAttr);
+    }
+    if (!aFeaturePoint.get())
+      return false;
 
-  std::shared_ptr<ModelAPI_AttributeRefAttr> aRef1 = std::dynamic_pointer_cast<
-      ModelAPI_AttributeRefAttr>(aData->attribute(SketchPlugin_Constraint::ENTITY_A()));
+    // Create point-edge coincedence
+    FeaturePtr aFeature = mySketch->addFeature(SketchPlugin_ConstraintCoincidence::ID());
+    std::shared_ptr<ModelAPI_Data> aData = aFeature->data();
 
-  aRef1->setAttr(aFeaturePoint);
+    std::shared_ptr<ModelAPI_AttributeRefAttr> aRef1 = std::dynamic_pointer_cast<
+        ModelAPI_AttributeRefAttr>(aData->attribute(SketchPlugin_Constraint::ENTITY_A()));
 
-  std::shared_ptr<ModelAPI_AttributeRefAttr> aRef2 = std::dynamic_pointer_cast<
-      ModelAPI_AttributeRefAttr>(aData->attribute(SketchPlugin_Constraint::ENTITY_B()));
-  aRef2->setObject(theObject);
+    aRef1->setAttr(aFeaturePoint);
 
-  // we need to flush created signal in order to coincidence is processed by solver
-  Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_CREATED));
+    std::shared_ptr<ModelAPI_AttributeRefAttr> aRef2 = std::dynamic_pointer_cast<
+        ModelAPI_AttributeRefAttr>(aData->attribute(SketchPlugin_Constraint::ENTITY_B()));
+    aRef2->setObject(theObject);
 
+    // we need to flush created signal in order to coincidence is processed by solver
+    Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_CREATED));
+  }
   return true;
 }
 
@@ -449,107 +551,117 @@ void PartSet_WidgetPoint2D::mouseReleased(ModuleBase_IViewWindow* theWindow, QMo
   Handle(V3d_View) aView = theWindow->v3dView();
 
   QList<ModuleBase_ViewerPrsPtr> aList = aSelection->getSelected(ModuleBase_ISelection::Viewer);
-  ModuleBase_ViewerPrsPtr aFirstValue = 
+  ModuleBase_ViewerPrsPtr aFirstValue =
     aList.size() > 0 ? aList.first() : ModuleBase_ViewerPrsPtr();
   if (!aFirstValue.get() && myPreSelected.get()) {
     aFirstValue = myPreSelected;
   }
+
+  double aX=0, aY=0;
+  bool aHasPoint = false;
+  if (aFirstValue.get()) {
+    GeomShapePtr aShape = aFirstValue->shape();
+    if (aShape.get() && aShape->shapeType() == GeomAPI_Shape::VERTEX) {
+      const TopoDS_Shape& aTDShape = aShape->impl<TopoDS_Shape>();
+      GeomPnt2dPtr aPnt = PartSet_Tools::getPnt2d(aView, aTDShape, mySketch);
+      aX = aPnt->x();
+      aY = aPnt->y();
+      aHasPoint = true;
+    }
+  }
+  if (!aHasPoint) {
+    gp_Pnt aPoint = PartSet_Tools::convertClickToPoint(theEvent->pos(), aView);
+    PartSet_Tools::convertTo2D(aPoint, mySketch, aView, aX, aY);
+  }
+  processSelection(aFirstValue, aX, aY);
+}
+
+void PartSet_WidgetPoint2D::processSelection(const ModuleBase_ViewerPrsPtr& theValue,
+  double theX, double theY)
+{
+  if (!setPoint(theX, theY))
+    return;
   // if we have selection and use it
-  if (aFirstValue.get() && isValidSelectionCustom(aFirstValue)) {
-    GeomShapePtr aGeomShape = aFirstValue->shape();
+  if (theValue.get() && isValidSelectionCustom(theValue) && theValue->shape().get()) {
+    /// Trihedron Axis may be selected, but shape is empty
+    GeomShapePtr aGeomShape = theValue->shape();
     TopoDS_Shape aShape = aGeomShape->impl<TopoDS_Shape>();
-    ObjectPtr aObject = aFirstValue->object();
+    ObjectPtr aObject = theValue->object();
 
     FeaturePtr aSelectedFeature = ModelAPI_Feature::feature(aObject);
     bool anExternal = false;
     std::shared_ptr<SketchPlugin_Feature> aSPFeature;
     if (aSelectedFeature.get() != NULL)
       aSPFeature = std::dynamic_pointer_cast<SketchPlugin_Feature>(aSelectedFeature);
-      if ((!aSPFeature && !aShape.IsNull()) ||
-          (aSPFeature.get() && aSPFeature->isExternal())) {
-        ResultPtr aFixedObject;
+
+    ResultPtr aFixedObject;
+    bool aSketchExternalFeature = aSPFeature.get() && aSPFeature->isExternal();
+    if ((!aSPFeature && !aShape.IsNull()) || aSketchExternalFeature) {
+      aFixedObject = PartSet_Tools::findFixedObjectByExternal(aShape, aObject, mySketch);
+      if (aSketchExternalFeature && !aFixedObject.get()) {/// local selection on external feature
+        anExternal = false;
+      }
+      else {
         anExternal = true;
-        aFixedObject = PartSet_Tools::findFixedObjectByExternal(aShape, aObject, mySketch);
         if (!aFixedObject.get())
-          aFixedObject = PartSet_Tools::createFixedObjectByExternal(aShape, aObject, mySketch);
-        double aX, aY;
-        if (getPoint2d(aView, aShape, aX, aY) && isFeatureContainsPoint(myFeature, aX, aY)) {
-          // do not create a constraint to the point, which already used by the feature
-          // if the feature contains the point, focus is not switched
-          setPoint(aX, aY);
+        {
+          FeaturePtr aCreatedFeature;
+          aFixedObject = PartSet_Tools::createFixedObjectByExternal(aGeomShape, aObject, mySketch,
+            false, aCreatedFeature);
         }
-        else {
-          if (getPoint2d(aView, aShape, aX, aY))
-            setPoint(aX, aY);
-          else
-            setValueState(Stored); // in case of edge selection, Apply state should also be updated
-          bool anOrphanPoint = aShape.ShapeType() == TopAbs_VERTEX ||
-                               isOrphanPoint(aSelectedFeature, mySketch, aX, aY);
-          if (anExternal) {
-            // 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);
-              }
-            }
-            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 (anExternal) {
+      if (!isFeatureContainsPoint(myFeature, theX, theY)) {
+        if (aShape.ShapeType() == TopAbs_EDGE) {
+          setValueState(Stored); // in case of edge selection, Apply state should also be updated
+        }
+        bool anOrphanPoint = aShape.ShapeType() == TopAbs_VERTEX ||
+                              isOrphanPoint(aSelectedFeature, mySketch, theX, theY);
+        if (anExternal) {
+          // 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, theX, theY);
             }
           }
-          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
-          updateObject(feature());
+        }
+        if (aFixedObject.get())
+          setConstraintToObject(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
+        updateObject(feature());
 
-          if (!anOrphanPoint)
-            emit vertexSelected(); // it stops the reentrant operation
+        if (!anOrphanPoint)
+          emit vertexSelected(); // it stops the reentrant operation
 
-          emit focusOutWidget(this);
-        }
-      }
-    if (!anExternal) {
-      double aX, aY;
-      bool isProcessed = false;
-      if (getPoint2d(aView, aShape, aX, aY) && isFeatureContainsPoint(myFeature, aX, aY)) {
-        // when the point is selected, the coordinates of the point should be set into the attribute
-        // if the feature contains the point, focus is not switched
-        setPoint(aX, aY);
+        myPreSelected.reset();
+        emit focusOutWidget(this);
       }
-      else {
+    }
+    else {
+      if (!isFeatureContainsPoint(myFeature, theX, theY)) {
+        double aX = 0, aY = 0;
         bool anOrphanPoint = isOrphanPoint(aSelectedFeature, mySketch, aX, aY);
         // do not set a coincidence constraint in the attribute if the feature contains a point
         // with the same coordinates. It is important for line creation in order to do not set
         // the same constraints for the same points, oterwise the result line has zero length.
         bool isAuxiliaryFeature = false;
-        if (getPoint2d(aView, aShape, aX, aY)) {
-          setPoint(aX, aY);
-          feature()->execute();
-          PartSet_Tools::setConstraints(mySketch, feature(), attributeID(), aX, aY);
+        if (aShape.ShapeType() == TopAbs_VERTEX) {
+          setConstraintToPoint(theX, theY, theValue);
         }
         else if (aShape.ShapeType() == TopAbs_EDGE) {
           // 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 
+          // 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);
+          setConstraintToObject(aObject);
           setValueState(Stored); // in case of edge selection, Apply state should also be updated
           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
@@ -558,62 +670,83 @@ void PartSet_WidgetPoint2D::mouseReleased(ModuleBase_IViewWindow* theWindow, QMo
         updateObject(feature());
         if (!anOrphanPoint && !anExternal && !isAuxiliaryFeature)
           emit vertexSelected();
+        myPreSelected.reset();
         emit focusOutWidget(this);
       }
     }
   }
-  // End of Bug dependent fragment
+  // The selection could be a center of an external circular object
+  else if (theValue.get() && (!theValue->interactive().IsNull())) {
+    Handle(PartSet_CenterPrs) aAIS =
+        Handle(PartSet_CenterPrs)::DownCast(theValue->interactive());
+    if (!aAIS.IsNull()) {
+      gp_Pnt aPntComp = aAIS->Component()->Pnt();
+      GeomVertexPtr aVertPtr(new GeomAPI_Vertex(aPntComp.X(), aPntComp.Y(), aPntComp.Z()));
+      TopoDS_Shape aShape = aVertPtr->impl<TopoDS_Shape>();
+
+      ResultPtr aFixedObject =
+          PartSet_Tools::findFixedObjectByExternal(aShape, aAIS->object(), mySketch);
+      if (!aFixedObject.get())
+      {
+        FeaturePtr aCreatedFeature;
+        aFixedObject = PartSet_Tools::createFixedByExternalCenter(aAIS->object(), aAIS->edge(),
+          aAIS->centerType(), mySketch, false, aCreatedFeature);
+      }
+      if (aFixedObject.get())
+        setConstraintToObject(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
+      updateObject(feature());
+
+      emit vertexSelected(); // it stops the reentrant operation
+      myPreSelected.reset();
+      emit focusOutWidget(this);
+    }
+  }
   else {
     // A case when point is taken from mouse event
-    gp_Pnt aPoint = PartSet_Tools::convertClickToPoint(theEvent->pos(), theWindow->v3dView());
-    double aX, anY;
-    PartSet_Tools::convertTo2D(aPoint, mySketch, aView, aX, anY);
 
     // if the feature contains the point, focus is not switched
-    if (!setPoint(aX, anY) || isFeatureContainsPoint(myFeature, aX, anY))
+    if (isFeatureContainsPoint(myFeature, theX, theY))
       return;
 
-    /// Start alternative code
-    //std::shared_ptr<GeomDataAPI_Point2D> aFeaturePoint = std::dynamic_pointer_cast<
-    //    GeomDataAPI_Point2D>(feature()->data()->attribute(attributeID()));
-    //QList<FeaturePtr> aIgnore;
-    //aIgnore.append(feature());
-
-    //double aTolerance = aView->Convert(7);
-    //std::shared_ptr<GeomDataAPI_Point2D> aAttrPnt = 
-    //  PartSet_Tools::findAttributePoint(mySketch, aX, anY, aTolerance, aIgnore);
-    //if (aAttrPnt.get() != NULL) {
-    //  aFeaturePoint->setValue(aAttrPnt->pnt());
-    //  PartSet_Tools::createConstraint(mySketch, aAttrPnt, aFeaturePoint);
-    //  emit vertexSelected();
-    //}
-    /// End alternative code
+    myPreSelected.reset();
     emit focusOutWidget(this);
   }
 }
 
 void PartSet_WidgetPoint2D::setPreSelection(
-  const std::shared_ptr<ModuleBase_ViewerPrs>& thePreSelected)
+                               const std::shared_ptr<ModuleBase_ViewerPrs>& thePreSelected,
+                               ModuleBase_IViewWindow* theWnd,
+                               QMouseEvent* theEvent)
 {
   myPreSelected = thePreSelected;
+  mouseReleased(theWnd, theEvent);
+}
+
+void PartSet_WidgetPoint2D::getGeomSelection_(const std::shared_ptr<ModuleBase_ViewerPrs>& theValue,
+                                              ObjectPtr& theObject,
+                                              GeomShapePtr& theShape)
+{
+  myExternalObjectMgr->getGeomSelection(theValue, theObject, theShape, myWorkshop, sketch(), true);
 }
 
 void PartSet_WidgetPoint2D::mouseMoved(ModuleBase_IViewWindow* theWindow, QMouseEvent* theEvent)
 {
   PartSet_Module* aModule = dynamic_cast<PartSet_Module*>(myWorkshop->module());
 
-  if (isEditingMode() || aModule->sketchReentranceMgr()->isInternalEditStarted())
+  if (isEditingMode() || aModule->sketchReentranceMgr()->isInternalEditActive())
     return;
 
   gp_Pnt aPoint = PartSet_Tools::convertClickToPoint(theEvent->pos(), theWindow->v3dView());
 
-  double aX, anY;
-  PartSet_Tools::convertTo2D(aPoint, mySketch, theWindow->v3dView(), aX, anY);
+  double aX = 0, aY = 0;
+  PartSet_Tools::convertTo2D(aPoint, mySketch, theWindow->v3dView(), aX, aY);
   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);
+  setPoint(aX, aY);
   blockValueState(isBlocked);
   setValueState(ModifiedInViewer);
 }
@@ -639,7 +772,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());
@@ -667,7 +800,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();
@@ -676,7 +810,7 @@ bool PartSet_WidgetPoint2D::processEnter()
     else
       myYSpin->selectAll();
   }
-  return isModified;
+  return isModified;*/
 }
 
 bool PartSet_WidgetPoint2D::useSelectedShapes() const
@@ -690,7 +824,7 @@ bool PartSet_WidgetPoint2D::isOrphanPoint(const FeaturePtr& theFeature,
 {
   bool anOrphanPoint = false;
   if (theFeature.get()) {
-    std::shared_ptr<GeomDataAPI_Point2D> aPointAttr;
+    AttributePoint2DPtr aPointAttr;
     std::string aFeatureKind = theFeature->getKind();
     if (aFeatureKind == SketchPlugin_Point::ID())
       aPointAttr = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
@@ -723,10 +857,13 @@ bool PartSet_WidgetPoint2D::isOrphanPoint(const FeaturePtr& theFeature,
       if (aCoincidence.get()) {
         QList<FeaturePtr> aCoinsideLines;
         QList<FeaturePtr> aCoins;
+        QList<bool> anIsAttributes;
         PartSet_Tools::findCoincidences(aCoincidence, aCoinsideLines, aCoins,
-                                        SketchPlugin_ConstraintCoincidence::ENTITY_A());
+                                        SketchPlugin_ConstraintCoincidence::ENTITY_A(),
+                                        anIsAttributes);
         PartSet_Tools::findCoincidences(aCoincidence, aCoinsideLines, aCoins,
-                                        SketchPlugin_ConstraintCoincidence::ENTITY_B());
+                                        SketchPlugin_ConstraintCoincidence::ENTITY_B(),
+                                        anIsAttributes);
         QList<FeaturePtr>::const_iterator anIt = aCoinsideLines.begin(),
                                           aLast = aCoinsideLines.end();
         for (; anIt != aLast && anOrphanPoint; anIt++) {
@@ -738,9 +875,9 @@ 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)
+bool PartSet_WidgetPoint2D::shapeExploreHasVertex(const GeomShapePtr& theShape,
+                                                  const std::shared_ptr<GeomAPI_Pnt2d>& thePoint,
+                                                  const CompositeFeaturePtr& theSketch)
 {
   std::shared_ptr<GeomAPI_Pnt> aPoint = PartSet_Tools::point3D(thePoint, theSketch);
 
@@ -754,3 +891,143 @@ bool PartSet_WidgetPoint2D::shapeContainsPoint(const GeomShapePtr& theShape,
   }
   return aContainPoint;
 }
+
+AttributeRefAttrPtr PartSet_WidgetPoint2D::attributeRefAttr() const
+{
+  AttributeRefAttrPtr anAttribute;
+  if (myRefAttribute.empty())
+    return anAttribute;
+
+  AttributePtr anAttributeRef = feature()->attribute(myRefAttribute);
+  if (!anAttributeRef.get())
+    return anAttribute;
+
+  return std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(anAttributeRef);
+}
+
+void PartSet_WidgetPoint2D::fillRefAttribute(double theClickedX, double theClickedY,
+                              const std::shared_ptr<ModuleBase_ViewerPrs>& theValue)
+{
+  AttributeRefAttrPtr aRefAttr = attributeRefAttr();
+  if (!aRefAttr.get())
+    return;
+
+  FeaturePtr aFeature = feature();
+  std::string anAttribute = attributeID();
+
+  if (aFeature.get()) {
+    std::shared_ptr<GeomAPI_Pnt2d> aClickedPoint = std::shared_ptr<GeomAPI_Pnt2d>(
+                                      new GeomAPI_Pnt2d(theClickedX, theClickedY));
+    AttributePoint2DPtr aClickedFeaturePoint = findFirstEqualPointInSketch(mySketch,
+                                                            aFeature, aClickedPoint);
+    if (aClickedFeaturePoint.get())
+      aRefAttr->setAttr(aClickedFeaturePoint);
+    else {
+      ObjectPtr anObject = getGeomSelection(theValue);
+      if (anObject.get())
+        aRefAttr->setObject(anObject);
+    }
+  }
+}
+
+void PartSet_WidgetPoint2D::fillRefAttribute(const ModuleBase_ViewerPrsPtr& theValue)
+{
+  fillRefAttribute(getGeomSelection(theValue));
+}
+
+void PartSet_WidgetPoint2D::fillRefAttribute(const ObjectPtr& theObject)
+{
+  AttributeRefAttrPtr aRefAttr = attributeRefAttr();
+  if (aRefAttr.get())
+    aRefAttr->setObject(theObject);
+}
+
+std::shared_ptr<GeomDataAPI_Point2D> PartSet_WidgetPoint2D::findFirstEqualPointInArgumentFeatures(
+                  const FeaturePtr& theFeature, const std::shared_ptr<GeomAPI_Pnt2d>& thePoint)
+{
+  std::shared_ptr<GeomDataAPI_Point2D> aFeaturePoint;
+
+  // may be feature is not updated yet, execute is not performed and references features
+  // are not created. Case: rectangle macro feature
+  ModuleBase_Tools::flushUpdated(theFeature);
+
+  std::list<AttributePtr> anAttributes = theFeature->data()->attributes(
+                                          ModelAPI_AttributeRefList::typeId());
+  std::list<AttributePtr>::const_iterator anIt = anAttributes.begin(), aLast = anAttributes.end();
+  for (; anIt != aLast && !aFeaturePoint.get(); anIt++) {
+    std::shared_ptr<ModelAPI_AttributeRefList> aCurSelList =
+                                      std::dynamic_pointer_cast<ModelAPI_AttributeRefList>(*anIt);
+    for (int i = 0, aNb = aCurSelList->size(); i < aNb && !aFeaturePoint.get(); i++) {
+      ObjectPtr anObject = aCurSelList->object(i);
+      FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(anObject);
+      if (aFeature.get())
+        aFeaturePoint = findFirstEqualPoint(aFeature, thePoint);
+    }
+  }
+  return aFeaturePoint;
+}
+
+std::shared_ptr<GeomDataAPI_Point2D> PartSet_WidgetPoint2D::findFirstEqualPoint(
+                                              const FeaturePtr& theFeature,
+                                              const std::shared_ptr<GeomAPI_Pnt2d>& thePoint)
+{
+  std::shared_ptr<GeomDataAPI_Point2D> aFPoint;
+
+  // find the given point in the feature attributes
+  std::list<std::shared_ptr<ModelAPI_Attribute> > anAttiributes =
+                                    theFeature->data()->attributes(GeomDataAPI_Point2D::typeId());
+  std::list<std::shared_ptr<ModelAPI_Attribute> >::const_iterator anIt = anAttiributes.begin(),
+      aLast = anAttiributes.end();
+  ModelAPI_ValidatorsFactory* aValidators = ModelAPI_Session::get()->validators();
+
+  for (; anIt != aLast && !aFPoint; anIt++) {
+    std::shared_ptr<GeomDataAPI_Point2D> aCurPoint =
+                                             std::dynamic_pointer_cast<GeomDataAPI_Point2D>(*anIt);
+    if (aCurPoint && aCurPoint->isInitialized() &&
+        aValidators->isCase(theFeature, aCurPoint->id()) &&
+        (aCurPoint->pnt()->distance(thePoint) < Precision::Confusion())) {
+      aFPoint = aCurPoint;
+      break;
+    }
+  }
+  return aFPoint;
+}
+
+std::shared_ptr<GeomDataAPI_Point2D> PartSet_WidgetPoint2D::findFirstEqualPointInSketch(
+                                    const CompositeFeaturePtr& theSketch,
+                                    const FeaturePtr& theSkipFeature,
+                                    const std::shared_ptr<GeomAPI_Pnt2d>& thePoint)
+{
+  // get all sketch features. If the point with the given coordinates belong to any sketch feature,
+  // the constraint is created between the feature point and the found sketch point
+  std::shared_ptr<ModelAPI_Data> aData = theSketch->data();
+  std::shared_ptr<ModelAPI_AttributeRefList> aRefList = std::dynamic_pointer_cast<
+      ModelAPI_AttributeRefList>(aData->attribute(SketchPlugin_Sketch::FEATURES_ID()));
+
+  std::list<ObjectPtr> aFeatures = aRefList->list();
+  std::list<ObjectPtr>::const_iterator anIt = aFeatures.begin(), aLast = aFeatures.end();
+  std::list<std::shared_ptr<ModelAPI_Attribute> > anAttiributes;
+
+  std::shared_ptr<GeomDataAPI_Point2D> aFPoint;
+  for (; anIt != aLast; anIt++) {
+    FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(*anIt);
+    if (!aFeature.get() || (theSkipFeature.get() && theSkipFeature == aFeature))
+      continue;
+    aFPoint = PartSet_WidgetPoint2D::findFirstEqualPoint(aFeature, thePoint);
+    if (aFPoint.get())
+      break;
+  }
+  return aFPoint;
+}
+
+ObjectPtr PartSet_WidgetPoint2D::getGeomSelection(const ModuleBase_ViewerPrsPtr& theValue)
+{
+  ObjectPtr anObject;
+  GeomShapePtr aShape;
+  ModuleBase_ISelection* aSelection = myWorkshop->selection();
+  anObject = aSelection->getResult(theValue);
+  aShape = aSelection->getShape(theValue);
+  myExternalObjectMgr->getGeomSelection(theValue, anObject, aShape, myWorkshop, sketch(), true);
+
+  return anObject;
+}