X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FXGUI%2FXGUI_Displayer.h;h=4dc28389fe72f1c51ebcfdad13b442142625eb50;hb=d6325cea33b6269c055ab12849fc835df28b05ec;hp=3b1b54f608003fac118f6906c3cb346be8e4b876;hpb=54809222802fcf67530e6a2009d4b5d334bf738d;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_Displayer.h b/src/XGUI/XGUI_Displayer.h
index 3b1b54f60..4dc28389f 100644
--- a/src/XGUI/XGUI_Displayer.h
+++ b/src/XGUI/XGUI_Displayer.h
@@ -13,13 +13,17 @@
 #include <TopoDS_Shape.hxx>
 #include <AIS_InteractiveObject.hxx>
 #include <AIS_InteractiveContext.hxx>
+#include <NCollection_List.hxx>
+
+#include <XGUI_ViewerPrs.h>
 
 #include <map>
 #include <vector>
+#include <list>
 
 class XGUI_Viewer;
 class ModelAPI_Feature;
-
+class XGUI_Workshop;
 
 /**\class XGUI_Displayer
  * \ingroup GUI
@@ -30,7 +34,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();
 
@@ -51,45 +55,85 @@ public:
   /// \param theFeature a feature instance
   /// \param theShape a shape
   /// \param isUpdateViewer the parameter whether the viewer should be update immediatelly
-  void Display(boost::shared_ptr<ModelAPI_Feature> theFeature, const TopoDS_Shape& theShape,
-               const bool isUpdateViewer = true);
+  //void Display(boost::shared_ptr<ModelAPI_Feature> theFeature, const TopoDS_Shape& theShape,
+  //             const bool isUpdateViewer = true);
   
+  /// Returns a list of viewer selected presentations
+  /// \param theShapeTypeToSkip the shapes with this type will be skipped during the result list build
+  /// \return list of presentations
+  std::list<XGUI_ViewerPrs> GetSelected(const int theShapeTypeToSkip = -1);
+
+  /// Returns a list of viewer highlited presentations
+  /// \param theShapeTypeToSkip the shapes with this type will be skipped during the result list build
+  /// \return list of presentations
+  std::list<XGUI_ViewerPrs> GetHighlighted(const int theShapeTypeToSkip = -1);
+
   /// Display the shape and activate selection of sub-shapes
   /// \param theFeature a feature instance
   /// \param theShape a shape
   /// \param theMode a local selection mode
   /// \param isUpdateViewer the parameter whether the viewer should be update immediatelly
-  void DisplayInLocalContext(boost::shared_ptr<ModelAPI_Feature> theFeature,
-                             const TopoDS_Shape& theShape,
-                             const int theMode, const bool isUpdateViewer = true);
+  void Redisplay(boost::shared_ptr<ModelAPI_Feature> theFeature,
+                             const TopoDS_Shape& theShape, const bool isUpdateViewer = true);
+
+  /// Display the shape and activate selection of sub-shapes
+  /// \param theFeature a feature instance
+  /// \param theShape a shape
+  /// \param theMode a list of local selection modes
+  /// \param isUpdateViewer the parameter whether the viewer should be update immediatelly
+  void ActivateInLocalContext(boost::shared_ptr<ModelAPI_Feature> theFeature,
+                              const std::list<int>& theModes, const bool isUpdateViewer = true);
+
+  /// Stop the current selection and color the given features to the selection color
+  /// \param theFeatures a list of features to be disabled
+  /// \param theToStop the boolean state whether it it stopped or non stopped
+  /// \param isUpdateViewer the parameter whether the viewer should be update immediatelly
+  void StopSelection(const std::list<XGUI_ViewerPrs>& theFeatures, const bool isStop,
+                     const bool isUpdateViewer);
+
+  /// Set the features are selected
+  /// \param theFeatures a list of features to be selected
+  /// \param isUpdateViewer the parameter whether the viewer should be update immediatelly
+  void SetSelected(const std::list<XGUI_ViewerPrs>& theFeatures, const bool isUpdateViewer);
 
   /// Erase the feature and a shape.
   /// \param theFeature a feature instance
   /// \param isUpdateViewer the parameter whether the viewer should be update immediatelly
   void Erase(boost::shared_ptr<ModelAPI_Feature> theFeature, const bool isUpdateViewer = true);
 
+  /// Erase all presentations
+  /// \param isUpdateViewer the parameter whether the viewer should be update immediatelly
+  void EraseAll(const bool isUpdateViewer = true);
+
+  /// Erase AIS interactive objects, which has an empty feature in the internal map
+  /// \param isUpdateViewer the parameter whether the viewer should be update immediatelly
+  void EraseDeletedFeatures(const bool isUpdateViewer = true);
+
   /// Deactivates selection of sub-shapes
   /// \param isUpdateViewer the parameter whether the viewer should be update immediatelly
   void CloseLocalContexts(const bool isUpdateViewer = true);
 
+  /// Updates the viewer
+  void UpdateViewer();
+
 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 activateInLocalContext(const AIS_ListOfInteractive& theAISObjects, const int theMode,
-                              const bool isUpdateViewer);
+  /// Searches the feature by interactive object
+  /// \param theIO an interactive object
+  /// \return feature the feature or NULL if it not visualized
+  boost::shared_ptr<ModelAPI_Feature> GetFeature(Handle(AIS_InteractiveObject) theIO);
   /// Deactivate local selection
   /// \param isUpdateViewer the state wether the viewer should be updated immediatelly
-  void closeAllContexts(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;
-  std::map<boost::shared_ptr<ModelAPI_Feature>, std::vector<Handle(AIS_InteractiveObject)> > myFeature2AISObjectMap;
+  XGUI_Workshop* myWorkshop;
+
+  typedef std::map<boost::shared_ptr<ModelAPI_Feature>, Handle(AIS_InteractiveObject) > FeatureToAISMap;
+  FeatureToAISMap myFeature2AISObjectMap;
 };
 
+
 #endif