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 0e0ae8ae4ad0807f5b99abe1f31ca458f437af94..3b06cf9e85e0bc31a5c8f4e7edba38be8aaaa119 100644 (file)
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -28,8 +28,10 @@
 
 #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 {
@@ -42,8 +44,15 @@ Viewport::Viewport(View &parent) :
        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
@@ -69,14 +78,18 @@ void Viewport::paintEvent(QPaintEvent*)
                _view.cursors().draw_viewport_background(p, rect());
 
        // Plot the signal
-       const int v_offset = _view.v_offset();
        BOOST_FOREACH(const shared_ptr<Trace> t, traces)
        {
                assert(t);
-               t->paint(p, t->get_v_offset() - v_offset, 0, width(),
-                       _view.scale(), _view.offset());
+               t->paint_back(p, 0, width());
        }
 
+       BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+               t->paint_mid(p, 0, width());
+
+       BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+               t->paint_fore(p, 0, width());
+
        if (_view.cursors_shown())
                _view.cursors().draw_viewport_foreground(p, rect());
 
@@ -104,6 +117,16 @@ void Viewport::mouseMoveEvent(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);
@@ -119,6 +142,16 @@ void Viewport::wheelEvent(QWheelEvent *event)
        }
 }
 
+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();