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

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 0e0ae8ae..a06c8888 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -42,6 +42,9 @@ Viewport::Viewport(View &parent) :
 	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()));
 }
@@ -69,14 +72,18 @@ void Viewport::paintEvent(QPaintEvent*)
 		_view.cursors().draw_viewport_background(p, rect());
 
 	// Plot the signal
-	const int v_offset = _view.v_offset();
 	BOOST_FOREACH(const shared_ptr<Trace> t, traces)
 	{
 		assert(t);
-		t->paint(p, t->get_v_offset() - v_offset, 0, width(),
-			_view.scale(), _view.offset());
+		t->paint_back(p, 0, width());
 	}
 
+	BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+		t->paint_mid(p, 0, width());
+
+	BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+		t->paint_fore(p, 0, width());
+
 	if (_view.cursors_shown())
 		_view.cursors().draw_viewport_foreground(p, rect());
 
@@ -119,6 +126,16 @@ void Viewport::wheelEvent(QWheelEvent *event)
 	}
 }
 
+void Viewport::on_signals_changed()
+{
+	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();