X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FHYDROGUI%2FHYDROGUI_OCCDisplayer.h;h=92e20c815854ade1c62d9322833cf1fb7dc27df6;hb=dfa894b758ac65080dc7185d25b7646dc45a10f4;hp=69b976ee0adecc353f58a747073e39d01a6aab63;hpb=db1999ae9883edbf6f18672b5f179a6da4871978;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_OCCDisplayer.h b/src/HYDROGUI/HYDROGUI_OCCDisplayer.h
index 69b976ee..92e20c81 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
@@ -26,7 +22,10 @@
 #include "HYDROGUI_AbstractDisplayer.h"
 
 class HYDROGUI_Shape;
-class Handle(AIS_InteractiveContext);
+class AIS_InteractiveContext;
+class AIS_ColorScale;
+class OCCViewer_ViewManager;
+class OCCViewer_Viewer;
 
 /**
  * \class HYDROGUI_OCCDisplayer
@@ -55,6 +54,34 @@ public:
   void                            SetToUpdate( const HYDROData_SequenceOfObjects& theObjs,
                                                const int theViewerId );
 
+  /**
+   * \brief Get the applicable viewer type.
+   */
+  virtual QString  GetType() const;
+
+  /**
+   * \brief Add the z layer for preview and returns its index.
+   * \param theMgr OCC view manager
+   */
+  int                             AddPreviewZLayer( OCCViewer_ViewManager* theMgr );
+
+  /**
+   * \brief Removes the z layer.
+   * \param theMgr OCC view manager
+   * \param theLayer a layer index
+   */
+  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 );
+
 protected:
   /**
    * \brief Erase all viewer objects.
@@ -82,23 +109,52 @@ protected:
                                            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.
    * \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
    */
   HYDROGUI_Shape*                 createShape( const int                             theViewerId,
                                                const Handle(AIS_InteractiveContext)& theContext,
                                                const Handle(HYDROData_Entity)&       theObject );
+
+   /**
+   * \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;
+  
+  QMap<int, Handle(AIS_ColorScale)> myColorScales;
 };
 
 #endif