X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=a06c8888761f6c1237ffde3c5aecc8ceb2ff5df1;hp=99e08b277d151160bbf3b0842d68f0119c60582a;hb=aca00b1e0d3483926c53dfd856483a397f1c29a5;hpb=ce6e73a8e2a2a353233b440f4bbbd53007602e1a

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 99e08b27..a06c8888 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -21,8 +21,8 @@
 #include "view.h"
 #include "viewport.h"
 
+#include "signal.h"
 #include "../sigsession.h"
-#include "../signal.h"
 
 #include <QMouseEvent>
 
@@ -41,41 +41,51 @@ Viewport::Viewport(View &parent) :
 	setMouseTracking(true);
 	setAutoFillBackground(true);
 	setBackgroundRole(QPalette::Base);
+
+	connect(&_view.session(), SIGNAL(signals_changed()),
+		this, SLOT(on_signals_changed()));
+
+	connect(&_view, SIGNAL(signals_moved()),
+		this, SLOT(on_signals_moved()));
 }
 
 int Viewport::get_total_height() const
 {
-	int height = 0;
-	BOOST_FOREACH(const shared_ptr<Signal> s,
-		_view.session().get_signals()) {
-		assert(s);
-		height += View::SignalHeight;
+	int h = 0;
+	const vector< shared_ptr<Trace> > traces(_view.get_traces());
+	BOOST_FOREACH(const shared_ptr<Trace> t, traces) {
+		assert(t);
+		h = max(t->get_v_offset() + View::SignalHeight, h);
 	}
 
-	return height;
+	return h;
 }
 
-void Viewport::paintEvent(QPaintEvent *event)
+void Viewport::paintEvent(QPaintEvent*)
 {
-	const vector< shared_ptr<Signal> > &sigs =
-		_view.session().get_signals();
+	const vector< shared_ptr<Trace> > traces(_view.get_traces());
 
 	QPainter p(this);
 	p.setRenderHint(QPainter::Antialiasing);
 
+	if (_view.cursors_shown())
+		_view.cursors().draw_viewport_background(p, rect());
+
 	// Plot the signal
-	int offset = -_view.v_offset();
-	BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
+	BOOST_FOREACH(const shared_ptr<Trace> t, traces)
 	{
-		assert(s);
+		assert(t);
+		t->paint_back(p, 0, width());
+	}
 
-		const QRect signal_rect(0, offset,
-			width(), View::SignalHeight);
+	BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+		t->paint_mid(p, 0, width());
 
-		s->paint(p, signal_rect, _view.scale(), _view.offset());
+	BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+		t->paint_fore(p, 0, width());
 
-		offset += View::SignalHeight;
-	}
+	if (_view.cursors_shown())
+		_view.cursors().draw_viewport_foreground(p, rect());
 
 	p.end();
 }
@@ -92,7 +102,7 @@ void Viewport::mouseMoveEvent(QMouseEvent *event)
 {
 	assert(event);
 
-	if(event->buttons() & Qt::LeftButton)
+	if (event->buttons() & Qt::LeftButton)
 	{
 		_view.set_scale_offset(_view.scale(),
 			_mouse_down_offset +
@@ -101,15 +111,34 @@ void Viewport::mouseMoveEvent(QMouseEvent *event)
 	}
 }
 
-void Viewport::mouseReleaseEvent(QMouseEvent *event)
+void Viewport::wheelEvent(QWheelEvent *event)
 {
 	assert(event);
+
+	if (event->orientation() == Qt::Vertical) {
+		// Vertical scrolling is interpreted as zooming in/out
+		_view.zoom(event->delta() / 120, event->x());
+	} else if (event->orientation() == Qt::Horizontal) {
+		// Horizontal scrolling is interpreted as moving left/right
+		_view.set_scale_offset(_view.scale(),
+				       event->delta() * _view.scale()
+				       + _view.offset());
+	}
 }
 
-void Viewport::wheelEvent(QWheelEvent *event)
+void Viewport::on_signals_changed()
 {
-	assert(event);
-	_view.zoom(event->delta() / 120, event->x());
+	const vector< shared_ptr<Trace> > traces(_view.get_traces());
+	BOOST_FOREACH(shared_ptr<Trace> t, traces) {
+		assert(t);
+		connect(t.get(), SIGNAL(visibility_changed()),
+			this, SLOT(update()));
+	}
+}
+
+void Viewport::on_signals_moved()
+{
+	update();
 }
 
 } // namespace view