Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RNV: fix compilation with the dev version of OCCT.
[modules/gui.git]
/
src
/
OCCViewer
/
OCCViewer_AISSelector.cxx
diff --git
a/src/OCCViewer/OCCViewer_AISSelector.cxx
b/src/OCCViewer/OCCViewer_AISSelector.cxx
index bb05f08ad3296d4ad84ad7887bba98053e5c51f7..c15c45e4ed7faf811692b16fa2f33a876accfa28 100755
(executable)
--- a/
src/OCCViewer/OCCViewer_AISSelector.cxx
+++ b/
src/OCCViewer/OCCViewer_AISSelector.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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) 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 "OCCViewer_AISSelector.h"
+#include <Basics_OCCTVersion.hxx>
+
/*!
Constructor
*/
/*!
Constructor
*/
@@
-69,8
+71,14
@@
void OCCViewer_AISSelector::enableMultipleSelection( bool bEnable )
void OCCViewer_AISSelector::setHilightColor ( Quantity_NameOfColor color )
{
myHilightColor = color;
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;
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 );
myAISContext->SelectionColor( mySelectColor );
+#endif
+ }
}
/*!
}
/*!
@@
-90,8
+104,15
@@
void OCCViewer_AISSelector::setAISContext ( const Handle (AIS_InteractiveContext
{
myAISContext = aisContext;
if ( ! myAISContext.IsNull() ) {
{
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 );
myAISContext->SetHilightColor( myHilightColor );
myAISContext->SelectionColor( mySelectColor );
+#endif
myAISContext->SetSubIntensityColor( Quantity_NOC_CYAN1 );
}
}
myAISContext->SetSubIntensityColor( Quantity_NOC_CYAN1 );
}
}