X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=6970ec39adb49945f8dd292567e6ce5b32b03ed7;hb=0fc664a99e0d9a444e593123d1db7a47b1657366;hp=35195b58dc150c8743f5d623e7495ccb1ecd5412;hpb=a472a884a9d2d17eb31a8a02322608fe7d71e8a3;p=pulseview.git

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 35195b58..6970ec39 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -154,9 +154,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 +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()
@@ -182,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;