From: ouv <ouv@opencascade.com>
Date: Tue, 2 Sep 2008 11:55:37 +0000 (+0000)
Subject: updateBorders() method has been corrected - to solve problems with FitAll transformation
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=90c467062389a02dd485994f4c0c5cda981229d8;p=modules%2Fgui.git

updateBorders() method has been corrected - to solve problems with FitAll transformation
startOperations( QWheelEvent* ) method has been corrected - to allow axial zooming
---

diff --git a/src/GLViewer/GLViewer_Viewer2d.cxx b/src/GLViewer/GLViewer_Viewer2d.cxx
index f6f998697..eaa41fb39 100644
--- a/src/GLViewer/GLViewer_Viewer2d.cxx
+++ b/src/GLViewer/GLViewer_Viewer2d.cxx
@@ -178,7 +178,7 @@ void GLViewer_Viewer2d::updateBorders()
         {
             GLViewer_Object* anObject = *it;
             GLViewer_Rect* aRect = anObject->getRect();
-            if( !anObject->isSelectable() || !anObject->getVisible() )
+            if( !anObject->isScalable() || !anObject->getVisible() )
                 continue;
 
             if( border->isEmpty() )
@@ -1006,7 +1006,10 @@ void GLViewer_Viewer2d::startOperations( QWheelEvent* e )
     for( myGLContext->InitSelected(); myGLContext->MoreSelected(); myGLContext->NextSelected() )
     {
         GLViewer_Object* anObject = myGLContext->SelectedObject();
-        update = anObject->updateZoom( zoomIn ) || update;
+        if( e->modifiers() & Qt::ControlModifier )
+          update = anObject->updateXZoom( zoomIn ) || update;
+        else
+          update = anObject->updateZoom( zoomIn ) || update;
     }
 
     emit wheelZoomChange( zoomIn );