In View::zoom_one_to_one use View::get_visible_data

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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index cf990bcdced9f7cf44eeac9b149f2942cb8c2cc9..6970ec39adb49945f8dd292567e6ce5b32b03ed7 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -169,7 +169,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()
@@ -180,11 +181,7 @@ void View::zoom_one_to_one()
                session().get_signals());
 
        // Make a set of all the visible data objects
-       set< shared_ptr<SignalData> > visible_data;
-       BOOST_FOREACH(const shared_ptr<Signal> sig, sigs)
-               if (sig->enabled())
-                       visible_data.insert(sig->data());
-
+       set< shared_ptr<SignalData> > visible_data = get_visible_data();
        if (visible_data.empty())
                return;