simplify zoom code

[mussa.git] / qui / seqbrowser / SequenceBrowser.cpp

diff --git a/qui/seqbrowser/SequenceBrowser.cpp b/qui/seqbrowser/SequenceBrowser.cpp
index 3fe84d58eb28620c419425e10509d595216bb9b1..4e1fbcd74421572b0b587bbe5fd1fc508b33f141 100644 (file)
--- a/qui/seqbrowser/SequenceBrowser.cpp
+++ b/qui/seqbrowser/SequenceBrowser.cpp
@@ -215,10 +215,10 @@ void SequenceBrowser::mousePressEvent( QMouseEvent *e)
   switch(e->button()) {
     case Qt::LeftButton:
       startSelecting(e);
-      break;
-   case Qt::RightButton:
+      e->accept();
       break;
    default:
+      e->ignore();
       break;
   }
 }
@@ -227,6 +227,9 @@ void SequenceBrowser::mouseMoveEvent( QMouseEvent *e )
 {
   if (rubberBand and rubberBand->isVisible()) {
     rubberBand->setGeometry(QRect(bandOrigin, e->pos()).normalized());
+    e->accept();
+  } else {
+    e->ignore();
   }
 }
 
@@ -246,9 +249,11 @@ void SequenceBrowser::mouseReleaseEvent( QMouseEvent *e)
       }
       break;
    default:
+      e->ignore();
+      return;
       break;
   }
-
+  e->accept();
 }
 
 void SequenceBrowser::startSelecting(QMouseEvent *e)
@@ -281,72 +286,15 @@ void SequenceBrowser::wheelEvent(QWheelEvent *e)
   e->accept();
   double cur_zoom = GlSeqBrowser::zoom();
   
-  // Normalize so one 15 degree turn of the mouse wheel
+  // Normalize so one turn of the mouse wheel
   // is equal to 1 step.
-  int num_degrees = e->delta() / 8;
-  int num_steps = num_degrees / 15;
-  
-  // Positive
-  if (num_steps >= 0)
-  {
-    // Invert number of steps because code was written
-    // thinking that adding a positve num_steps was zooming
-    // in, but because it's bp/pixel, it's actually zooming out.
-    // To get mouse wheel to zoom in, when pushing the wheel
-    // forward, I can use the existing code, by making num_steps
-    // negative here.
-    num_steps = num_steps * (-1);
-    
-    if (cur_zoom + num_steps >= 1.0)
-    {
-      emit mouseWheelZoom(cur_zoom + num_steps);
-    }
-    else if (cur_zoom > 1.0 && cur_zoom + num_steps < 1.0)
-    {
-      emit mouseWheelZoom(1.0);
-    }
-    else if (cur_zoom <= 0.1)
-    {
-      emit mouseWheelZoom(cur_zoom + ((double)num_steps*0.01));
-    }
-    else if (cur_zoom <= 1.0 && cur_zoom + ((double)num_steps*0.1) >= 0.1)
-    {
-      emit mouseWheelZoom(cur_zoom + ((double)num_steps*0.1));
-    }
-    else if (cur_zoom <= 1.0 && cur_zoom + ((double)num_steps*0.1) < 0.1)
-    {
-      emit mouseWheelZoom(0.1);
-    }
-    
-  }
-  // Negative
-  else
-  {
-    
-    // Invert number of steps because code was written
-    // thinking that adding a positve num_steps was zooming
-    // in, but because it's bp/pixel, it's actually zooming out.
-    // To get mouse wheel to zoom out, when pulling the wheel
-    // backwards, I can use the existing code, by making num_steps
-    // positive here.
-    num_steps = num_steps * (-1);
-    
-    if (cur_zoom >= 1.0)
-    {
-      emit mouseWheelZoom(cur_zoom+num_steps);
-    }
-    else if (cur_zoom < 1.0 && cur_zoom >= 0.1)
-    {
-      emit mouseWheelZoom(cur_zoom + ((double)num_steps*0.1));
-    }
-    else if (cur_zoom < 0.1)
-    {
-      emit mouseWheelZoom(cur_zoom + ((double)num_steps*0.01));
-    }
-    
-  }
-  
-  //cout << "Mouse wheel delta: " << num_degrees << "; " << num_steps << "\n";
+  const int normalize_tick = 120;
+  // arbitrary scaling factor that seems to "work"
+  const int scaling = 50;
+  int num_steps = e->delta() / normalize_tick;
+
+  cur_zoom = pow(10, log10(cur_zoom) - ((double)num_steps/scaling));
+  emit mouseWheelZoom(cur_zoom);
 }
 
 void SequenceBrowser::clearSelection()