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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index c5465ff3..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))),
@@ -79,6 +80,9 @@ View::View(SigSession &session, QWidget *parent) :
 		this, SLOT(h_scroll_value_changed(int)));
 	connect(verticalScrollBar(), SIGNAL(valueChanged(int)),
 		this, SLOT(v_scroll_value_changed(int)));
+
+	connect(&_session, SIGNAL(signals_changed()),
+		this, SLOT(signals_changed()));
 	connect(&_session, SIGNAL(data_updated()),
 		this, SLOT(data_updated()));
 
@@ -170,7 +174,7 @@ const QPoint& View::hover_point() const
 
 void View::normalize_layout()
 {
-	vector< shared_ptr<Signal> > &sigs = _session.get_signals();
+	const vector< shared_ptr<Signal> > sigs(_session.get_signals());
 
 	int v_min = INT_MAX;
 	BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
@@ -186,8 +190,8 @@ void View::normalize_layout()
 
 void View::get_scroll_layout(double &length, double &offset) const
 {
-	const shared_ptr<SignalData> sig_data = _session.get_data();
-	if(!sig_data)
+	const shared_ptr<data::SignalData> sig_data = _session.get_data();
+	if (!sig_data)
 		return;
 
 	length = _data_length / (sig_data->get_samplerate() * _scale);
@@ -205,9 +209,11 @@ 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) {
+	if (length < MaxScrollValue) {
 		horizontalScrollBar()->setRange(0, length);
 		horizontalScrollBar()->setSliderPosition(offset);
 	} else {
@@ -216,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,
@@ -225,8 +233,8 @@ void View::update_scroll()
 
 void View::reset_signal_layout()
 {
-	int offset = SignalMargin;
-	vector< shared_ptr<Signal> > &sigs = _session.get_signals();
+	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);
 		offset += SignalHeight + 2 * SignalMargin;
@@ -238,21 +246,21 @@ void View::reset_signal_layout()
 bool View::eventFilter(QObject *object, QEvent *event)
 {
 	const QEvent::Type type = event->type();
-	if(type == QEvent::MouseMove) {
+	if (type == QEvent::MouseMove) {
 
 		const QMouseEvent *const mouse_event = (QMouseEvent*)event;
-		if(object == _viewport)
+		if (object == _viewport)
 			_hover_point = mouse_event->pos();
-		else if(object == _ruler)
+		else if (object == _ruler)
 			_hover_point = QPoint(mouse_event->x(), 0);
-		else if(object == _header)
+		else if (object == _header)
 			_hover_point = QPoint(0, mouse_event->y());
 		else
 			_hover_point = QPoint(-1, -1);
 
 		hover_point_changed();
 
-	} else if(type == QEvent::Leave) {
+	} else if (type == QEvent::Leave) {
 		_hover_point = QPoint(-1, -1);
 		hover_point_changed();
 	}
@@ -276,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());
@@ -287,8 +295,11 @@ 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)
+	if (range < MaxScrollValue)
 		_offset = _scale * value;
 	else {
 		double length = 0, offset;
@@ -307,16 +318,21 @@ void View::v_scroll_value_changed(int value)
 	_viewport->update();
 }
 
+void View::signals_changed()
+{
+	reset_signal_layout();
+}
+
 void View::data_updated()
 {
 	// Get the new data length
 	_data_length = 0;
-	shared_ptr<LogicData> sig_data = _session.get_data();
-	if(sig_data) {
-		deque< shared_ptr<LogicDataSnapshot> > &snapshots =
+	shared_ptr<data::Logic> sig_data = _session.get_data();
+	if (sig_data) {
+		deque< shared_ptr<data::LogicSnapshot> > &snapshots =
 			sig_data->get_snapshots();
-		BOOST_FOREACH(shared_ptr<LogicDataSnapshot> s, snapshots)
-			if(s)
+		BOOST_FOREACH(shared_ptr<data::LogicSnapshot> s, snapshots)
+			if (s)
 				_data_length = max(_data_length,
 					s->get_sample_count());
 	}
@@ -326,9 +342,6 @@ void View::data_updated()
 
 	// Repaint the view
 	_viewport->update();
-
-	/// @todo: Call this only once when the signals are first created.
-	reset_signal_layout();
 }
 
 void View::marker_time_changed()