X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_Displayer.h;h=f7948dcab39993540c2e8d25c0970bf673316f1b;hb=a1431f03eac1d1aed4203d0568d987c41ce939b3;hp=f39d9c2f98146688cb5bdb5e1354bd3584f28848;hpb=d74afc6389ed4e656c9451ac01b4065470746fd8;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_Displayer.h b/src/HYDROGUI/HYDROGUI_Displayer.h
index f39d9c2f..f7948dca 100644
--- a/src/HYDROGUI/HYDROGUI_Displayer.h
+++ b/src/HYDROGUI/HYDROGUI_Displayer.h
@@ -23,20 +23,17 @@
 #ifndef HYDROGUI_DISPLAYER_H
 #define HYDROGUI_DISPLAYER_H
 
-#include <HYDROData_Object.h>
+#include "HYDROGUI_AbstractDisplayer.h"
 
 #include <QMap>
 
-class HYDROGUI_Module;
 class HYDROGUI_PrsDriver;
 
-class GraphicsView_Viewer;
-
 /**
- * \class HYDROGUI_DataModel
- * \brief Class intended to create, display and update the presentations.
+ * \class HYDROGUI_Displayer
+ * \brief Class intended to create, display and update the presentations in 2D graphics viewer.
  */
-class HYDROGUI_Displayer
+class HYDROGUI_Displayer : public HYDROGUI_AbstractDisplayer
 {
 public:
   /**
@@ -56,78 +53,56 @@ public:
    * \param theObjs sequence of objects to update
    * \param theViewerId viewer identifier
    */
-  void                            SetToUpdate( const HYDROData_SequenceOfObjects& theObjs,
-                                               const int theViewerId );
+  void             SetToUpdate( const HYDROData_SequenceOfObjects& theObjs,
+                                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:
   /**
    * \brief Erase all viewer objects.
    * \param theViewerId viewer identifier
    */
-  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 );
+  void             EraseAll( const int theViewerId );
 
   /**
    * \brief Erase the specified viewer objects.
    * \param theObjs sequence of objects to erase
    * \param theViewerId viewer identifier
    */
-  void                            Erase( const HYDROData_SequenceOfObjects& theObjs,
-                                         const int theViewerId );
+  void             Erase( const HYDROData_SequenceOfObjects& theObjs,
+                          const int theViewerId );
 
   /**
    * \brief Display the specified viewer objects.
    * \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 );
+  void             Display( const HYDROData_SequenceOfObjects& theObjs,
+                            const int theViewerId,
+                            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 );
+  void             purgeObjects( const int theViewerId );
 
+private:
   /**
    * \brief Get the presentation driver for the specified data object.
    * \param theObj data object
    */
-  HYDROGUI_PrsDriver*             getDriver( const Handle(HYDROData_Object)& theObj );
+  HYDROGUI_PrsDriver*             getDriver( const Handle(HYDROData_Entity)& theObj );
 
 private:
-  HYDROGUI_Module*                myModule;
-
   typedef QMap< ObjectKind, HYDROGUI_PrsDriver* > PrsDriversMap;
   PrsDriversMap                   myPrsDriversMap;
 };