Merge branch 'master' of newgeom:newgeom

[modules/shaper.git] / src / XGUI / XGUI_Displayer.h

diff --git a/src/XGUI/XGUI_Displayer.h b/src/XGUI/XGUI_Displayer.h
index 319a07a5e1bf6a6e3e6f63c21b1a49027c7753f9..9299a81983f19bfa01e4d9434daaded33b102cf2 100644 (file)
--- a/src/XGUI/XGUI_Displayer.h
+++ b/src/XGUI/XGUI_Displayer.h
@@ -19,7 +19,7 @@
 
 class XGUI_Viewer;
 class ModelAPI_Feature;
-
+class XGUI_Workshop;
 
 /**\class XGUI_Displayer
  * \ingroup GUI
@@ -30,7 +30,7 @@ class XGUI_EXPORT XGUI_Displayer
 public:
   /// Constructor
   /// \param theViewer the viewer
-  XGUI_Displayer(const Handle(AIS_InteractiveContext)& theAIS);
+  XGUI_Displayer(XGUI_Workshop* theWorkshop);
   /// Destructor
   virtual ~XGUI_Displayer();
 
@@ -38,6 +38,10 @@ public:
   /// or can not be initialized in constructor
   void setAISContext(const Handle(AIS_InteractiveContext)& theAIS);
 
+  /// Returns the feature visibility state.
+  /// \param theFeature a feature instance
+  bool IsVisible(boost::shared_ptr<ModelAPI_Feature> theFeature);
+
   /// Display the feature. Obtain the visualized object from the feature.
   /// \param theFeature a feature instance
   /// \param isUpdateViewer the parameter whether the viewer should be update immediatelly
@@ -55,8 +59,9 @@ public:
   /// \param theShape a shape
   /// \param theMode a local selection mode
   /// \param isUpdateViewer the parameter whether the viewer should be update immediatelly
-  void LocalSelection(boost::shared_ptr<ModelAPI_Feature> theFeature, const TopoDS_Shape& theShape,
-                      const int theMode, const bool isUpdateViewer = true);
+  void DisplayInLocalContext(boost::shared_ptr<ModelAPI_Feature> theFeature,
+                             const TopoDS_Shape& theShape,
+                             const int theMode, const bool isUpdateViewer = true);
 
   /// Erase the feature and a shape.
   /// \param theFeature a feature instance
@@ -65,24 +70,24 @@ public:
 
   /// Deactivates selection of sub-shapes
   /// \param isUpdateViewer the parameter whether the viewer should be update immediatelly
-  void GlobalSelection(const bool isUpdateViewer = true);
+  void CloseLocalContexts(const bool isUpdateViewer = true);
 
+protected:
   /// Activate local selection
   /// \param theAIS the list of objects
   /// \param theMode the selection mode
   /// \param isUpdateViewer the state wether the viewer should be updated immediatelly
-  void setLocalSelection(const AIS_ListOfInteractive& theAISObjects, const int theMode,
-                         const bool isUpdateViewer);
+  void activateInLocalContext(const AIS_ListOfInteractive& theAISObjects, const int theMode,
+                              const bool isUpdateViewer);
   /// Deactivate local selection
   /// \param isUpdateViewer the state wether the viewer should be updated immediatelly
-  void setGlobalSelection(const bool isUpdateViewer);
+  void closeAllContexts(const bool isUpdateViewer);
 
   /// Returns currently installed AIS_InteractiveContext
-  Handle(AIS_InteractiveContext) AISContext() const { return myAISContext; }
+  Handle(AIS_InteractiveContext) AISContext() const;
 
 protected:
-  ///< the viewer where the objects should be visualized
-  Handle(AIS_InteractiveContext) myAISContext;
+  XGUI_Workshop* myWorkshop;
   std::map<boost::shared_ptr<ModelAPI_Feature>, std::vector<Handle(AIS_InteractiveObject)> > myFeature2AISObjectMap;
 };