X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=a05ac207beaaf734de8803f015479267ccd6d65d;hb=e45b13b536666034c9b6fe52a9321d749dae3c02;hp=5e89397aec8e5e71c7732bd7e27faedadb20f40d;hpb=f84000171de7e569590a2f766ae36290b73442da;p=pulseview.git

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 5e89397..a05ac20 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -36,7 +36,7 @@
 #include <QMouseEvent>
 #include <QScrollBar>
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 #include "decodetrace.hpp"
 #include "header.hpp"
@@ -204,6 +204,13 @@ int View::owner_visual_v_offset() const
 	return -verticalScrollBar()->sliderPosition();
 }
 
+void View::set_v_offset(int offset)
+{
+	verticalScrollBar()->setSliderPosition(offset);
+	header_->update();
+	viewport_->update();
+}
+
 unsigned int View::depth() const
 {
 	return 0;
@@ -290,7 +297,7 @@ void View::set_scale_offset(double scale, double offset)
 set< shared_ptr<SignalData> > View::get_visible_data() const
 {
 	shared_lock<shared_mutex> lock(session().signals_mutex());
-	const vector< shared_ptr<Signal> > &sigs(session().signals());
+	const unordered_set< shared_ptr<Signal> > &sigs(session().signals());
 
 	// Make a set of all the visible data objects
 	set< shared_ptr<SignalData> > visible_data;
@@ -316,7 +323,7 @@ pair<double, double> View::get_time_extents() const
 			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);
+				d->max_sample_count() / samplerate);
 		}
 	}
 
@@ -676,7 +683,7 @@ void View::signals_changed()
 		signal_map;
 
 	shared_lock<shared_mutex> lock(session_.signals_mutex());
-	const vector< shared_ptr<Signal> > &sigs(session_.signals());
+	const unordered_set< shared_ptr<Signal> > &sigs(session_.signals());
 
 	for (const shared_ptr<Signal> &sig : sigs)
 		signal_map[sig->channel()] = sig;