X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=95b8a5bec9e9f1fde845898ee5ed7a0cf1bfcc58;hp=8fca4be28b9af9cc059d6e4df04ad47ad853f17f;hb=b4ef7f2aaa12450d4e8e6b1efce5e9755d579685;hpb=333d5bbc0a326e6fa82db44f3e6ba8dd79cafdd8

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 8fca4be2..95b8a5be 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -34,9 +34,9 @@
 #include "view.h"
 #include "viewport.h"
 
-#include "../logicdata.h"
-#include "../logicdatasnapshot.h"
-#include "../sigsession.h"
+#include "pv/sigsession.h"
+#include "pv/data/logic.h"
+#include "pv/data/logicsnapshot.h"
 
 using namespace boost;
 using namespace std;
@@ -70,6 +70,7 @@ View::View(SigSession &session, QWidget *parent) :
 	_scale(1e-6),
 	_offset(0),
 	_v_offset(0),
+	_updating_scroll(false),
 	_show_cursors(false),
 	_cursors(pair<Cursor, Cursor>(Cursor(*this, 0.0),
 		Cursor(*this, 1.0))),
@@ -189,7 +190,7 @@ void View::normalize_layout()
 
 void View::get_scroll_layout(double &length, double &offset) const
 {
-	const shared_ptr<SignalData> sig_data = _session.get_data();
+	const shared_ptr<data::SignalData> sig_data = _session.get_data();
 	if (!sig_data)
 		return;
 
@@ -208,7 +209,9 @@ void View::update_scroll()
 	get_scroll_layout(length, offset);
 	length = max(length - areaSize.width(), 0.0);
 
-	horizontalScrollBar()->setPageStep(areaSize.width());
+	horizontalScrollBar()->setPageStep(areaSize.width() / 2);
+
+	_updating_scroll = true;
 
 	if (length < MaxScrollValue) {
 		horizontalScrollBar()->setRange(0, length);
@@ -219,6 +222,8 @@ void View::update_scroll()
 			_offset * MaxScrollValue / (_scale * length));
 	}
 
+	_updating_scroll = false;
+
 	// Set the vertical scrollbar
 	verticalScrollBar()->setPageStep(areaSize.height());
 	verticalScrollBar()->setRange(0,
@@ -228,7 +233,7 @@ void View::update_scroll()
 
 void View::reset_signal_layout()
 {
-	int offset = SignalMargin;
+	int offset = SignalMargin + SignalHeight;
 	const vector< shared_ptr<Signal> > sigs(_session.get_signals());
 	BOOST_FOREACH(shared_ptr<Signal> s, sigs) {
 		s->set_v_offset(offset);
@@ -279,7 +284,7 @@ bool View::viewportEvent(QEvent *e)
 	}
 }
 
-void View::resizeEvent(QResizeEvent *e)
+void View::resizeEvent(QResizeEvent*)
 {
 	_ruler->setGeometry(_viewport->x(), 0,
 		_viewport->width(), _viewport->y());
@@ -290,6 +295,9 @@ void View::resizeEvent(QResizeEvent *e)
 
 void View::h_scroll_value_changed(int value)
 {
+	if (_updating_scroll)
+		return;
+
 	const int range = horizontalScrollBar()->maximum();
 	if (range < MaxScrollValue)
 		_offset = _scale * value;
@@ -319,11 +327,11 @@ void View::data_updated()
 {
 	// Get the new data length
 	_data_length = 0;
-	shared_ptr<LogicData> sig_data = _session.get_data();
+	shared_ptr<data::Logic> sig_data = _session.get_data();
 	if (sig_data) {
-		deque< shared_ptr<LogicDataSnapshot> > &snapshots =
+		deque< shared_ptr<data::LogicSnapshot> > &snapshots =
 			sig_data->get_snapshots();
-		BOOST_FOREACH(shared_ptr<LogicDataSnapshot> s, snapshots)
+		BOOST_FOREACH(shared_ptr<data::LogicSnapshot> s, snapshots)
 			if (s)
 				_data_length = max(_data_length,
 					s->get_sample_count());