X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_Module.h;h=bd91508616f0262bbe80aa3802e9b88f28b29ecf;hb=8d623696a0aa115c52e14f5e326eb6cb64a16f0d;hp=4a70c942f511760ce05a93907663a9707df3424b;hpb=a94fc319f2aa64b43c9a73b5ff7063923648faec;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_Module.h b/src/PartSet/PartSet_Module.h old mode 100755 new mode 100644 index 4a70c942f..bd9150861 --- a/src/PartSet/PartSet_Module.h +++ b/src/PartSet/PartSet_Module.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 PartSet_Module_H @@ -37,15 +36,16 @@ //#include #include #include +#include #include #include #include #include -#include - +#include #include +#include class ModuleBase_Operation; class ModuleBase_IViewWindow; @@ -56,6 +56,7 @@ class PartSet_MenuMgr; class PartSet_CustomPrs; class PartSet_SketcherMgr; class PartSet_SketcherReentrantMgr; +class PartSet_RootNode; class ModelAPI_Result; class QAction; @@ -84,11 +85,6 @@ public: PartSet_Module(ModuleBase_IWorkshop* theWshop); virtual ~PartSet_Module(); - // Add default selection filters of the module to the current viewer - virtual void activateSelectionFilters(); - // Remove default selection filters of the module from the current viewer - virtual void deactivateSelectionFilters(); - // Stores the current selection virtual void storeSelection(); @@ -109,10 +105,11 @@ public: /// 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 + /// \param theFeature a feature of the started operation + /// \param theXmlRepr an XML representation of the operation /// \param theWidgets a list of created widgets /// \return boolean result, false by default - virtual bool createWidgets(ModuleBase_Operation* theOperation, + virtual bool createWidgets(const FeaturePtr& theFeature, const QString& theXmlRepr, QList& theWidgets) const; /// Launching of a edit operation on the feature @@ -223,8 +220,16 @@ public: virtual void activeSelectionModes(QIntList& theModes); /// Appends specific selection modes for the module to the list of types - /// \param theTypes a selection modes to be extended - virtual void customSubShapesSelectionModes(QIntList& theTypes); + /// \param theModesType combination of available selection filters + /// \param theModes a selection modes to be extended + virtual void moduleSelectionModes(int theModesType, QIntList& theModes); + + /// Appends into container of filters module filters corresponded to the modes type + /// \param theFilterTypes container of available selection filters + /// \param theSelectionFilters [out] container to be extend by elements + virtual void moduleSelectionFilters(const QIntList& theFilterTypes, + SelectMgr_ListOfFilter& theSelectionFilters); + /// Returns whether the mouse enter the viewer's window /// \return true if items are added and there is no necessity to provide standard menu @@ -286,14 +291,14 @@ public: const bool theUpdateViewer); /// Modifies the given presentation in the custom way. - virtual bool customisePresentation(std::shared_ptr theResult, - AISObjectPtr thePrs, - std::shared_ptr theCustomPrs); + //virtual bool customisePresentation(std::shared_ptr theResult, + // 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); + ///// 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, @@ -303,8 +308,15 @@ public: /// should be updated(e.g. only highlighted elements) /// \param theUpdateViewer the parameter whether the viewer should be update immediatelly /// \returns true if the object is modified - virtual bool customizeObject(ObjectPtr theObject, const ModuleBase_CustomizeFlag& theFlag, - const bool theUpdateViewer); + virtual bool customizeFeature(ObjectPtr theObject, const ModuleBase_CustomizeFlag& theFlag, + const bool theUpdateViewer); + + /// Disable displaying of custom mode + /// \param theMode a mode to disable + virtual void disableCustomMode(ModuleBase_CustomizeFlag theMode); + + /// Enables disabled custom mode + virtual void enableCustomModes(); /// This method is called on object browser creation for customisation of module specific features /// \param theObjectBrowser a pinter on Object Browser widget @@ -316,8 +328,12 @@ public: /// Create specific for the module presentation /// \param theResult an object for presentation /// \return created presentation or NULL(default value) - virtual Handle(AIS_InteractiveObject) createPresentation( - const std::shared_ptr& theResult); + virtual AISObjectPtr createPresentation(const ObjectPtr& theResult); + + /// Customize presentation according to objects attributes + /// \param theObject an object for presentation + /// \param thePrs a presentation object + virtual void customizePresentation(const ObjectPtr& theObject, const AISObjectPtr& thePrs) const; //! Returns data object by AIS virtual ObjectPtr findPresentedObject(const AISObjectPtr& theAIS) const; @@ -374,9 +390,15 @@ public: /// \param theMessage a message of reentrant operation virtual void setReentrantPreSelection(const std::shared_ptr& theMessage); + /// Returns root tree node which represents a data model + virtual ModuleBase_ITreeNode* rootNode() const; + /// Returns the workshop XGUI_Workshop* getWorkshop() const; + /// Reads description of features from XML file + virtual void createFeatures(); + public slots: /// Slolt called on object display /// \param theObject a data object @@ -411,6 +433,10 @@ protected slots: void onChoiceChanged(ModuleBase_ModelWidget* theWidget, int theIndex); protected: + /// Appends specific selection modes for the module to the list of types + /// \param theModes a selection modes to be extended + virtual void customSubShapesSelectionModes(QIntList& theModes); + /// Sets the constraints states in internal map. If the feature kind is a dimensional constraint /// other dimensions are shown. /// \param theFeatureKindId a feature kind @@ -450,7 +476,6 @@ protected: private: bool myIsOperationIsLaunched; /// state of application between launch and stop operation - SelectMgr_ListOfFilter mySelectionFilters; PartSet_SketcherMgr* mySketchMgr; PartSet_SketcherReentrantMgr* mySketchReentrantMgr; @@ -467,6 +492,8 @@ private: /// redisplay and restore it after PartSet_SketcherMgr::FeatureToSelectionMap myCurrentSelection; QModelIndex myActivePartIndex; + + PartSet_RootNode* myRoot; }; #endif