]> SALOME platform Git repositories - modules/gui.git/commitdiff
Salome HOME
Rollback to the one of previous version then pulling and rectangular selection worked...
authorsln <sln@opencascade.com>
Wed, 28 Nov 2007 15:02:36 +0000 (15:02 +0000)
committersln <sln@opencascade.com>
Wed, 28 Nov 2007 15:02:36 +0000 (15:02 +0000)
src/GLViewer/GLViewer_Viewer2d.cxx

index fbd6b4f8989cf0c227d754e02410d5ab2ab01b4a..962d2e03fcbc8a5079fc9830acb808639dff2bb4 100644 (file)
@@ -938,12 +938,11 @@ void GLViewer_Viewer2d::startOperations( QMouseEvent* e )
     transPoint( x, y );
     GLViewer_Pnt point( x, y );
 
-    // moved to updateOperations() - see below
-    //if( e->button() == Qt::LeftButton && vp->startPulling( point ) )
-    //    return;
+    if( e->button() == Qt::LeftButton && vp->startPulling( point ) )
+      return;
 
     if( e->button() == Qt::LeftButton && !(vp->currentBlock() & BS_Selection) && !myGLContext->getCurrentObject() )
-        vp->startSelectByRect( e->x(), e->y() );
+      vp->startSelectByRect( e->x(), e->y() );
 }
 
 /*!
@@ -965,14 +964,14 @@ bool GLViewer_Viewer2d::updateOperations( QMouseEvent* e )
         return true;
     }
 
-    if( vp->isDragProcess() == GLViewer_ViewPort2d::inDrag )
+    /*if( vp->isDragProcess() == GLViewer_ViewPort2d::inDrag )
         return true;
 
     if( e->state() == Qt::LeftButton && vp->startPulling( point ) )
     {
         vp->finishSelectByRect();
         return true;
-    }
+    }*/
 
     if( !myGLContext->getCurrentObject() )
     {