Copyright update 2022

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

diff --git a/src/OCCViewer/OCCViewer_AISSelector.cxx b/src/OCCViewer/OCCViewer_AISSelector.cxx
old mode 100755 (executable)
new mode 100644 (file)
index 44b55e4..a878ec8
--- a/src/OCCViewer/OCCViewer_AISSelector.cxx
+++ b/src/OCCViewer/OCCViewer_AISSelector.cxx
@@ -1,24 +1,25 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2022  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
 //
-//  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 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, 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.
+// 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
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// 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/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #include "OCCViewer_AISSelector.h"
 
 /*!
@@ -68,8 +69,10 @@ void OCCViewer_AISSelector::enableMultipleSelection( bool bEnable )
 void OCCViewer_AISSelector::setHilightColor ( Quantity_NameOfColor color )
 {
   myHilightColor = color;
-  if ( !myAISContext.IsNull() )
-    myAISContext->SetHilightColor( myHilightColor );
+  if ( !myAISContext.IsNull() ) {
+    const Handle(Prs3d_Drawer)& hStyle = myAISContext->HighlightStyle();
+    hStyle->SetColor( myHilightColor );
+  }
 }
 
 /*!
@@ -78,8 +81,10 @@ void OCCViewer_AISSelector::setHilightColor ( Quantity_NameOfColor color )
 void OCCViewer_AISSelector::setSelectColor ( Quantity_NameOfColor color )
 {
   mySelectColor = color;
-  if ( !myAISContext.IsNull() )
-    myAISContext->SelectionColor( mySelectColor );
+  if ( !myAISContext.IsNull() ) {
+    const Handle(Prs3d_Drawer)& sStyle = myAISContext->SelectionStyle();
+    sStyle->SetColor( mySelectColor );
+  }
 }
 
 /*!
@@ -89,8 +94,10 @@ void OCCViewer_AISSelector::setAISContext ( const Handle (AIS_InteractiveContext
 {
   myAISContext = aisContext;
   if ( ! myAISContext.IsNull() ) { 
-    myAISContext->SetHilightColor( myHilightColor );
-    myAISContext->SelectionColor( mySelectColor );
+    const Handle(Prs3d_Drawer)& hStyle = myAISContext->HighlightStyle();
+    const Handle(Prs3d_Drawer)& sStyle = myAISContext->SelectionStyle();
+    hStyle->SetColor( myHilightColor );
+    sStyle->SetColor( mySelectColor );
     myAISContext->SetSubIntensityColor( Quantity_NOC_CYAN1 );
   }
 }
@@ -107,7 +114,7 @@ bool OCCViewer_AISSelector::checkSelection ( AIS_StatusOfPick status,
   if ( myAISContext.IsNull() )
     return false;
 
-  myNumSelected = myAISContext->NbCurrents(); /* update after the last selection */
+  myNumSelected = myAISContext->NbCurrents(); /* update after the last selection */ // todo: NbCurrents is deprecated
   
   if ( status == AIS_SOP_NothingSelected && !hadSelection ) {
     emit selSelectionCancel( addTo );
@@ -135,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 );
 }
 
@@ -155,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 );
 }
 
 /*!
@@ -175,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 );
 }
 
 /*!
@@ -197,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 );
 }
 
 /*!
@@ -221,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 );
 }