X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_Module.h;h=a0d62efa3dddc642a9d55afa0121549ff564ffe7;hb=50a8df0c6a66da8067b16155e5ae39f8f26a7ebc;hp=d196b6bdd392d4ccbfc823627cc95cb613af6421;hpb=d34e8ead48a4c3f13728c386c790d334356f95a4;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 d196b6bdd..a0d62efa3 --- 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-2020 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 @@ -24,7 +23,6 @@ #include "PartSet.h" #include "PartSet_Tools.h" #include "PartSet_OverconstraintListener.h" -#include "XGUI_SelectionFilterType.h" #include "PartSet_SketcherMgr.h" #include @@ -58,7 +56,7 @@ class PartSet_MenuMgr; class PartSet_CustomPrs; class PartSet_SketcherMgr; class PartSet_SketcherReentrantMgr; -class PartSet_DataModel; +class PartSet_RootNode; class ModelAPI_Result; class QAction; @@ -107,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 @@ -231,20 +230,6 @@ public: virtual void moduleSelectionFilters(const QIntList& theFilterTypes, SelectMgr_ListOfFilter& theSelectionFilters); - /// Returns types of registered module selection filters - /// \param theSelectionFilters [out] container of type value - virtual QIntList selectionFilters(); - - /// Append selection filter into the module and type of the filter in internal container - /// \param theFilterType selection filter type - /// \param theFilter added filter - void registerSelectionFilter(const XGUI_SelectionFilterType theFilterType, - const Handle(SelectMgr_Filter)& theFilter); - - /// Returns selection filter - /// \param theType selection filter type - /// \param theFilter instance of filter - virtual Handle(SelectMgr_Filter) selectionFilter(const int theType); /// Returns whether the mouse enter the viewer's window /// \return true if items are added and there is no necessity to provide standard menu @@ -306,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, @@ -323,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 @@ -336,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; @@ -400,6 +396,9 @@ public: /// 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 @@ -477,7 +476,6 @@ protected: private: bool myIsOperationIsLaunched; /// state of application between launch and stop operation - std::map mySelectionFilters; PartSet_SketcherMgr* mySketchMgr; PartSet_SketcherReentrantMgr* mySketchReentrantMgr; @@ -495,7 +493,7 @@ private: PartSet_SketcherMgr::FeatureToSelectionMap myCurrentSelection; QModelIndex myActivePartIndex; - PartSet_DataModel* myDataModel; + PartSet_RootNode* myRoot; }; #endif