X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=2b0f04a5952983ec3c4909fed12e112c4a34fc3e;hb=d873f4d685e16c708a15fcde12fbbec66650511c;hp=35195b58dc150c8743f5d623e7495ccb1ecd5412;hpb=a472a884a9d2d17eb31a8a02322608fe7d71e8a3;p=pulseview.git diff --git a/pv/view/view.cpp b/pv/view/view.cpp index 35195b5..2b0f04a 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -120,6 +120,8 @@ View::View(SigSession &session, QWidget *parent) : _viewport->installEventFilter(this); _ruler->installEventFilter(this); _header->installEventFilter(this); + + signals_changed(); } SigSession& View::session() @@ -154,9 +156,7 @@ void View::zoom(double steps) void View::zoom(double steps, int offset) { - const double new_scale = max(min(_scale * pow(3.0/2.0, -steps), - MaxScale), MinScale); - set_zoom(new_scale, offset); + set_zoom(_scale * pow(3.0/2.0, -steps), offset); } void View::zoom_fit() @@ -171,7 +171,8 @@ void View::zoom_fit() if (w <= 0) return; - set_scale_offset(delta / w, extents.first); + const double scale = max(min(delta / w, MaxScale), MinScale); + set_scale_offset(scale, extents.first); } void View::zoom_one_to_one() @@ -182,11 +183,7 @@ void View::zoom_one_to_one() session().get_signals()); // Make a set of all the visible data objects - set< shared_ptr > visible_data; - BOOST_FOREACH(const shared_ptr sig, sigs) - if (sig->enabled()) - visible_data.insert(sig->data()); - + set< shared_ptr > visible_data = get_visible_data(); if (visible_data.empty()) return;