X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_Displayer.h;h=ef3a3308db2a6c046469782c7d27c50e25a80595;hb=dbe90044b0b96aa64dfe6609083413da2bdf08ec;hp=3ca9b964cca77c971ebcf291c7034fe9f5e27969;hpb=b2b1518f7ce57ca8ccf6fd596657220711841fd7;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_Displayer.h b/src/XGUI/XGUI_Displayer.h
index 3ca9b964c..ef3a3308d 100644
--- a/src/XGUI/XGUI_Displayer.h
+++ b/src/XGUI/XGUI_Displayer.h
@@ -10,12 +10,21 @@
 #include <QString>
 #include <boost/shared_ptr.hpp>
 
+#include <GeomAPI_AISObject.h>
+
 #include <TopoDS_Shape.hxx>
 #include <AIS_InteractiveObject.hxx>
 #include <AIS_InteractiveContext.hxx>
+#include <NCollection_List.hxx>
+
+#include <ModelAPI_Result.h>
+
+#include <ModuleBase_Definitions.h>
+#include <ModuleBase_ViewerPrs.h>
 
 #include <map>
 #include <vector>
+#include <list>
 
 class XGUI_Viewer;
 class ModelAPI_Feature;
@@ -27,7 +36,7 @@ class XGUI_Workshop;
  */
 class XGUI_EXPORT XGUI_Displayer
 {
-public:
+ public:
   /// Constructor
   /// \param theViewer the viewer
   XGUI_Displayer(XGUI_Workshop* theWorkshop);
@@ -40,39 +49,82 @@ public:
 
   /// Returns the feature visibility state.
   /// \param theFeature a feature instance
-  bool IsVisible(boost::shared_ptr<ModelAPI_Feature> theFeature);
+  bool isVisible(ObjectPtr theObject);
 
   /// 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
-  void Display(boost::shared_ptr<ModelAPI_Feature> theFeature, const bool isUpdateViewer = true);
+  /// Returns true if the Feature succesfully displayed
+  void display(ObjectPtr theObject, bool isUpdateViewer = true);
 
-  /// Display the feature and a shape. This shape would be associated to the given feature
+  /// Display the given AIS object. To hide this object use corresponde erase method
+  void display(boost::shared_ptr<GeomAPI_AISObject> theAIS, bool isUpdate = true);
+
+  /// Redisplay the shape and activate selection of sub-shapes
   /// \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 redisplay(Handle(AIS_InteractiveObject) theAIS, 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 local selection mode
+  /// \param theMode a list of local selection modes
   /// \param isUpdateViewer the parameter whether the viewer should be update immediatelly
-  void RedisplayInLocalContext(boost::shared_ptr<ModelAPI_Feature> theFeature,
-                             const TopoDS_Shape& theShape,
-                             const int theMode, const bool isUpdateViewer = true);
+  void activateInLocalContext(ObjectPtr 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 QList<ObjectPtr>& theFeatures, const bool isStop,
+                     const bool isUpdateViewer);
+
+  /**
+   * Add presentations which corresponds to the given features to current selection
+   * \param theFeatures a list of features to be selected
+   * isUpdateViewer the parameter whether the viewer should be update immediatelly
+   */
+  void setSelected(const QList<ObjectPtr>& theFeatures, bool isUpdateViewer = true);
 
   /// 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);
+  void erase(ObjectPtr theObject, const bool isUpdateViewer = true);
+
+  /// Erase the given AIS object displayed by corresponded display method
+  void erase(boost::shared_ptr<GeomAPI_AISObject> theAIS, const bool isUpdate = 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 eraseDeletedResults(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);
+  void closeLocalContexts(const bool isUpdateViewer = true);
+
+  /// Updates the viewer
+  void updateViewer();
+
+  /// Searches the interactive object by feature
+  /// \param theFeature the feature or NULL if it not visualized
+  /// \return theIO an interactive object
+  boost::shared_ptr<GeomAPI_AISObject> getAISObject(ObjectPtr theFeature) const;
+
+  /// Searches the feature by interactive object
+  /// \param theIO an interactive object
+  /// \return feature the feature or NULL if it not visualized
+  ObjectPtr getObject(Handle(AIS_InteractiveObject) theIO) const;
 
-protected:
+  void deactivate(ObjectPtr theFeature);
+
+  void activate(ObjectPtr theFeature);
+
+ protected:
   /// Deactivate local selection
   /// \param isUpdateViewer the state wether the viewer should be updated immediatelly
   void closeAllContexts(const bool isUpdateViewer);
@@ -80,9 +132,34 @@ protected:
   /// Returns currently installed AIS_InteractiveContext
   Handle(AIS_InteractiveContext) AISContext() const;
 
-protected:
+  /// Display the feature and a shape. This shape would be associated to the given feature
+  /// \param theFeature a feature instance
+  /// \param theAIS AIS presentation
+  /// \param isUpdateViewer the parameter whether the viewer should be update immediatelly
+  /// Returns true if the Feature succesfully displayed
+  void display(ObjectPtr theObject, boost::shared_ptr<GeomAPI_AISObject> theAIS,
+               bool isUpdateViewer = true);
+
+  /// Display the shape and activate selection of sub-shapes
+  /// \param theFeature a feature instance
+  /// \param theAIS an AIS object
+  /// \param isUpdateViewer the parameter whether the viewer should be update immediatelly
+  /// \returns true if the presentation is created
+  //bool redisplay(ObjectPtr theObject,
+  //               boost::shared_ptr<GeomAPI_AISObject> theAIS, 
+  //               const bool isUpdateViewer = true);
+
+  /** Redisplay the shape if it was displayed
+   * \param theFeature a feature instance
+   * \param isUpdateViewer the parameter whether the viewer should be update immediatelly
+   */
+  void redisplay(ObjectPtr theObject, bool isUpdateViewer = true);
+
+ protected:
   XGUI_Workshop* myWorkshop;
-  std::map<boost::shared_ptr<ModelAPI_Feature>, std::vector<Handle(AIS_InteractiveObject)> > myFeature2AISObjectMap;
+
+  typedef std::map<ObjectPtr, boost::shared_ptr<GeomAPI_AISObject> > ResultToAISMap;
+  ResultToAISMap myResult2AISObjectMap;
 };
 
 #endif