Added zoom limits

[pulseview.git] / sigview.cpp

diff --git a/sigview.cpp b/sigview.cpp
index 6a2b62044ddc488959dde2c64798a5554b83a105..c46476a30f386920b799e68580b1c31f4c0b2cf2 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,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);
@@ -65,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)
@@ -80,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)
        {
@@ -99,6 +104,8 @@ void SigView::paintEvent(QPaintEvent *event)
                offset += SignalHeight;
        }
 
+       glDisable(GL_SCISSOR_TEST);
+
        // Prepare for QPainter rendering
        glMatrixMode(GL_MODELVIEW);
        glPopMatrix();
@@ -120,12 +127,12 @@ void SigView::paintEvent(QPaintEvent *event)
        }
 
        // Paint the ruler
-       paintRuler(painter);
+       paint_ruler(painter);
 
        painter.end();
 }
 
-void SigView::dataUpdated()
+void SigView::data_updated()
 {
        update();
 }
@@ -161,11 +168,12 @@ void SigView::wheelEvent(QWheelEvent *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);
@@ -174,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;