Paint decoder traces

[pulseview.git] / pv / view / viewport.cpp

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index b437175f75fa89b0adc9f325d6f43ad98a4b30c9..0e0ae8ae4ad0807f5b99abe1f31ca458f437af94 100644 (file)
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the PulseView project.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
  *
@@ -21,8 +21,8 @@
 #include "view.h"
 #include "viewport.h"
 
-#include "../../sigsession.h"
-#include "../../signal.h"
+#include "signal.h"
+#include "../sigsession.h"
 
 #include <QMouseEvent>
 
@@ -35,75 +35,52 @@ namespace pv {
 namespace view {
 
 Viewport::Viewport(View &parent) :
-       QGLWidget(&parent),
+       QWidget(&parent),
         _view(parent)
 {
        setMouseTracking(true);
-       setAutoFillBackground(false);
+       setAutoFillBackground(true);
+       setBackgroundRole(QPalette::Base);
+
+       connect(&_view, SIGNAL(signals_moved()),
+               this, SLOT(on_signals_moved()));
 }
 
 int Viewport::get_total_height() const
 {
-       int height = 0;
-       BOOST_FOREACH(const shared_ptr<Signal> s,
-               _view.session().get_signals()) {
-               assert(s);
-               height += View::SignalHeight;
+       int h = 0;
+       const vector< shared_ptr<Trace> > traces(_view.get_traces());
+       BOOST_FOREACH(const shared_ptr<Trace> t, traces) {
+               assert(t);
+               h = max(t->get_v_offset() + View::SignalHeight, h);
        }
 
-       return height;
-}
-
-void Viewport::initializeGL()
-{
-}
-
-void Viewport::resizeGL(int width, int height)
-{
-       setup_viewport(width, height);
+       return h;
 }
 
-void Viewport::paintEvent(QPaintEvent *event)
+void Viewport::paintEvent(QPaintEvent*)
 {
-       int offset;
-
-       const vector< shared_ptr<Signal> > &sigs =
-               _view.session().get_signals();
+       const vector< shared_ptr<Trace> > traces(_view.get_traces());
 
-       // Prepare for OpenGL rendering
-       makeCurrent();
-       glMatrixMode(GL_MODELVIEW);
-       glPushMatrix();
+       QPainter p(this);
+       p.setRenderHint(QPainter::Antialiasing);
 
-       setup_viewport(width(), height());
-
-       qglClearColor(Qt::white);
-       glClear(GL_COLOR_BUFFER_BIT);
+       if (_view.cursors_shown())
+               _view.cursors().draw_viewport_background(p, rect());
 
        // Plot the signal
-       glEnable(GL_SCISSOR_TEST);
-       glScissor(0, 0, width(), height());
-       offset = -_view.v_offset();
-       BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
+       const int v_offset = _view.v_offset();
+       BOOST_FOREACH(const shared_ptr<Trace> t, traces)
        {
-               assert(s);
-
-               const QRect signal_rect(0, offset,
-                       width(), View::SignalHeight);
-
-               s->paint(*this, signal_rect, _view.scale(), _view.offset());
-
-               offset += View::SignalHeight;
+               assert(t);
+               t->paint(p, t->get_v_offset() - v_offset, 0, width(),
+                       _view.scale(), _view.offset());
        }
 
-       glDisable(GL_SCISSOR_TEST);
-
-       // Prepare for QPainter rendering
-       glMatrixMode(GL_MODELVIEW);
-       glPopMatrix();
+       if (_view.cursors_shown())
+               _view.cursors().draw_viewport_foreground(p, rect());
 
-       QPainter painter(this);
-       painter.end();
+       p.end();
 }
 
 void Viewport::mousePressEvent(QMouseEvent *event)
@@ -118,7 +95,7 @@ void Viewport::mouseMoveEvent(QMouseEvent *event)
 {
        assert(event);
 
-       if(event->buttons() & Qt::LeftButton)
+       if (event->buttons() & Qt::LeftButton)
        {
                _view.set_scale_offset(_view.scale(),
                        _mouse_down_offset +
@@ -127,24 +104,24 @@ void Viewport::mouseMoveEvent(QMouseEvent *event)
        }
 }
 
-void Viewport::mouseReleaseEvent(QMouseEvent *event)
-{
-       assert(event);
-}
-
 void Viewport::wheelEvent(QWheelEvent *event)
 {
        assert(event);
-       _view.zoom(event->delta() / 120, event->x());
+
+       if (event->orientation() == Qt::Vertical) {
+               // Vertical scrolling is interpreted as zooming in/out
+               _view.zoom(event->delta() / 120, event->x());
+       } else if (event->orientation() == Qt::Horizontal) {
+               // Horizontal scrolling is interpreted as moving left/right
+               _view.set_scale_offset(_view.scale(),
+                                      event->delta() * _view.scale()
+                                      + _view.offset());
+       }
 }
 
-void Viewport::setup_viewport(int width, int height)
+void Viewport::on_signals_moved()
 {
-       glViewport(0, 0, (GLint)width, (GLint)height);
-       glMatrixMode(GL_PROJECTION);
-       glLoadIdentity();
-       glOrtho(0, width, height, 0, -1, 1);
-       glMatrixMode(GL_MODELVIEW);
+       update();
 }
 
 } // namespace view