X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_Displayer.h;h=7ca8150aeb27139ed71149b2432163a61a514e27;hb=a21978de92f434702a3215df667f22e720cf107f;hp=5973cd67e6d1ce064356503dff519a7b2514201e;hpb=7df76a8390c4b44a0f31742b3a85fe05491269bb;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_Displayer.h b/src/XGUI/XGUI_Displayer.h
index 5973cd67e..7ca8150ae 100644
--- a/src/XGUI/XGUI_Displayer.h
+++ b/src/XGUI/XGUI_Displayer.h
@@ -6,6 +6,7 @@
 #define XGUI_Displayer_H
 
 #include "XGUI.h"
+#include "XGUI_Constants.h"
 
 #include <QString>
 #include <boost/shared_ptr.hpp>
@@ -15,6 +16,8 @@
 #include <AIS_InteractiveContext.hxx>
 #include <NCollection_List.hxx>
 
+#include <ModelAPI_Feature.h>
+
 #include <XGUI_ViewerPrs.h>
 
 #include <map>
@@ -44,73 +47,111 @@ public:
 
   /// Returns the feature visibility state.
   /// \param theFeature a feature instance
-  bool IsVisible(boost::shared_ptr<ModelAPI_Feature> theFeature);
+  bool isVisible(FeaturePtr 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
-  void Display(boost::shared_ptr<ModelAPI_Feature> theFeature, const bool isUpdateViewer = true);
+  void display(FeaturePtr theFeature, bool isUpdateViewer = true);
 
   /// Display the feature and a shape. This shape would be associated to the given feature
   /// \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(FeaturePtr theFeature, const TopoDS_Shape& theShape, bool isUpdateViewer = true);
   
-  /// Returns a list of viewer presentations
+  /// 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> GetViewerPrs();
+  std::list<XGUI_ViewerPrs> getSelected(const int theShapeTypeToSkip = -1);
+
+  /**
+  * Returns list of features currently selected in 3d viewer
+  */
+  QFeatureList selectedFeatures() const;
+
+  /// 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 theAIS an AIS object
   /// \param isUpdateViewer the parameter whether the viewer should be update immediatelly
-  void Redisplay(boost::shared_ptr<ModelAPI_Feature> theFeature,
-                             const TopoDS_Shape& theShape, const bool isUpdateViewer = true);
+  /// \returns true if the presentation is created
+  bool redisplay(FeaturePtr theFeature,
+                 Handle(AIS_InteractiveObject) theAIS,
+                 const int theSelectionMode, 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(FeaturePtr theFeature, bool isUpdateViewer = true);
+
+  /// Redisplay the shape and activate selection of sub-shapes
+  /// \param theFeature a feature instance
+  /// \param isUpdateViewer the parameter whether the viewer should be update immediatelly
+  //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 list of local selection modes
   /// \param isUpdateViewer the parameter whether the viewer should be update immediatelly
-  void ActivateInLocalContext(boost::shared_ptr<ModelAPI_Feature> theFeature,
+  void activateInLocalContext(FeaturePtr 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,
+  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);
+  void setSelected(const std::list<XGUI_ViewerPrs>& theFeatures, 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 QFeatureList& 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(FeaturePtr 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);
+  //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);
+  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);
+  void closeLocalContexts(const bool isUpdateViewer = true);
 
   /// Updates the viewer
-  void UpdateViewer();
+  void updateViewer();
+
+  /// Searches the interactive object by feature
+  /// \param theFeature the feature or NULL if it not visualized
+  /// \return theIO an interactive object
+  Handle(AIS_InteractiveObject) getAISObject(FeaturePtr theFeature) const;
 
 protected:
+  /// Searches the feature by interactive object
+  /// \param theIO an interactive object
+  /// \return feature the feature or NULL if it not visualized
+  FeaturePtr getFeature(Handle(AIS_InteractiveObject) theIO) const;
   /// Deactivate local selection
   /// \param isUpdateViewer the state wether the viewer should be updated immediatelly
   void closeAllContexts(const bool isUpdateViewer);
@@ -121,7 +162,7 @@ protected:
 protected:
   XGUI_Workshop* myWorkshop;
 
-  typedef std::map<boost::shared_ptr<ModelAPI_Feature>, Handle(AIS_InteractiveObject) > FeatureToAISMap;
+  typedef std::map<FeaturePtr, Handle(AIS_InteractiveObject) > FeatureToAISMap;
   FeatureToAISMap myFeature2AISObjectMap;
 };