Merge branch 'BR_1328' into BR_DEMO

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

diff --git a/src/HYDROGUI/HYDROGUI_OCCDisplayer.h b/src/HYDROGUI/HYDROGUI_OCCDisplayer.h
index 95b391cf2ab85dd7f94c8a928da234676b337021..275954472bcd21b65b54531eab4ac330fc806517 100644 (file)
--- 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
@@ -26,7 +22,8 @@
 #include "HYDROGUI_AbstractDisplayer.h"
 
 class HYDROGUI_Shape;
-class Handle(AIS_InteractiveContext);
+class AIS_InteractiveContext;
+class AIS_ColorScale;
 class OCCViewer_ViewManager;
 class OCCViewer_Viewer;
 
@@ -76,6 +73,17 @@ public:
   void                            RemoveZLayer( OCCViewer_ViewManager* theMgr,
                                                 const int theLayer );
 
+  void SetToUpdateColorScale();
+
+  /**
+   * \brief Get color scale for the viewer.
+   * \param theViewerId viewer identifier
+   * \return the color scale 
+   */
+  Handle(AIS_ColorScale)          GetColorScale( const int theViewerId );
+
+  void UpdateColorScale( const OCCViewer_Viewer* );
+
 protected:
   /**
    * \brief Erase all viewer objects.
@@ -102,16 +110,12 @@ protected:
                                            const int theViewerId,
                                            const bool theIsForced,
                                            const bool theDoFitAll );
-
-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.
@@ -144,6 +148,11 @@ private:
   void                            SetZLayer( const OCCViewer_Viewer* theViewer,
                                              const Handle(HYDROData_Entity)& theObject, 
                                              const int theZLayerId );
+
+private:
+  bool myToUpdateColorScale;
+  
+  QMap<int, Handle(AIS_ColorScale)> myColorScales;
 };
 
 #endif