Merge remote branch 'origin/master'

[modules/gui.git] / src / SOCC / SOCC_ViewWindow.cxx

diff --git a/src/SOCC/SOCC_ViewWindow.cxx b/src/SOCC/SOCC_ViewWindow.cxx
index 2e519687b3f10c88cc49826ddebe071f7bcbbf0d..3eeaf7d6ba521784cb819166e42ad57a619b70fa 100644 (file)
--- a/src/SOCC/SOCC_ViewWindow.cxx
+++ b/src/SOCC/SOCC_ViewWindow.cxx
@@ -1,21 +1,25 @@
-// Copyright (C) 2005  OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D
-// 
+// Copyright (C) 2007-2015  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/ or email : webmaster.salome@opencascade.com
 //
+
 #include "SOCC_ViewWindow.h"
 
 #include "OCCViewer_ViewPort3d.h"
@@ -27,7 +31,7 @@
 */
 SOCC_ViewWindow
 ::SOCC_ViewWindow( SUIT_Desktop* theDesktop, 
-                  OCCViewer_Viewer* theModel)
+                   OCCViewer_Viewer* theModel)
   : OCCViewer_ViewWindow( theDesktop, theModel )
 {
 }
@@ -79,23 +83,23 @@ SOCC_ViewWindow
     myViewPort->fitAll();
     break;
   case SUIT_Accel::RotateLeft  : 
-    myViewPort->startRotation( cx, cy );
-    myViewPort->rotate( cx - inc, cy );
+    myViewPort->startRotation( cx, cy, myCurrPointType, mySelectedPoint );
+    myViewPort->rotate( cx - inc, cy, myCurrPointType, mySelectedPoint );
     myViewPort->endRotation();
     break;
   case SUIT_Accel::RotateRight :  
-    myViewPort->startRotation( cx, cy );
-    myViewPort->rotate( cx + inc, cy );
+    myViewPort->startRotation( cx, cy, myCurrPointType, mySelectedPoint );
+    myViewPort->rotate( cx + inc, cy, myCurrPointType, mySelectedPoint );
     myViewPort->endRotation();
     break;
   case SUIT_Accel::RotateUp    :  
-    myViewPort->startRotation( cx, cy );
-    myViewPort->rotate( cx, cy - inc );
+    myViewPort->startRotation( cx, cy, myCurrPointType, mySelectedPoint );
+    myViewPort->rotate( cx, cy - inc, myCurrPointType, mySelectedPoint );
     myViewPort->endRotation();
     break;
   case SUIT_Accel::RotateDown  :  
-    myViewPort->startRotation( cx, cy );
-    myViewPort->rotate( cx, cy + inc );
+    myViewPort->startRotation( cx, cy, myCurrPointType, mySelectedPoint );
+    myViewPort->rotate( cx, cy + inc, myCurrPointType, mySelectedPoint );
     myViewPort->endRotation();
     break;
   }