Merge branch 'V8_3_asterstudy' into V8_3_BR

[modules/gui.git] / src / OCCViewer / OCCViewer_AISSelector.cxx

diff --git a/src/OCCViewer/OCCViewer_AISSelector.cxx b/src/OCCViewer/OCCViewer_AISSelector.cxx
index 74cbca1bb82e5b52b234eaf0fcd6e22864840b73..03b001be77f3d132b58c0722ebf9c89001c210f5 100755 (executable)
--- a/src/OCCViewer/OCCViewer_AISSelector.cxx
+++ b/src/OCCViewer/OCCViewer_AISSelector.cxx
@@ -1,23 +1,29 @@
-// Copyright (C) 2005  OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D
-// 
+// 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
+//
 // 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.
-// 
-// This library is distributed in the hope that it will be useful 
-// but WITHOUT ANY WARRANTY; without even the implied warranty of 
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+// License as published by the Free Software Foundation; either
+// 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
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 // Lesser General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// See http://www.salome-platform.org/
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #include "OCCViewer_AISSelector.h"
 
+#include <Basics_OCCTVersion.hxx>
+
 /*!
   Constructor
 */
@@ -65,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  
+  }
 }
 
 /*!
@@ -75,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
+  }
 }
 
 /*!
@@ -86,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 );
   }
 }
@@ -132,8 +157,7 @@ bool OCCViewer_AISSelector::moveTo ( int x, int y, const Handle (V3d_View)& view
     return false;
   
   AIS_StatusOfDetection status = AIS_SOD_Error;
-  status = myAISContext->MoveTo (x, y, view);
-  
+  status = myAISContext->MoveTo ( x, y, view, Standard_True );
   return ( status != AIS_SOD_Error && status != AIS_SOD_AllBad );
 }
 
@@ -152,7 +176,7 @@ bool OCCViewer_AISSelector::select ()
   bool hadSelection = ( myNumSelected > 0 );
   
   /* select and send notifications */
-  return checkSelection ( myAISContext->Select(), hadSelection, false );
+  return checkSelection ( myAISContext->Select( Standard_True ), hadSelection, false );
 }
 
 /*!
@@ -172,8 +196,8 @@ bool OCCViewer_AISSelector::select ( int left, int top, int right, int bottom,
   bool hadSelection = ( myNumSelected > 0 );
   
   /* select and send notifications */
-  return checkSelection ( myAISContext->Select(left, top, right, bottom, view),
-                          hadSelection, false );
+  return checkSelection ( myAISContext->Select( left, top, right, bottom, view, Standard_True ),
+                         hadSelection, false );
 }
 
 /*!
@@ -194,7 +218,7 @@ bool OCCViewer_AISSelector::shiftSelect ()
     return false;
   
   /* select and send notifications */
-  return checkSelection ( myAISContext->ShiftSelect(), hadSelection, true );
+  return checkSelection ( myAISContext->ShiftSelect( Standard_True ), hadSelection, true );
 }
 
 /*!
@@ -218,6 +242,6 @@ bool OCCViewer_AISSelector::shiftSelect ( int left, int top, int right, int bott
     return false;
   
   /* select and send notifications */
-  return checkSelection ( myAISContext->ShiftSelect(left,top,right,bottom, view),
-    hadSelection, true );
+  return checkSelection ( myAISContext->ShiftSelect( left, top, right, bottom, view, Standard_True ),
+                         hadSelection, true );
 }