Added zoom limits

[pulseview.git] / sigview.cpp

diff --git a/sigview.cpp b/sigview.cpp
index ca5f12f9695dd3e64879124d3371e12954d0c2b2..c46476a30f386920b799e68580b1c31f4c0b2cf2 100644 (file)
--- a/sigview.cpp
+++ b/sigview.cpp
@@ -35,10 +35,14 @@
 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;
 
+const int SigView::MinorTickSubdivision = 4;
 const int SigView::ScaleUnits[3] = {1, 2, 5};
 
 const QString SigView::SIPrefixes[9] =
@@ -51,8 +55,8 @@ 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);
@@ -64,7 +68,7 @@ void SigView::initializeGL()
 
 void SigView::resizeGL(int width, int height)
 {
-       setupViewport(width, height);
+       setup_viewport(width, height);
 }
 
 void SigView::paintEvent(QPaintEvent *event)
@@ -79,12 +83,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)
        {
@@ -98,6 +104,8 @@ void SigView::paintEvent(QPaintEvent *event)
                offset += SignalHeight;
        }
 
+       glDisable(GL_SCISSOR_TEST);
+
        // Prepare for QPainter rendering
        glMatrixMode(GL_MODELVIEW);
        glPopMatrix();
@@ -119,49 +127,53 @@ 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)
+void SigView::mousePressEvent(QMouseEvent *event)
 {
        assert(event);
+
+       _mouse_down_point = event->pos();
+       _mouse_down_offset = _offset;
 }
 
-void SigView::mousePressEvent(QMouseEvent *event)
+void SigView::mouseMoveEvent(QMouseEvent *event)
 {
        assert(event);
+
+       if(event->buttons() & Qt::LeftButton)
+       {
+               _offset = _mouse_down_offset + (_mouse_down_point - event->pos()).x() * _scale;
+               update();
+       }
 }
 
 void SigView::mouseReleaseEvent(QMouseEvent *event)
 {
        assert(event);
+}
 
-       const double cursor_offset = _offset + _scale * (double)event->x();
-
-       switch(event->button())
-       {
-       case Qt::LeftButton:
-               _scale *= 2.0 / 3.0;
-               break;
-
-       case Qt::RightButton:
-               _scale *= 3.0 / 2.0;
-               break;
-       }
-
-       _offset = cursor_offset - _scale * (double)event->x();
+void SigView::wheelEvent(QWheelEvent *event)
+{
+       assert(event);
 
+       const double x = event->x() - LabelMarginWidth;
+       const double cursor_offset = _offset + _scale * x;
+       _scale *= powf(3.0/2.0, -event->delta() / 120);
+       _scale = max(min(_scale, MaxScale), MinScale);
+       _offset = cursor_offset - _scale * x;
        update();
 }
 
-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);
@@ -170,7 +182,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;
 
@@ -197,16 +209,37 @@ void SigView::paintRuler(QPainter &p)
        // Draw the tick marks
        p.setPen(Qt::black);
 
-       double t = ceil(_offset / tick_period) * tick_period;
-       double x = 0.0;
-       while((x = (t - _offset) / _scale + LabelMarginWidth) < width())
+       const double minor_tick_period = tick_period / MinorTickSubdivision;
+       const double first_major_division = floor(_offset / tick_period);
+       const double first_minor_division = ceil(_offset / minor_tick_period);
+       const double t0 = first_major_division * tick_period;
+
+       int division = (int)round(first_minor_division -
+               first_major_division * MinorTickSubdivision);
+       while(1)
        {
-               QString s;
-               QTextStream ts(&s);
-               ts << (t / order_decimal) << SIPrefixes[prefix] << "s";
-               p.drawText(x, 0, 0, text_height, Qt::AlignCenter | Qt::AlignTop |
-                       Qt::TextDontClip, s);
-               p.drawLine(x, text_height, x, RulerHeight);
-               t += tick_period;
+               const double t = t0 + division * minor_tick_period;
+               const double x = (t - _offset) / _scale + LabelMarginWidth;
+
+               if(x >= width())
+                       break;
+
+               if(division % MinorTickSubdivision == 0)
+               {
+                       // Draw a major tick
+                       QString s;
+                       QTextStream ts(&s);
+                       ts << (t / order_decimal) << SIPrefixes[prefix] << "s";
+                       p.drawText(x, 0, 0, text_height, Qt::AlignCenter | Qt::AlignTop |
+                               Qt::TextDontClip, s);
+                       p.drawLine(x, text_height, x, RulerHeight);
+               }
+               else
+               {
+                       // Draw a minor tick
+                       p.drawLine(x, (text_height + RulerHeight) / 2, x, RulerHeight);
+               }
+
+               division++;
        }
 }