X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_WidgetPoint2d.h;h=c85ad2082c2c81906cda79fbe3cdc421c5173b5b;hb=7cb6ac084270943d926ec7ef35bf9e63d6a3eaf5;hp=b5ee13c47e8d8dc442a6689ece693830eabb7a9f;hpb=053ad7ba605e6f24d496ed135a984e74491243eb;p=modules%2Fshaper.git

diff --git a/src/PartSet/PartSet_WidgetPoint2d.h b/src/PartSet/PartSet_WidgetPoint2d.h
index b5ee13c47..c85ad2082 100644
--- a/src/PartSet/PartSet_WidgetPoint2d.h
+++ b/src/PartSet/PartSet_WidgetPoint2d.h
@@ -18,10 +18,11 @@
 
 class ModelAPI_Feature;
 class ModuleBase_IWorkshop;
-class ModuleBase_DoubleSpinBox;
+class ModuleBase_ParamSpinBox;
 class ModuleBase_IViewWindow;
 class GeomAPI_Pnt2d;
-class XGUI_Workshop;
+class ModuleBase_IWorkshop;
+class PartSet_LockApplyMgr;
 
 class QGroupBox;
 class QMouseEvent;
@@ -40,25 +41,24 @@ Q_OBJECT
  public:
   /// Constructor
   /// \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, const Config_WidgetAPI* theData, 
+  PartSet_WidgetPoint2D(QWidget* theParent, ModuleBase_IWorkshop* theWorkshop,
+                        const Config_WidgetAPI* theData, 
                         const std::string& theParentId);
   /// Destructor
   virtual ~PartSet_WidgetPoint2D();
 
+  /// Fills the widget with default values
+  virtual bool reset();
+
   /// Set the given wrapped value to the current widget
   /// This value should be processed in the widget according to the needs
-  /// \param theValue the wrapped widget value
-  virtual bool setSelection(ModuleBase_ViewerPrs theValue);
-
-  virtual bool storeValue() const;
-
-  virtual bool restoreValue();
-
-  /// Returns the internal parent wiget control, that can be shown anywhere
-  /// \returns the widget
-  QWidget* getControl() const;
+  /// \param theValues the wrapped widget values
+  /// \param theToValidate a validation flag
+  virtual bool setSelection(QList<ModuleBase_ViewerPrs>& theValues,
+                            const bool theToValidate);
 
   /// Returns list of widget controls
   /// \return a control list
@@ -66,18 +66,9 @@ Q_OBJECT
 
   //bool initFromPrevious(ObjectPtr theObject);
 
-  /// The methiod called when widget is activated
-  virtual void activate();
-
   /// The methiod called when widget is deactivated
   virtual void deactivate();
 
-  /// Return workshop
-  XGUI_Workshop* workshop() const { return myWorkshop; }
-
-  /// Set workshop
-  void setWorkshop(XGUI_Workshop* theWork) { myWorkshop = theWork; }
-
   /// \returns the sketch instance
   CompositeFeaturePtr sketch() const { return mySketch; }
 
@@ -87,7 +78,8 @@ Q_OBJECT
   /// Fill the widget values by given point
   /// \param theX the X coordinate
   /// \param theY the Y coordinate
-  void setPoint(double theX, double theY);
+  /// \returns True in case of success
+  bool setPoint(double theX, double theY);
 
   /// Returns coordinate X currently defined in the control
   double x() const;
@@ -99,16 +91,35 @@ signals:
   /// Signal about selection of an existing vertex from an object
   void vertexSelected();
 
+public slots:
+  /// Process mouse move event
+  /// \param theWnd a view window
+  /// \param theEvent a mouse event
+  void onMouseMove(ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent);
+
 protected slots:
   /// Process mouse release event
   /// \param theWnd a view window
   /// \param theEvent a mouse event
   void onMouseRelease(ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent);
 
-  /// Process mouse move event
-  /// \param theWnd a view window
-  /// \param theEvent a mouse event
-  void onMouseMove(ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent);
+protected:
+  /// Saves the internal parameters to the given feature
+  /// \return True in success
+  virtual bool storeValueCustom() const;
+
+  virtual bool restoreValueCustom();
+
+  /// The methiod called when widget is activated
+  virtual void activateCustom();
+
+  /// Returns true if the feature contains Point2D attribute with the same coordinates
+  /// The attribute of the widget is not processed.
+  /// \param theFeature a feature
+  /// \param theX the X coordinate
+  /// \param theY the Y coordinate
+  /// \return boolean result
+  bool isFeatureContainsPoint(const FeaturePtr& theFeature, double theX, double theY);
 
 private slots:
   /// Process value changed event
@@ -123,11 +134,16 @@ private slots:
    bool getPoint2d(const Handle(V3d_View)& theView, const TopoDS_Shape& theShape, 
                    double& theX, double& theY) const;
 
-  XGUI_Workshop* myWorkshop;
+   /// Create a coincidence constraint between the attribute and the parameter object
+   /// \theObject a result object
+   void setConstraintWith(const ObjectPtr& theObject);
+
+  ModuleBase_IWorkshop* myWorkshop;
+  PartSet_LockApplyMgr* myLockApplyMgr; ///< a manager to lock/unlock Apply button in PP
 
   QGroupBox* myGroupBox;  ///< the parent group box for all intenal widgets
-  ModuleBase_DoubleSpinBox* myXSpin;  ///< the spin box for the X coordinate
-  ModuleBase_DoubleSpinBox* myYSpin;  ///< the spin box for the Y coordinate
+  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