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

diff --git a/src/HYDROGUI/HYDROGUI_OCCDisplayer.h b/src/HYDROGUI/HYDROGUI_OCCDisplayer.h
index f8d1ea13..bd89dfe2 100644
--- a/src/HYDROGUI/HYDROGUI_OCCDisplayer.h
+++ b/src/HYDROGUI/HYDROGUI_OCCDisplayer.h
@@ -1,12 +1,8 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015  EDF-R&D
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -23,17 +19,18 @@
 #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);
+class OCCViewer_ViewManager;
+class OCCViewer_Viewer;
 
 /**
  * \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,39 +54,32 @@ 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:
   /**
-   * \brief Erase all viewer objects.
-   * \param theViewerId viewer identifier
+   * \brief Add the z layer for preview and returns its index.
+   * \param theMgr OCC view manager
    */
-  void                            EraseAll( const int theViewerId );
+  int                             AddPreviewZLayer( OCCViewer_ViewManager* theMgr );
 
   /**
-   * \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
+   * \brief Removes the z layer.
+   * \param theMgr OCC view manager
+   * \param theLayer a layer index
    */
-  void                            DisplayAll( const int theViewerId,
-                                              const bool theIsForced );
+  void                            RemoveZLayer( OCCViewer_ViewManager* theMgr,
+                                                const int theLayer );
+
+  void SetToUpdateColorScale();
 
+protected:
   /**
-   * \brief Update the specified viewer objects.
-   * \param theObjs sequence of objects to update
+   * \brief Erase all viewer objects.
    * \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.
@@ -104,22 +94,27 @@ 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 );
 
+  void UpdateColorScale( const OCCViewer_Viewer* );
+
+private:
   /**
    * \brief Creates new OCC shape.
    * \param theViewerId viewer identifier
-   * \param theContext context of OCC viwer
+   * \param theContext context of OCC viewer
    * \param theObject data model object
    * \return pointer to new created shape
    */
@@ -127,9 +122,29 @@ private:
                                                const Handle(AIS_InteractiveContext)& theContext,
                                                const Handle(HYDROData_Entity)&       theObject );
 
-private:
-  HYDROGUI_Module*                myModule;
+   /**
+   * \brief Display the specified object.
+   * \param theObject the object to display
+   * \param theViewer the viewer for displaying
+   * \param theIsForced the flag used to update the object shape
+   * \return true in case of success
+   */
+  bool                            Display( const Handle(HYDROData_Entity)& theObject,
+                                           const OCCViewer_Viewer* theViewer,
+                                           const bool theIsForced );
 
+   /**
+   * \brief Set Z layer to the shape corresponding to the HYDRO data object.
+   * \param theViewer the viewer for Z layer setting
+   * \param theObject the HYDRO object
+   * \param theZLayerId the Z layer ID
+   */
+  void                            SetZLayer( const OCCViewer_Viewer* theViewer,
+                                             const Handle(HYDROData_Entity)& theObject, 
+                                             const int theZLayerId );
+
+private:
+  bool myToUpdateColorScale;
 };
 
 #endif