X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=556babcc94435de43d98cd833914f751430d9a97;hb=d4e39570ee6021766c375654801dddba45b9198a;hp=220a10aada3adebb151df3f0970c7417f7649dea;hpb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5;p=pulseview.git

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 220a10aa..556babcc 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -22,11 +22,12 @@
 #include <cmath>
 #include <algorithm>
 
-#include "view.h"
-#include "viewport.h"
+#include "signal.hpp"
+#include "view.hpp"
+#include "viewitempaintparams.hpp"
+#include "viewport.hpp"
 
-#include "signal.h"
-#include "../sigsession.h"
+#include <pv/session.hpp>
 
 #include <QMouseEvent>
 
@@ -67,23 +68,25 @@ void Viewport::paintEvent(QPaintEvent*)
 	p.setRenderHint(QPainter::Antialiasing);
 
 	if (view_.cursors_shown())
-		view_.cursors().draw_viewport_background(p, rect());
+		view_.cursors()->draw_viewport_background(p, rect());
+
+	const ViewItemPaintParams pp(0, width(), view_.scale(), view_.offset());
 
 	// Plot the signal
 	for (const shared_ptr<RowItem> r : row_items)
 	{
 		assert(r);
-		r->paint_back(p, 0, width());
+		r->paint_back(p, pp);
 	}
 
 	for (const shared_ptr<RowItem> r : row_items)
-		r->paint_mid(p, 0, width());
+		r->paint_mid(p, pp);
 
 	for (const shared_ptr<RowItem> r : row_items)
-		r->paint_fore(p, 0, width());
+		r->paint_fore(p, pp);
 
 	if (view_.cursors_shown())
-		view_.cursors().draw_viewport_foreground(p, rect());
+		view_.cursors()->draw_viewport_foreground(p, rect());
 
 	p.end();
 }