X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetShapeSelector.h;h=6ac087fbb9530e0e66900111674517323609cb7a;hb=d0e479afb535cd9d6542d53302428a5c8e99485f;hp=54b928ee86a4e6a547197f4a773078ad9bbce094;hpb=301fde7eeae07fdae18ebd02f93e09d1a182e38d;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetShapeSelector.h b/src/ModuleBase/ModuleBase_WidgetShapeSelector.h index 54b928ee8..6ac087fbb 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,10 +8,11 @@ #define ModuleBase_WidgetShapeSelector_H #include "ModuleBase.h" -#include "ModuleBase_WidgetValidated.h" +#include "ModuleBase_WidgetSelector.h" #include "ModuleBase_ViewerFilters.h" #include +#include #include #include @@ -24,6 +25,8 @@ class QLabel; class QLineEdit; class QToolButton; class ModuleBase_IWorkshop; +class ModuleBase_ViewerPrs; +class ModelAPI_Validator; /** * \ingroup GUI @@ -51,96 +54,58 @@ 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); virtual ~ModuleBase_WidgetShapeSelector(); - virtual bool restoreValue(); - - /// Defines if it is supposed that the widget should interact with the viewer. - virtual bool isViewerSelector() { return true; } + /// Set the given wrapped value to the current widget + /// This value should be processed in the widget according to the needs + /// The method is called by the current operation to process the operation preselection. + /// It is redefined to check the value validity and if it is, fill the attribute with by value + /// \param theValues the wrapped selection values + /// \param theToValidate a flag on validation of the values + virtual bool setSelection(QList>& theValues, + const bool theToValidate); /// Returns list of widget controls /// \return a control list virtual QList getControls() const; - /// Returns currently selected data object - ObjectPtr selectedFeature() const - { - return mySelectedObject; - } - - /// 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); - - - /// 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; + virtual bool storeValueCustom(); - /// The methiod called when widget is activated - virtual void activateCustom(); + virtual bool restoreValueCustom(); /// 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 theShape) const; + // Update focus after the attribute value change + virtual void updateFocus(); - // Set the given object as a value of the widget - /// \param theObj an object - /// \param theShape a shape - void setObject(ObjectPtr theObj, std::shared_ptr theShape = std::shared_ptr()); + /// Retunrs a list of possible shape types + /// \return a list of shapes + virtual QIntList shapeTypes() const; - /// Check the selected with validators if installed - /// \param theObj the object for checking - /// \param theShape the shape for checking - virtual bool isValid(ObjectPtr theObj, std::shared_ptr theShape); + /// Get the shape from the attribute if the attribute contains a shape, e.g. selection attribute + /// \return a shape + virtual GeomShapePtr getShape() const; - /// Clear attribute - void clearAttribute(); - - /// 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) 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> getAttributeSelection() const; //----------- Class members ------------- protected: @@ -150,20 +115,8 @@ Q_OBJECT /// Input control of the widget QLineEdit* myTextLine; - /// Reference to workshop - ModuleBase_IWorkshop* myWorkshop; - - /// Pointer to selected object - ObjectPtr mySelectedObject; - - /// Pointer to selected shape - GeomShapePtr myShape; - /// List of accepting shapes types QStringList myShapeTypes; - - /// Active/inactive flag - bool myIsActive; }; #endif