Patch for MacOS (from SALOME forum)

[modules/geom.git] / src / GEOMGUI / GEOM_Displayer.h

diff --git a/src/GEOMGUI/GEOM_Displayer.h b/src/GEOMGUI/GEOM_Displayer.h
index cd8f465e6b00213340767e5ac2265eb7ac72f617..cf5a9df5536ac20be2197a3758db9829b29bcb61 100644 (file)
--- a/src/GEOMGUI/GEOM_Displayer.h
+++ b/src/GEOMGUI/GEOM_Displayer.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  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
@@ -28,6 +28,7 @@
 #define GEOM_DISPLAYER_H
 
 #include "GEOM_GEOMGUI.hxx"
+#include <GEOM_AISShape.hxx>
 
 #include <SALOME_InteractiveObject.hxx>
 
@@ -44,7 +45,11 @@ class SALOME_OCCViewType;
 #include <LightApp_Displayer.h>
 #include <LightApp_Study.h>
 #include <Aspect_TypeOfMarker.hxx>
+#if OCC_VERSION_MAJOR >= 7
+  #include <AIS_ColorScale.hxx>
+#endif
 #include <TCollection_AsciiString.hxx>
+#include <TColStd_MapOfInteger.hxx>
 #include <Basics_OCCTVersion.hxx>
 #include <QList>
 
@@ -60,14 +65,11 @@ class SALOME_OCCViewType;
 
 typedef std::list<GEOM::GEOM_Object_ptr> ObjectList;
 
-class TColStd_MapOfInteger;
 class LightApp_SelectionMgr;
 class SalomeApp_Study;
 class SalomeApp_Application;
 class SUIT_SelectionFilter;
-class Handle_GEOM_AISShape;
 class gp_Ax3;
-//class SALOME_Selection;
 
 class GEOMGUI_EXPORT GEOM_Displayer : public LightApp_Displayer
 {
@@ -199,7 +201,9 @@ public:
   bool          ToActivate() const;
 
   /* Activate/Deactivate selection*/
+  void         LocalSelection( const Handle(SALOME_InteractiveObject)&, const std::list<int> );
   void         LocalSelection( const Handle(SALOME_InteractiveObject)&, const int );
+  void         LocalSelection( const SALOME_ListIO& theIOList, const std::list<int> );
   void         LocalSelection( const SALOME_ListIO& theIOList, const int );
   void         GlobalSelection( const int = GEOM_ALLOBJECTS, const bool = false );
   void         GlobalSelection( const TColStd_MapOfInteger&, const bool = false, const QList<int>* = 0 );
@@ -296,6 +300,9 @@ protected:
   std::string                      myTexture;
   int                              myType;
   SALOME_View*                     myViewFrame;
+#if OCC_VERSION_MAJOR >= 7
+  Handle(AIS_ColorScale)           myColorScale;
+#endif
 
   // Attributes
   Quantity_Color                   myShadingColor;