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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index fce5b18c..03848478 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -50,13 +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::Segment;
 using pv::util::format_time;
 
 using std::back_inserter;
@@ -262,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)
@@ -306,22 +310,26 @@ set< shared_ptr<SignalData> > View::get_visible_data() const
 
 pair<double, double> View::get_time_extents() const
 {
-	const set< shared_ptr<SignalData> > visible_data = get_visible_data();
-	if (visible_data.empty())
-		return make_pair(0.0, 0.0);
-
 	double left_time = DBL_MAX, right_time = DBL_MIN;
+	const set< shared_ptr<SignalData> > visible_data = get_visible_data();
 	for (const shared_ptr<SignalData> d : visible_data)
 	{
-		const double start_time = d->get_start_time();
-		double samplerate = d->samplerate();
-		samplerate = (samplerate <= 0.0) ? 1.0 : samplerate;
-
-		left_time = min(left_time, start_time);
-		right_time = max(right_time, start_time +
-			d->get_max_sample_count() / 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 double start_time = s->start_time();
+			left_time = min(left_time, start_time);
+			right_time = max(right_time, start_time +
+				d->get_max_sample_count() / samplerate);
+		}
 	}
 
+	if (left_time == DBL_MAX && right_time == DBL_MIN)
+		return make_pair(0.0, 0.0);
+
 	assert(left_time < right_time);
 	return make_pair(left_time, right_time);
 }
@@ -451,7 +459,10 @@ void View::update_scroll()
 	get_scroll_layout(length, offset);
 	length = max(length - areaSize.width(), 0.0);
 
+	int major_tick_distance = tick_period_ / scale_;
+
 	horizontalScrollBar()->setPageStep(areaSize.width() / 2);
+	horizontalScrollBar()->setSingleStep(major_tick_distance);
 
 	updating_scroll_ = true;