X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=e0c49c20ad4b2f60b4e9ea1b16c69420318321ba;hb=ff008de665c7990d5f3408f918ff090d8e6c60b2;hp=aac6333addd032c0adb85886c60f2fdf9b48a248;hpb=7f4038d6abbe86e8a8c511df188293a704064167;p=pulseview.git

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index aac6333a..e0c49c20 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -263,7 +263,10 @@ void View::zoom_one_to_one()
 	double samplerate = 0.0;
 	for (const shared_ptr<SignalData> d : visible_data) {
 		assert(d);
-		samplerate = max(samplerate, d->samplerate());
+		const vector< shared_ptr<Snapshot> > snapshots =
+			d->snapshots();
+		for (const shared_ptr<Snapshot> &s : snapshots)
+			samplerate = max(samplerate, s->samplerate());
 	}
 
 	if (samplerate == 0.0)
@@ -311,12 +314,12 @@ pair<double, double> View::get_time_extents() const
 	const set< shared_ptr<SignalData> > visible_data = get_visible_data();
 	for (const shared_ptr<SignalData> d : visible_data)
 	{
-		double samplerate = d->samplerate();
-		samplerate = (samplerate <= 0.0) ? 1.0 : samplerate;
-
 		const vector< shared_ptr<Snapshot> > snapshots =
 			d->snapshots();
 		for (const shared_ptr<Snapshot> &s : snapshots) {
+			double samplerate = s->samplerate();
+			samplerate = (samplerate <= 0.0) ? 1.0 : samplerate;
+
 			const double start_time = s->start_time();
 			left_time = min(left_time, start_time);
 			right_time = max(right_time, start_time +