X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=cdae779e5dc0dfeec7a39d9fe3ecc2758bb98fed;hb=d9aecf1fcd9af471db3b59de7efc65b9632a6d79;hp=e9a1442217d7bc1bd600f6432e0002c7ed0543e3;hpb=819f4c25391a9c74d3d2f528d462142d5c4aad4d;p=pulseview.git diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp index e9a1442..cdae779 100644 --- a/pv/view/viewport.cpp +++ b/pv/view/viewport.cpp @@ -26,8 +26,6 @@ #include -#include - using boost::shared_ptr; using std::max; using std::min; @@ -49,13 +47,17 @@ Viewport::Viewport(View &parent) : 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 h = 0; const vector< shared_ptr > traces(_view.get_traces()); - BOOST_FOREACH(const shared_ptr t, traces) { + for (const shared_ptr t : traces) { assert(t); h = max(t->get_v_offset() + View::SignalHeight, h); } @@ -74,16 +76,16 @@ void Viewport::paintEvent(QPaintEvent*) _view.cursors().draw_viewport_background(p, rect()); // Plot the signal - BOOST_FOREACH(const shared_ptr t, traces) + for (const shared_ptr t : traces) { assert(t); t->paint_back(p, 0, width()); } - BOOST_FOREACH(const shared_ptr t, traces) + for (const shared_ptr t : traces) t->paint_mid(p, 0, width()); - BOOST_FOREACH(const shared_ptr t, traces) + for (const shared_ptr t : traces) t->paint_fore(p, 0, width()); if (_view.cursors_shown()) @@ -141,7 +143,7 @@ void Viewport::wheelEvent(QWheelEvent *event) void Viewport::on_signals_changed() { const vector< shared_ptr > traces(_view.get_traces()); - BOOST_FOREACH(shared_ptr t, traces) { + for (shared_ptr t : traces) { assert(t); connect(t.get(), SIGNAL(visibility_changed()), this, SLOT(update()));