X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_OCCDisplayer.h;h=681e137abcdc629e70073b385194cd52eb4582e4;hb=f34b90e9e4e02ba65419134d5d37a2e42aecfabf;hp=f8d1ea13b14c7aea5d6611a92b892a0da426e3d3;hpb=84f8b4a57d3cdad820bc1333a5066699cd1c8ae3;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_OCCDisplayer.h b/src/HYDROGUI/HYDROGUI_OCCDisplayer.h
index f8d1ea13..681e137a 100644
--- a/src/HYDROGUI/HYDROGUI_OCCDisplayer.h
+++ b/src/HYDROGUI/HYDROGUI_OCCDisplayer.h
@@ -23,9 +23,8 @@
 #ifndef HYDROGUI_OCCDISPLAYER_H
 #define HYDROGUI_OCCDISPLAYER_H
 
-#include <HYDROData_Entity.h>
+#include "HYDROGUI_AbstractDisplayer.h"
 
-class HYDROGUI_Module;
 class HYDROGUI_Shape;
 class Handle(AIS_InteractiveContext);
 
@@ -33,7 +32,7 @@ class Handle(AIS_InteractiveContext);
  * \class HYDROGUI_OCCDisplayer
  * \brief Class intended to create, display and update the presentations on OCC viewer.
  */
-class HYDROGUI_OCCDisplayer
+class HYDROGUI_OCCDisplayer : public HYDROGUI_AbstractDisplayer
 {
 public:
   /**
@@ -57,14 +56,9 @@ public:
                                                const int theViewerId );
 
   /**
-   * \brief Update all objects in the viewer.
-   * \param theViewerId viewer identifier
-   * \param theIsInit flag used for initial update
-   * \param theIsForced flag used to update all objects, including the unchanged ones
+   * \brief Get the applicable viewer type.
    */
-  void                            UpdateAll( const int theViewerId,
-                                             const bool theIsInit,
-                                             const bool theIsForced );
+  virtual QString  GetType() const;
 
 protected:
   /**
@@ -73,24 +67,6 @@ protected:
    */
   void                            EraseAll( const int theViewerId );
 
-  /**
-   * \brief Update and display all objects in the viewer.
-   * \param theViewerId viewer identifier
-   * \param theIsForced flag used to update all objects, including the unchanged ones
-   */
-  void                            DisplayAll( const int theViewerId,
-                                              const bool theIsForced );
-
-  /**
-   * \brief Update the specified viewer objects.
-   * \param theObjs sequence of objects to update
-   * \param theViewerId viewer identifier
-   * \param theIsForced flag used to update all objects, including the unchanged ones
-   */
-  void                            Update( const HYDROData_SequenceOfObjects& theObjs,
-                                          const int theViewerId,
-                                          const bool theIsForced );
-
   /**
    * \brief Erase the specified viewer objects.
    * \param theObjs sequence of objects to erase
@@ -104,18 +80,21 @@ protected:
    * \param theObjs sequence of objects to display
    * \param theViewerId viewer identifier
    * \param theIsForced flag used to update all objects, including the unchanged ones
+   * \param theDoFitAll flag used to fit the view to all visible objects; do not fit by default
    */
   void                            Display( const HYDROData_SequenceOfObjects& theObjs,
                                            const int theViewerId,
-                                           const bool theIsForced );
+                                           const bool theIsForced,
+                                           const bool theDoFitAll );
 
-private:
+protected:
   /**
    * \brief Purge all invalid objects in the viewer.
    * \param theViewerId viewer identifier
    */
   void                            purgeObjects( const int theViewerId );
 
+private:
   /**
    * \brief Creates new OCC shape.
    * \param theViewerId viewer identifier
@@ -126,10 +105,6 @@ private:
   HYDROGUI_Shape*                 createShape( const int                             theViewerId,
                                                const Handle(AIS_InteractiveContext)& theContext,
                                                const Handle(HYDROData_Entity)&       theObject );
-
-private:
-  HYDROGUI_Module*                myModule;
-
 };
 
 #endif