Merge branch 'master' of ssh://git.salome-platform.org/modules/hydro

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_OCCDisplayer.h

diff --git a/src/HYDROGUI/HYDROGUI_OCCDisplayer.h b/src/HYDROGUI/HYDROGUI_OCCDisplayer.h
index f1cb02563903cfd89ed376830a751543b6ef5221..8328b86251e5f53b60b1e37028c7e1db58652dce 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_OCCDisplayer.h
+++ b/src/HYDROGUI/HYDROGUI_OCCDisplayer.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015  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
@@ -6,7 +6,7 @@
 // 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
@@ -63,10 +63,10 @@ public:
   virtual QString  GetType() const;
 
   /**
-   * \brief Add the top z layer and returns its index.
+   * \brief Add the z layer for preview and returns its index.
    * \param theMgr OCC view manager
    */
-  int                             AddTopZLayer( OCCViewer_ViewManager* theMgr );
+  int                             AddPreviewZLayer( OCCViewer_ViewManager* theMgr );
 
   /**
    * \brief Removes the z layer.
@@ -76,6 +76,8 @@ public:
   void                            RemoveZLayer( OCCViewer_ViewManager* theMgr,
                                                 const int theLayer );
 
+  void SetToUpdateColorScale();
+
 protected:
   /**
    * \brief Erase all viewer objects.
@@ -110,11 +112,13 @@ protected:
    */
   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,15 +131,24 @@ private:
    * \param theObject the object to display
    * \param theViewer the viewer for displaying
    * \param theIsForced the flag used to update the object shape
-   * \param theZLayerIndex the Z layer index
-   * \param theIsOrdered the flag indicating if the Z layer ordering available for the object
    * \return true in case of success
    */
   bool                            Display( const Handle(HYDROData_Entity)& theObject,
                                            const OCCViewer_Viewer* theViewer,
-                                           const bool theIsForced,
-                                           const int theZLayerIndex,
-                                           const bool theIsOrdered );
+                                           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