simplify zoom code

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

diff --git a/qui/seqbrowser/SequenceBrowser.cpp b/qui/seqbrowser/SequenceBrowser.cpp
index 3e96ab9470160ff59fae82def121a0fe5ae9b62a..4e1fbcd74421572b0b587bbe5fd1fc508b33f141 100644 (file)
--- a/qui/seqbrowser/SequenceBrowser.cpp
+++ b/qui/seqbrowser/SequenceBrowser.cpp
@@ -4,6 +4,7 @@
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QMouseEvent>
+#include <QWheelEvent>
 #include <QRubberBand>
 #include <QRect>
 #include <QString>
@@ -214,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;
   }
 }
@@ -226,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();
   }
 }
 
@@ -245,9 +249,11 @@ void SequenceBrowser::mouseReleaseEvent( QMouseEvent *e)
       }
       break;
    default:
+      e->ignore();
+      return;
       break;
   }
-
+  e->accept();
 }
 
 void SequenceBrowser::startSelecting(QMouseEvent *e)
@@ -275,6 +281,22 @@ void SequenceBrowser::stopSelecting(QMouseEvent *e)
   }
 }
 
+void SequenceBrowser::wheelEvent(QWheelEvent *e)
+{
+  e->accept();
+  double cur_zoom = GlSeqBrowser::zoom();
+  
+  // Normalize so one turn of the mouse wheel
+  // is equal to 1 step.
+  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()
 {
   GlSeqBrowser::clearSelection();