Merge branch 'master' into agy/NewPV1_For_850

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

diff --git a/src/OCCViewer/OCCViewer_AISSelector.cxx b/src/OCCViewer/OCCViewer_AISSelector.cxx
index 25a354fc3032f132d2ea2e0faec860182c911cac..831195d872edde0ea3e35649d07da4ff4b18e8e6 100755 (executable)
--- a/src/OCCViewer/OCCViewer_AISSelector.cxx
+++ b/src/OCCViewer/OCCViewer_AISSelector.cxx
@@ -22,8 +22,6 @@
 
 #include "OCCViewer_AISSelector.h"
 
-#include <Basics_OCCTVersion.hxx>
-
 /*!
   Constructor
 */
@@ -71,12 +69,10 @@ void OCCViewer_AISSelector::enableMultipleSelection( bool bEnable )
 void OCCViewer_AISSelector::setHilightColor ( Quantity_NameOfColor color )
 {
   myHilightColor = color;
-  if ( !myAISContext.IsNull() )
-#if OCC_VERSION_LARGE > 0x07000000    
-    myAISContext->ChangeHighlightStyle()->SetColor( myHilightColor );
-#else
-  myAISContext->SetHilightColor( myHilightColor );
-#endif  
+  if ( !myAISContext.IsNull() ) {
+    const Handle(Graphic3d_HighlightStyle)& hStyle = myAISContext->HighlightStyle();
+    hStyle->SetColor( myHilightColor );
+  }
 }
 
 /*!
@@ -85,12 +81,10 @@ void OCCViewer_AISSelector::setHilightColor ( Quantity_NameOfColor color )
 void OCCViewer_AISSelector::setSelectColor ( Quantity_NameOfColor color )
 {
   mySelectColor = color;
-  if ( !myAISContext.IsNull() )
-#if OCC_VERSION_LARGE > 0x07000000
-    myAISContext->ChangeSelectionStyle()->SetColor( mySelectColor );
-#else    
-    myAISContext->SelectionColor( mySelectColor );
-#endif    
+  if ( !myAISContext.IsNull() ) {
+    const Handle(Graphic3d_HighlightStyle)& sStyle = myAISContext->SelectionStyle();
+    sStyle->SetColor( mySelectColor );
+  }
 }
 
 /*!
@@ -100,13 +94,10 @@ void OCCViewer_AISSelector::setAISContext ( const Handle (AIS_InteractiveContext
 {
   myAISContext = aisContext;
   if ( ! myAISContext.IsNull() ) { 
-#if OCC_VERSION_LARGE > 0x07000000
-    myAISContext->ChangeHighlightStyle()->SetColor( myHilightColor );
-    myAISContext->ChangeSelectionStyle()->SetColor( mySelectColor );
-#else
-    myAISContext->SetHilightColor( myHilightColor );
-    myAISContext->SelectionColor( mySelectColor );
-#endif    
+    const Handle(Graphic3d_HighlightStyle)& hStyle = myAISContext->HighlightStyle();
+    const Handle(Graphic3d_HighlightStyle)& sStyle = myAISContext->SelectionStyle();
+    hStyle->SetColor( myHilightColor );
+    sStyle->SetColor( mySelectColor );
     myAISContext->SetSubIntensityColor( Quantity_NOC_CYAN1 );
   }
 }
@@ -151,8 +142,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 );
 }
 
@@ -171,7 +161,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 );
 }
 
 /*!
@@ -191,8 +181,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 );
 }
 
 /*!
@@ -213,7 +203,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 );
 }
 
 /*!
@@ -237,6 +227,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 );
 }