X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_WidgetPoint2d.h;h=6992569bac26f75f47eff989b7f27362d5a85fad;hb=383021cb51c4720904096ca851db5ee79255b402;hp=d4271e5589c6c4d8319a8b29427d37f9b4af21a5;hpb=8abdbb054d2e130d01aaf11ee6d5b984ce1e0b71;p=modules%2Fshaper.git

diff --git a/src/PartSet/PartSet_WidgetPoint2d.h b/src/PartSet/PartSet_WidgetPoint2d.h
index d4271e558..6992569ba 100755
--- a/src/PartSet/PartSet_WidgetPoint2d.h
+++ b/src/PartSet/PartSet_WidgetPoint2d.h
@@ -42,18 +42,21 @@ Q_OBJECT
   /// \param theParent the parent object
   /// \param theWorkshop a current workshop
   /// \param theData the widget configuation. The attribute of the model widget is obtained from
-  /// \param theParentId is Id of a parent of the current attribute
   PartSet_WidgetPoint2D(QWidget* theParent, ModuleBase_IWorkshop* theWorkshop,
-                        const Config_WidgetAPI* theData, 
-                        const std::string& theParentId);
+                        const Config_WidgetAPI* theData);
   /// Destructor
   virtual ~PartSet_WidgetPoint2D();
 
+  /// Checks if the selection presentation is valid in widget 
+  /// \param theValue a selected presentation in the view
+  /// \return a boolean value
+  virtual bool isValidSelectionCustom(const std::shared_ptr<ModuleBase_ViewerPrs>& theValue);
+
   /// Set the given wrapped value to the current widget
   /// This value should be processed in the widget according to the needs
   /// \param theValues the wrapped widget values
   /// \param theToValidate a validation flag
-  virtual bool setSelection(QList<ModuleBase_ViewerPrs>& theValues,
+  virtual bool setSelection(QList<std::shared_ptr<ModuleBase_ViewerPrs>>& theValues,
                             const bool theToValidate);
 
   /// Select the internal content if it can be selected. It is empty in the default realization
@@ -115,7 +118,7 @@ public slots:
 protected:
   /// Saves the internal parameters to the given feature
   /// \return True in success
-  virtual bool storeValueCustom() const;
+  virtual bool storeValueCustom();
 
   /// Restore value from attribute data to the widget's control
   virtual bool restoreValueCustom();
@@ -164,7 +167,8 @@ protected:
 
    /// Create a coincidence constraint between the attribute and the parameter object
    /// \theObject a result object
-   void setConstraintWith(const ObjectPtr& theObject);
+   /// \return true if succed
+   bool setConstraintWith(const ObjectPtr& theObject);
 
    /// Returns if the feature is an orphan point, circle or an arc. Returns true if it
    /// has no a coincident to other lines. It processes point, circle and arc features
@@ -176,7 +180,15 @@ protected:
    /// \param theY an Y coordinate of the point
    /// \return boolean result
    static bool isOrphanPoint(const FeaturePtr& theFeature, const CompositeFeaturePtr& theSketch,
-                             double theX, double theY, const bool theSearchInResults = false);
+                             double theX, double theY);
+
+   /// Explode the given shape by vertices and found closed to the point vertes
+   /// \param theShape a shape to be exploded
+   /// \param thePoint a point
+   /// \return boolean value
+   static bool shapeContainsPoint(const std::shared_ptr<GeomAPI_Shape>& theShape,
+                                  const std::shared_ptr<GeomAPI_Pnt2d>& thePoint,
+                                  const CompositeFeaturePtr& theSketch);
 
 protected:
   ModuleBase_IWorkshop* myWorkshop; ///< workshop
@@ -187,8 +199,6 @@ private:
   ModuleBase_ParamSpinBox* myXSpin;  ///< the spin box for the X coordinate
   ModuleBase_ParamSpinBox* myYSpin;  ///< the spin box for the Y coordinate
 
-  //std::string myOptionParam;  /// Parameter name which has to be taken from previous feature
-
   CompositeFeaturePtr mySketch;
 
   bool myValueIsCashed; /// boolean state if the value is cashed during value state change