X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FOCCViewer%2FOCCViewer_AISSelector.cxx;h=c15c45e4ed7faf811692b16fa2f33a876accfa28;hb=1906d2c2b477fabcc1a78510fada590e2b158f68;hp=0f1ddda73eab88dfef0afdb6f05415d3cbdddc81;hpb=6878ef4d7381638ec39d1ca9d03afc21a69401aa;p=modules%2Fgui.git

diff --git a/src/OCCViewer/OCCViewer_AISSelector.cxx b/src/OCCViewer/OCCViewer_AISSelector.cxx
index 0f1ddda73..c15c45e4e 100755
--- a/src/OCCViewer/OCCViewer_AISSelector.cxx
+++ b/src/OCCViewer/OCCViewer_AISSelector.cxx
@@ -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
@@ -22,6 +22,8 @@
 
 #include "OCCViewer_AISSelector.h"
 
+#include <Basics_OCCTVersion.hxx>
+
 /*!
   Constructor
 */
@@ -69,8 +71,14 @@ void OCCViewer_AISSelector::enableMultipleSelection( bool bEnable )
 void OCCViewer_AISSelector::setHilightColor ( Quantity_NameOfColor color )
 {
   myHilightColor = color;
-  if ( !myAISContext.IsNull() )
-    myAISContext->SetHilightColor( myHilightColor );
+  if ( !myAISContext.IsNull() ) {
+#if OCC_VERSION_LARGE > 0x07000000    
+    const Handle(Graphic3d_HighlightStyle)& hStyle = myAISContext->HighlightStyle();
+    hStyle->SetColor( myHilightColor );
+#else
+  myAISContext->SetHilightColor( myHilightColor );
+#endif  
+  }
 }
 
 /*!
@@ -79,8 +87,14 @@ void OCCViewer_AISSelector::setHilightColor ( Quantity_NameOfColor color )
 void OCCViewer_AISSelector::setSelectColor ( Quantity_NameOfColor color )
 {
   mySelectColor = color;
-  if ( !myAISContext.IsNull() )
+  if ( !myAISContext.IsNull() ) {
+#if OCC_VERSION_LARGE > 0x07000000
+    const Handle(Graphic3d_HighlightStyle)& sStyle = myAISContext->SelectionStyle();
+    sStyle->SetColor( mySelectColor );
+#else    
     myAISContext->SelectionColor( mySelectColor );
+#endif
+  }
 }
 
 /*!
@@ -90,8 +104,15 @@ void OCCViewer_AISSelector::setAISContext ( const Handle (AIS_InteractiveContext
 {
   myAISContext = aisContext;
   if ( ! myAISContext.IsNull() ) { 
+#if OCC_VERSION_LARGE > 0x07000000
+    const Handle(Graphic3d_HighlightStyle)& hStyle = myAISContext->HighlightStyle();
+    const Handle(Graphic3d_HighlightStyle)& sStyle = myAISContext->SelectionStyle();
+    hStyle->SetColor( myHilightColor );
+    sStyle->SetColor( mySelectColor );
+#else
     myAISContext->SetHilightColor( myHilightColor );
     myAISContext->SelectionColor( mySelectColor );
+#endif    
     myAISContext->SetSubIntensityColor( Quantity_NOC_CYAN1 );
   }
 }