X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_Displayer.h;h=dd221d7bf9cbb9b9398e501f31fa1858270c48e6;hb=220bd2b37119be1c65abf88a88792445cb9d99f8;hp=9e853afb0eaefbc54464c9c7136441c5b361ee0b;hpb=8873182f935a9f77cdb25a770d4c8780b7669773;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_Displayer.h b/src/XGUI/XGUI_Displayer.h
index 9e853afb0..dd221d7bf 100644
--- a/src/XGUI/XGUI_Displayer.h
+++ b/src/XGUI/XGUI_Displayer.h
@@ -118,7 +118,7 @@ class XGUI_EXPORT XGUI_Displayer: public QObject
   /// \param theUpdateViewer the parameter whether the viewer should be update immediatelly
   void closeLocalContexts(const bool theUpdateViewer = true);
 
-  // Remove default selection filters of the module from the current viewer
+  /// Remove default selection filters of the module from the current viewer
   void deactivateSelectionFilters();
 
   /// \brief Add selection filter
@@ -137,20 +137,28 @@ class XGUI_EXPORT XGUI_Displayer: public QObject
   void removeFilters();
 
   /// Sets a flag to the displayer whether the internal viewer can be updated by 
-  /// the updateViewer method call. If it is not enabled, this method do nothing
+  /// the updateViewer method call. If it is not enabled, this method do nothing.
+  /// This state maintain recurse, if the update is blocked twice or three times, the
+  /// viewer will not be updated until it is unblocked necessary times(twice or three in the example).
   /// \param isEnabled a boolean value
   bool enableUpdateViewer(const bool isEnabled);
 
+  /// Returns true if the viewer update is not blocked
+  bool isUpdateEnabled() const;
+
   /// Updates the viewer
   void updateViewer() const;
 
   /// Activate interactive context
-  /// \param theIO
-  /// \param theMode
+  /// \param theIO an interactive object
+  /// \param theMode activation mode
+  /// \param theUpdateViewer update viewer flag
   void activateAIS(const Handle(AIS_InteractiveObject)& theIO, const int theMode,
                    const bool theUpdateViewer) const;
 
   /// Activate interactive context. It is necessary to call ClearOutdatedSelection after deactivation
+  /// \param theIO an interactive object
+  /// \param theMode a mode to deactivate. When theMode=-1 then all modes will be deactivated
   void deactivateAIS(const Handle(AIS_InteractiveObject)& theIO, const int theMode = -1) const;
 
   /// Searches the interactive object by feature
@@ -186,6 +194,7 @@ class XGUI_EXPORT XGUI_Displayer: public QObject
   /// Activates in local context displayed outside of the context.
   /// \param theModes - modes on which it has to be activated (can be empty)
   /// \param theObjList - list of objects which has to be activated.
+  /// \param theUpdateViewer an update viewer flag
   void activateObjects(const QIntList& theModes, const QObjectPtrList& theObjList,
                        const bool theUpdateViewer = true);
 
@@ -221,6 +230,30 @@ class XGUI_EXPORT XGUI_Displayer: public QObject
   /// \return previously defined color on the object
   QColor setObjectColor(ObjectPtr theObject, const QColor& theColor, bool theUpdateViewer = true);
 
+  /// Returns Trihedron object if it is displayed
+  Handle(AIS_InteractiveObject) getTrihedron() const;
+  
+  /// Set trihedron active (used in selection) or non active
+  void activateTrihedron(bool theIsActive);
+
+  /// Displays/erases thrihedron in current modes. It will be activated or deactivated
+  /// depending on the trihedron visible state and displayer active trihedron state
+  void displayTrihedron(bool theToDisplay) const;
+
+  /// Returns true if the trihedron should be activated in current selection modes
+  bool isTrihedronActive() const { return myIsTrihedronActive; }
+
+  /// Converts shape type (TopAbs_ShapeEnum) to selection mode
+  /// \param theShapeType a shape type from TopAbs_ShapeEnum
+  static int getSelectionMode(int theShapeType);
+
+  /// Return true if the object is visible. If the object is feature, it returns true
+  /// if all results of the feature are shown
+  /// \param theDisplayer a displayer
+  /// \param theObject an object
+  /// \return a boolean value
+  static bool isVisible(XGUI_Displayer* theDislayer, const ObjectPtr& theObject);
+
 signals:
   /// Signal on object display
   /// \param theObject a data object
@@ -253,7 +286,8 @@ private:
   /// Activates the interactive object in the local context.
   /// \param theIO an interactive object
   /// \param theModes - modes on which it has to be activated (can be empty)
-  void activate(const Handle(AIS_InteractiveObject)& theIO, const QIntList& theModes,
+  /// \return a flag is object activated or not
+  bool activate(const Handle(AIS_InteractiveObject)& theIO, const QIntList& theModes,
                 const bool theUpdateViewer) const;
 
   /// Deactivates the given object (not allow selection)
@@ -261,7 +295,8 @@ private:
   void deactivate(ObjectPtr theObject, const bool theUpdateViewer);
 
   /// Find a trihedron in a list of displayed presentations and deactivate it.
-  void deactivateTrihedron() const;
+  /// \param theUpdateViewer an update viewer flag
+  void deactivateTrihedron(const bool theUpdateViewer) const;
 
   /// Opens local context. Does nothing if it is already opened.
   void openLocalContext();
@@ -301,8 +336,14 @@ private:
   /// Selection modes installed for external objects in local context
   QIntList myActiveSelectionModes;
 
-  /// the enable update viewer flag
-  bool myEnableUpdateViewer;  
+  /// Number of blocking of the viewer update. The viewer is updated only if it equals zero
+  int myViewerBlockedRecursiveCount;
+
+  // Flag: use trihedgon for selection or not
+  bool myIsTrihedronActive;
+
+  /// A flag that update was requested but not done
+  mutable bool myNeedUpdate;
 };
 
 #endif