X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_Module.h;h=4a70c942f511760ce05a93907663a9707df3424b;hb=72f21152437f7abaddd5fb3f3ccef481c2b713e4;hp=6687e7aa65338a0456023f8aacbb0a10212d1536;hpb=d4229cf0e4819ef684866a59e18a82e57f0092b0;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_Module.h b/src/PartSet/PartSet_Module.h index 6687e7aa6..4a70c942f 100755 --- a/src/PartSet/PartSet_Module.h +++ b/src/PartSet/PartSet_Module.h @@ -1,4 +1,22 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D +// Copyright (C) 2014-2017 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 +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// 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 +// +// See http://www.salome-platform.org/ or +// email : webmaster.salome@opencascade.com +// #ifndef PartSet_Module_H #define PartSet_Module_H @@ -6,6 +24,7 @@ #include "PartSet.h" #include "PartSet_Tools.h" #include "PartSet_OverconstraintListener.h" +#include "PartSet_SketcherMgr.h" #include #include @@ -30,11 +49,13 @@ class ModuleBase_Operation; class ModuleBase_IViewWindow; +class ModuleBase_ViewerPrs; + class XGUI_Workshop; class PartSet_MenuMgr; class PartSet_CustomPrs; class PartSet_SketcherMgr; -class PartSet_SketcherReetntrantMgr; +class PartSet_SketcherReentrantMgr; class ModelAPI_Result; class QAction; @@ -51,7 +72,7 @@ Q_OBJECT enum RestartingMode { RM_None, /// the operation should not be restarted RM_Forbided, /// the operation should not be restarted after there is no active widget - RM_LastFeatureUsed, /// the operation is restarted and use the previous feature + RM_LastFeatureUsed, /// the operation is restarted and use the previous feature /// for own initialization RM_EmptyFeatureUsed /// the operation is restarted and does not use the previous feature }; @@ -85,7 +106,7 @@ public: /// Call back forlast tuning of property panel before operation performance virtual void propertyPanelDefined(ModuleBase_Operation* theOperation); - /// If there is found selected attribute, widgets are created and contains + /// If there is found selected attribute, widgets are created and contains /// only a widget for the attribute /// It is important for Property Panel filling by sketch point attribute /// \param theOperation a started operation @@ -94,7 +115,7 @@ public: virtual bool createWidgets(ModuleBase_Operation* theOperation, QList& theWidgets) const; - /// Launching of a edit operation on the feature + /// Launching of a edit operation on the feature /// \param theFeature feature for editing virtual void editFeature(FeaturePtr theFeature); @@ -104,7 +125,10 @@ public: /// Creates an operation and send it to loop /// \param theCmdId the operation name - virtual void launchOperation(const QString& theCmdId); + /// \param isStartAfterCommitOnly operation is launched if there is no active operation or + /// it is committed + virtual void launchOperation(const QString& theCmdId, + const bool& isStartAfterCommitOnly); /// Realizes some functionality by an operation start /// Displays all sketcher sub-Objects, hides sketcher result, appends selection filters @@ -164,6 +188,13 @@ public: /// \param theObject a model object virtual bool canDisplayObject(const ObjectPtr& theObject) const; + /// Returns parent result if accepted, true if the started operation is a nested operation + /// of the previous operation + /// \param thePreviousOperationKind a kind of previous operation + /// \param theStartedOperationKind a kind of a new operation + virtual bool canUsePreselection(const QString& thePreviousOperationKind, + const QString& theStartedOperationKind); + /// Make some functionality after the objects are hidden in viewer /// \param theObjects a list of hidden objects //virtual void processHiddenObject(const std::list& theObjects); @@ -203,7 +234,14 @@ public: PartSet_SketcherMgr* sketchMgr() const { return mySketchMgr; } /// Returns sketch reentrant manager - PartSet_SketcherReetntrantMgr* sketchReentranceMgr() const { return mySketchReentrantMgr; } + PartSet_SketcherReentrantMgr* sketchReentranceMgr() const { return mySketchReentrantMgr; } + + /// Find object and attribute(if selected) for the given viewer selection + /// \param theSelected a viewer selection + /// \param theObject a selected model object + /// \param theAttribute a selected model attribute + virtual void getGeomSelection(const std::shared_ptr& theSelected, + ObjectPtr& theObject, AttributePtr& theAttribute); /// Returns listener of overconstraint signal /// \return the listener @@ -252,6 +290,11 @@ public: AISObjectPtr thePrs, std::shared_ptr theCustomPrs); + /// Modifies the given presentation in the custom way after usual customize is performed. + virtual bool afterCustomisePresentation(std::shared_ptr theResult, + AISObjectPtr thePrs, + GeomCustomPrsPtr theCustomPrs); + /// Update the object presentable properties such as color, lines width and other /// If the object is result with the color attribute value set, it is used, /// otherwise the customize is applyed to the object's feature if it is a custom prs @@ -286,7 +329,7 @@ public: /// Update state of pop-up menu items in viewer /// \param theStdActions - a map of standard actions - virtual void updateViewerMenu(const QMap& theStdActions); + virtual void updateViewerMenu(const QMap& theStdActions); /// Returns true if the action should be always enabled /// \param theActionId an action index: Accept or Accept All @@ -324,12 +367,17 @@ public: /// \return theAttribute virtual AttributePtr findAttribute(const ObjectPtr& theObject, const GeomShapePtr& theGeomShape); -public slots: - /// Redefines the parent method in order to customize the next case: - /// If the sketch nested operation is active and the presentation is not visualized in the viewer, - /// the operation should be always aborted. - virtual void onFeatureTriggered(); + /// Returns reentrant message if it was accepted + virtual std::shared_ptr reentrantMessage(); + + /// Put current selection into reentrant message + /// \param theMessage a message of reentrant operation + virtual void setReentrantPreSelection(const std::shared_ptr& theMessage); + /// Returns the workshop + XGUI_Workshop* getWorkshop() const; + +public slots: /// Slolt called on object display /// \param theObject a data object /// \param theAIS a presentation object @@ -376,12 +424,6 @@ protected: /// Register validators for this module virtual void registerValidators(); - /// Register selection filters for this module - virtual void registerFilters(); - - /// Register properties of this module - virtual void registerProperties(); - /// Connects or disconnects to the value changed signal of the property panel widgets /// \param theWidget a property contol widget /// \param isToConnect a boolean value whether connect or disconnect @@ -404,9 +446,6 @@ protected: //! Delete features virtual bool deleteObjects(); - /// Returns the workshop - XGUI_Workshop* getWorkshop() const; - void setDefaultConstraintShown(); private: @@ -414,7 +453,7 @@ private: SelectMgr_ListOfFilter mySelectionFilters; PartSet_SketcherMgr* mySketchMgr; - PartSet_SketcherReetntrantMgr* mySketchReentrantMgr; + PartSet_SketcherReentrantMgr* mySketchReentrantMgr; PartSet_MenuMgr* myMenuMgr; /// A default custom presentation, which is used for references objects of started operation PartSet_CustomPrs* myCustomPrs; @@ -424,7 +463,10 @@ private: /// backup of the visible state to restore them by operation stop QMap myHasConstraintShown; - QModelIndex aActivePartIndex; + /// backup of selection in the viewer, it is used only to store selection before + /// redisplay and restore it after + PartSet_SketcherMgr::FeatureToSelectionMap myCurrentSelection; + QModelIndex myActivePartIndex; }; #endif