Added toolbar zoom buttons

[pulseview.git] / sigview.cpp

diff --git a/sigview.cpp b/sigview.cpp
index a8e8535923d5a2acfc1a1aa2ae84ec804315d434..5601be575d722df78302897fa19965fe3280464e 100644 (file)
--- a/sigview.cpp
+++ b/sigview.cpp
@@ -35,6 +35,9 @@
 using namespace boost;
 using namespace std;
 
+const double SigView::MaxScale = 1e9;
+const double SigView::MinScale = 1e-15;
+
 const int SigView::SignalHeight = 50;
 const int SigView::LabelMarginWidth = 70;
 const int SigView::RulerHeight = 30;
@@ -52,20 +55,25 @@ SigView::SigView(SigSession &session, QWidget *parent) :
        _scale(1e-6),
        _offset(0)
 {
-       connect(&_session, SIGNAL(dataUpdated()),
-               this, SLOT(dataUpdated()));
+       connect(&_session, SIGNAL(data_updated()),
+               this, SLOT(data_updated()));
 
        setMouseTracking(true);
        setAutoFillBackground(false);
 }
 
+void SigView::zoom(double steps)
+{
+       zoom(steps, (width() - LabelMarginWidth) / 2);
+}
+
 void SigView::initializeGL()
 {
 }
 
 void SigView::resizeGL(int width, int height)
 {
-       setupViewport(width, height);
+       setup_viewport(width, height);
 }
 
 void SigView::paintEvent(QPaintEvent *event)
@@ -80,12 +88,14 @@ void SigView::paintEvent(QPaintEvent *event)
        glMatrixMode(GL_MODELVIEW);
        glPushMatrix();
 
-       setupViewport(width(), height());
+       setup_viewport(width(), height());
 
        qglClearColor(Qt::white);
        glClear(GL_COLOR_BUFFER_BIT);
 
        // Plot the signal
+       glEnable(GL_SCISSOR_TEST);
+       glScissor(LabelMarginWidth, 0, width(), height());
        offset = RulerHeight;
        BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
        {
@@ -99,6 +109,8 @@ void SigView::paintEvent(QPaintEvent *event)
                offset += SignalHeight;
        }
 
+       glDisable(GL_SCISSOR_TEST);
+
        // Prepare for QPainter rendering
        glMatrixMode(GL_MODELVIEW);
        glPopMatrix();
@@ -120,49 +132,47 @@ void SigView::paintEvent(QPaintEvent *event)
        }
 
        // Paint the ruler
-       paintRuler(painter);
+       paint_ruler(painter);
 
        painter.end();
 }
 
-void SigView::dataUpdated()
+void SigView::data_updated()
 {
        update();
 }
 
-void SigView::mouseMoveEvent(QMouseEvent *event)
-{
-       assert(event);
-}
-
 void SigView::mousePressEvent(QMouseEvent *event)
 {
        assert(event);
+
+       _mouse_down_point = event->pos();
+       _mouse_down_offset = _offset;
 }
 
-void SigView::mouseReleaseEvent(QMouseEvent *event)
+void SigView::mouseMoveEvent(QMouseEvent *event)
 {
        assert(event);
 
-       const double cursor_offset = _offset + _scale * (double)event->x();
-
-       switch(event->button())
+       if(event->buttons() & Qt::LeftButton)
        {
-       case Qt::LeftButton:
-               _scale *= 2.0 / 3.0;
-               break;
-
-       case Qt::RightButton:
-               _scale *= 3.0 / 2.0;
-               break;
+               _offset = _mouse_down_offset + (_mouse_down_point - event->pos()).x() * _scale;
+               update();
        }
+}
 
-       _offset = cursor_offset - _scale * (double)event->x();
+void SigView::mouseReleaseEvent(QMouseEvent *event)
+{
+       assert(event);
+}
 
-       update();
+void SigView::wheelEvent(QWheelEvent *event)
+{
+       assert(event);
+       zoom(event->delta() / 120, event->x() - LabelMarginWidth);
 }
 
-void SigView::setupViewport(int width, int height)
+void SigView::setup_viewport(int width, int height)
 {
        glViewport(0, 0, (GLint)width, (GLint)height);
        glMatrixMode(GL_PROJECTION);
@@ -171,7 +181,7 @@ void SigView::setupViewport(int width, int height)
        glMatrixMode(GL_MODELVIEW);
 }
 
-void SigView::paintRuler(QPainter &p)
+void SigView::paint_ruler(QPainter &p)
 {
        const double MinSpacing = 80;
 
@@ -232,3 +242,12 @@ void SigView::paintRuler(QPainter &p)
                division++;
        }
 }
+
+void SigView::zoom(double steps, int offset)
+{
+       const double cursor_offset = _offset + _scale * offset;
+       _scale *= pow(3.0/2.0, -steps);
+       _scale = max(min(_scale, MaxScale), MinScale);
+       _offset = cursor_offset - _scale * offset;
+       update();
+}