Header/Viewport: Manually trigger the signals_changed event at construction

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

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 593edefe99beca839a943f1b9ba79977de2231a6..3b06cf9e85e0bc31a5c8f4e7edba38be8aaaa119 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,15 +21,17 @@
 #include "view.h"
 #include "viewport.h"
 
-#include "../../sigsession.h"
-#include "../../signal.h"
+#include "signal.h"
+#include "../sigsession.h"
 
 #include <QMouseEvent>
 
 #include <boost/foreach.hpp>
 
-using namespace boost;
-using namespace std;
+using boost::shared_ptr;
+using std::max;
+using std::min;
+using std::vector;
 
 namespace pv {
 namespace view {
@@ -41,40 +43,55 @@ Viewport::Viewport(View &parent) :
        setMouseTracking(true);
        setAutoFillBackground(true);
        setBackgroundRole(QPalette::Base);
+
+       connect(&_view.session(), SIGNAL(signals_changed()),
+               this, SLOT(on_signals_changed()));
+
+       connect(&_view, SIGNAL(signals_moved()),
+               this, SLOT(on_signals_moved()));
+
+       // Trigger the initial event manually. The default device has signals
+       // which were created before this object came into being
+       on_signals_changed();
 }
 
 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;
+       return h;
 }
 
-void Viewport::paintEvent(QPaintEvent *event)
+void Viewport::paintEvent(QPaintEvent*)
 {
-       const vector< shared_ptr<Signal> > &sigs =
-               _view.session().get_signals();
+       const vector< shared_ptr<Trace> > traces(_view.get_traces());
 
        QPainter p(this);
+       p.setRenderHint(QPainter::Antialiasing);
+
+       if (_view.cursors_shown())
+               _view.cursors().draw_viewport_background(p, rect());
 
        // Plot the signal
-       int offset = -_view.v_offset();
-       BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
+       BOOST_FOREACH(const shared_ptr<Trace> t, traces)
        {
-               assert(s);
+               assert(t);
+               t->paint_back(p, 0, width());
+       }
 
-               const QRect signal_rect(0, offset,
-                       width(), View::SignalHeight);
+       BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+               t->paint_mid(p, 0, width());
 
-               s->paint(p, signal_rect, _view.scale(), _view.offset());
+       BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+               t->paint_fore(p, 0, width());
 
-               offset += View::SignalHeight;
-       }
+       if (_view.cursors_shown())
+               _view.cursors().draw_viewport_foreground(p, rect());
 
        p.end();
 }
@@ -91,7 +108,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 +
@@ -100,15 +117,44 @@ void Viewport::mouseMoveEvent(QMouseEvent *event)
        }
 }
 
-void Viewport::mouseReleaseEvent(QMouseEvent *event)
+void Viewport::mouseDoubleClickEvent(QMouseEvent *event)
 {
        assert(event);
+
+       if (event->buttons() & Qt::LeftButton)
+               _view.zoom(2.0, event->x());
+       else if (event->buttons() & Qt::RightButton)
+               _view.zoom(-2.0, event->x());
 }
 
 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::on_signals_changed()
+{
+       const vector< shared_ptr<Trace> > traces(_view.get_traces());
+       BOOST_FOREACH(shared_ptr<Trace> t, traces) {
+               assert(t);
+               connect(t.get(), SIGNAL(visibility_changed()),
+                       this, SLOT(update()));
+       }
+}
+
+void Viewport::on_signals_moved()
+{
+       update();
 }
 
 } // namespace view