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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index aac6333a..03848478 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -50,14 +50,14 @@
 
 #include "pv/session.hpp"
 #include "pv/data/logic.hpp"
-#include "pv/data/logicsnapshot.hpp"
+#include "pv/data/logicsegment.hpp"
 #include "pv/util.hpp"
 
 using boost::shared_lock;
 using boost::shared_mutex;
 
 using pv::data::SignalData;
-using pv::data::Snapshot;
+using pv::data::Segment;
 using pv::util::format_time;
 
 using std::back_inserter;
@@ -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<Segment> > segments =
+			d->segments();
+		for (const shared_ptr<Segment> &s : segments)
+			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<Segment> > segments =
+			d->segments();
+		for (const shared_ptr<Segment> &s : segments) {
+			double samplerate = s->samplerate();
+			samplerate = (samplerate <= 0.0) ? 1.0 : samplerate;
 
-		const vector< shared_ptr<Snapshot> > snapshots =
-			d->snapshots();
-		for (const shared_ptr<Snapshot> &s : snapshots) {
 			const double start_time = s->start_time();
 			left_time = min(left_time, start_time);
 			right_time = max(right_time, start_time +