X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_PropertyPanel.h;h=ab55ebb626222e152f36ec33183eb187bfc7ac1e;hb=0596060c57c244e60b9f38b7b9f97da8af50bd5f;hp=9a665ba482b157fa68019e319e88c7a4f32c12a9;hpb=952f3b79ad95369c14c41d87107772258b59f2ed;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_PropertyPanel.h b/src/XGUI/XGUI_PropertyPanel.h index 9a665ba48..ab55ebb62 100644 --- a/src/XGUI/XGUI_PropertyPanel.h +++ b/src/XGUI/XGUI_PropertyPanel.h @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// Copyright (C) 2014-2019 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -12,10 +12,9 @@ // // You should have received a copy of the GNU Lesser General Public // License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or -// email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef XGUI_PROPERTYPANEL_H_ @@ -87,8 +86,11 @@ Q_OBJECT /// Removes all widgets in the widget area of the property panel virtual void cleanContent(); - /// Returns currently active widget - virtual ModuleBase_ModelWidget* activeWidget() const { return myActiveWidget; } + /// Returns currently active widget. This is a widget from internal container of widgets + /// (myWidgets) activated/deactivated by focus in property panel. If parameter is true, + /// the method finds firstly the custom widget, after the direct active widget. + /// \param isUseCustomWidget boolean state if the custom widget might be a result + virtual ModuleBase_ModelWidget* activeWidget(const bool isUseCustomWidget = false) const; /// Activate the next widget in the property panel /// \param theWidget a widget. The next widget should be activated @@ -136,6 +138,14 @@ Q_OBJECT /// The method is called on accepting of operation virtual void onAcceptData(); + /// Set internal active widget, that can be returned as active widget and participate in active + /// selection filters/modes in application. It emits signal about property panel activation or + /// deactivation and updates selection filters/modes accordingly. + /// \param theWidget a widget control to store as internal active widget + void setInternalActiveWidget(ModuleBase_ModelWidget* theWidget); + + void updateApplyPlusButton(FeaturePtr theFeature); + public slots: /// \brief Update all widgets in property panel with values from the given feature /// \param theFeature a Feature to update values in widgets @@ -203,6 +213,8 @@ private: ModuleBase_ModelWidget* myActiveWidget; /// Currently widget processed by preselection ModuleBase_ModelWidget* myPreselectionWidget; + /// Some custom widget set from outside + ModuleBase_ModelWidget* myInternalActiveWidget; XGUI_OperationMgr* myOperationMgr; };