X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetShapeSelector.h;h=2c8a10363e630fcade439ae6b895a0545e62459f;hb=2413ba5e387ebc030eb89aaad917991844ae518d;hp=ea5ef10a702b2f4664ba1d8da8bdff2c5e019bc4;hpb=90c499710fd0db7a6b744457f5b7bac32096f4e1;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/ModuleBase_WidgetShapeSelector.h b/src/ModuleBase/ModuleBase_WidgetShapeSelector.h
index ea5ef10a7..2c8a10363 100644
--- a/src/ModuleBase/ModuleBase_WidgetShapeSelector.h
+++ b/src/ModuleBase/ModuleBase_WidgetShapeSelector.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 
 // File:        ModuleBase_WidgetShapeSelector.h
 // Created:     2 June 2014
@@ -8,7 +8,7 @@
 #define ModuleBase_WidgetShapeSelector_H
 
 #include "ModuleBase.h"
-#include "ModuleBase_WidgetValidated.h"
+#include "ModuleBase_WidgetSelector.h"
 #include "ModuleBase_ViewerFilters.h"
 #include <ModuleBase_ViewerPrs.h>
 
@@ -26,6 +26,7 @@ class QLabel;
 class QLineEdit;
 class QToolButton;
 class ModuleBase_IWorkshop;
+class ModelAPI_Validator;
 
 /**
 * \ingroup GUI
@@ -53,58 +54,31 @@ class ModuleBase_IWorkshop;
 *        which corresponds to ModelAPI_ResultConstruction object type
 * - concealment - hide or not hide selected object after operation
 */
-class MODULEBASE_EXPORT ModuleBase_WidgetShapeSelector : public ModuleBase_WidgetValidated
+class MODULEBASE_EXPORT ModuleBase_WidgetShapeSelector : public ModuleBase_WidgetSelector
 {
 Q_OBJECT
  public:
 
-   /// Converts string value (name of shape type) to shape enum value
-   /// \param theType - string with shape type name
-   /// \return TopAbs_ShapeEnum value
-  static TopAbs_ShapeEnum shapeType(const QString& theType);
-
   /// Constructor
   /// \param theParent the parent object
   /// \param theWorkshop instance of workshop interface
   /// \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
   ModuleBase_WidgetShapeSelector(QWidget* theParent, ModuleBase_IWorkshop* theWorkshop,
-                            const Config_WidgetAPI* theData, const std::string& theParentId);
+                                 const Config_WidgetAPI* theData, const std::string& theParentId);
 
   virtual ~ModuleBase_WidgetShapeSelector();
 
-  virtual bool restoreValue();
-
-  /// Defines if it is supposed that the widget should interact with the viewer.
-  virtual bool isViewerSelector() { return true; }
-
   /// Returns list of widget controls
   /// \return a control list
   virtual QList<QWidget*> getControls() const;
 
-  /// Fills the attribute with the value of the selected owner
-  /// \param theOwner a selected owner
-  virtual bool setSelection(const Handle_SelectMgr_EntityOwner& theOwner);
-
-  /// The methiod called when widget is deactivated
-  virtual void deactivate();
-
- public slots:
-
-  /// Activate or deactivate selection
-  void activateSelection(bool toActivate);
-
- private slots:
-   /// Slot which is called on selection event
-  void onSelectionChanged();
-
  protected:
   /// Saves the internal parameters to the given feature
   /// \return True in success
   virtual bool storeValueCustom() const;
 
-  /// The methiod called when widget is activated
-  virtual void activateCustom();
+  virtual bool restoreValueCustom();
 
   /// Creates a backup of the current values of the attribute
   /// It should be realized in the specific widget because of different
@@ -118,27 +92,33 @@ Q_OBJECT
   virtual void restoreAttributeValue(const bool theValid);
 
   /// Computes and updates name of selected object in the widget
-  void updateSelectionName();
-
-  /// Raise panel which contains this widget
-  void raisePanel() const;
+  virtual void updateSelectionName();
 
-  /// Returns true if selected shape corresponds to requested shape types
-  /// \param theShape a shape
-  virtual bool acceptSubShape(std::shared_ptr<GeomAPI_Shape> theShape) const;
+  /// Clear attribute
+  virtual void clearAttribute();
 
-  // Get the shape from the attribute it the attribute contain a shape, e.g. selection attribute
-  /// \return a shape
-  GeomShapePtr getShape() const;
+  // Update focus after the attribute value change
+  virtual void updateFocus();
 
-  /// Clear attribute
-  void clearAttribute();
+  /// Retunrs a list of possible shape types
+  /// \return a list of shapes
+  virtual QIntList getShapeTypes() const;
 
   /// Store the values to the model attribute of the widget. It casts this attribute to
   /// the specific type and set the given values
   /// \param theSelectedObject an object
   /// \param theShape a selected shape, which is used in the selection attribute
-  virtual bool storeAttributeValues(ObjectPtr theSelectedObject, GeomShapePtr theShape);
+  /// \return true if it is succeed
+  virtual void setObject(ObjectPtr theSelectedObject, GeomShapePtr theShape);
+
+  /// Get the shape from the attribute if the attribute contains a shape, e.g. selection attribute
+  /// \return a shape
+  virtual GeomShapePtr getShape() const;
+
+  /// Return the attribute values wrapped in a list of viewer presentations
+  /// \return a list of viewer presentations, which contains an attribute result and
+  /// a shape. If the attribute do not uses the shape, it is empty
+  virtual QList<ModuleBase_ViewerPrs> getAttributeSelection() const;
 
   //----------- Class members -------------
   protected:
@@ -148,15 +128,9 @@ Q_OBJECT
   /// Input control of the widget
   QLineEdit* myTextLine;
 
-  /// Reference to workshop
-  ModuleBase_IWorkshop* myWorkshop;
-
   /// List of accepting shapes types
   QStringList myShapeTypes;
 
-  /// Active/inactive flag
-  bool myIsActive;
-
   /// backup parameters of the model attribute. The class processes three types of attribute:
   /// Reference, RefAttr and Selection. Depending on the attribute type, only the attribute parameter
   /// values are reserved in the backup