X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetSelector.h;h=b6af3a3f9de84ffcfb6bf571b7be5c191ba0821c;hb=674569fb1280e3e4a9bbf141a817750253fbe662;hp=2099b0e99b2d11220cdbd4a85e748ac9e37e91a9;hpb=ed29adc31b575ff7352f50a2c339c354fd5b4edf;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetSelector.h b/src/ModuleBase/ModuleBase_WidgetSelector.h index 2099b0e99..b6af3a3f9 100755 --- a/src/ModuleBase/ModuleBase_WidgetSelector.h +++ b/src/ModuleBase/ModuleBase_WidgetSelector.h @@ -9,7 +9,6 @@ #include "ModuleBase.h" #include "ModuleBase_WidgetValidated.h" -#include #include "ModuleBase_Definitions.h" #include @@ -19,6 +18,8 @@ class Config_WidgetAPI; class QWidget; class ModuleBase_IWorkshop; +class ModuleBase_ViewerPrs; +class ModelAPI_Result; /** * \ingroup GUI @@ -49,11 +50,11 @@ Q_OBJECT /// Checks the widget validity. By default, it returns true. /// \param thePrs a selected presentation in the view /// \return a boolean value - virtual bool isValidSelectionCustom(const ModuleBase_ViewerPrs& thePrs); + virtual bool isValidSelectionCustom(const std::shared_ptr& thePrs); /// Fills the attribute with the value of the selected owner /// \param thePrs a selected owner - virtual bool setSelectionCustom(const ModuleBase_ViewerPrs& thePrs); + virtual bool setSelectionCustom(const std::shared_ptr& thePrs); /// The methiod called when widget is deactivated virtual void deactivate(); @@ -75,7 +76,7 @@ protected: /// \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 // NDS: has body is temporary - virtual QList getAttributeSelection() const; + virtual QList> getAttributeSelection() const; /// Retunrs a list of possible shape types /// \return a list of shapes @@ -85,13 +86,6 @@ protected: // NDS: has body is temporary virtual void updateSelectionName() {}; - /// 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 - /// \return true if it is succeed - void setObject(ObjectPtr theSelectedObject, GeomShapePtr theShape); - /// The methiod called when widget is activated virtual void activateCustom(); @@ -101,13 +95,14 @@ protected: /// in the construction. /// \param theShape a shape /// \param theResult a selected result - bool acceptSubShape(const GeomShapePtr& theShape, const ResultPtr& theResult) const; + bool acceptSubShape(const GeomShapePtr& theShape, + const std::shared_ptr& theResult) const; /// Return an object and geom shape by the viewer presentation /// \param thePrs a selection /// \param theObject an output object /// \param theShape a shape of the selection - virtual void getGeomSelection(const ModuleBase_ViewerPrs& thePrs, + virtual void getGeomSelection(const std::shared_ptr& thePrs, ObjectPtr& theObject, GeomShapePtr& theShape);