X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.hpp;h=c7013b514f6d232eb9a7636799b36f6141b7c3ae;hp=0e2ce1464e2faf337b3fa37c0cf0c5283f5b6d55;hb=2a56e4485a97c1d3e679325ec5413039d7a0c06c;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329

diff --git a/pv/view/decodetrace.hpp b/pv/view/decodetrace.hpp
index 0e2ce146..c7013b51 100644
--- a/pv/view/decodetrace.hpp
+++ b/pv/view/decodetrace.hpp
@@ -39,7 +39,7 @@ class QComboBox;
 
 namespace pv {
 
-class SigSession;
+class Session;
 
 namespace data {
 class DecoderStack;
@@ -82,7 +82,7 @@ private:
 	static const QColor OutlineColours[16];
 
 public:
-	DecodeTrace(pv::SigSession &session,
+	DecodeTrace(pv::Session &session,
 		std::shared_ptr<pv::data::DecoderStack> decoder_stack,
 		int index);
 
@@ -99,26 +99,23 @@ public:
 	/**
 	 * Paints the background layer of the trace with a QPainter
 	 * @param p the QPainter to paint into.
-	 * @param left the x-coordinate of the left edge of the signal.
-	 * @param right the x-coordinate of the right edge of the signal.
+	 * @param pp the painting parameters object to paint with..
 	 **/
-	void paint_back(QPainter &p, int left, int right);
+	void paint_back(QPainter &p, const RowItemPaintParams &pp);
 
 	/**
 	 * Paints the mid-layer of the trace with a QPainter
 	 * @param p the QPainter to paint into.
-	 * @param left the x-coordinate of the left edge of the signal
-	 * @param right the x-coordinate of the right edge of the signal
+	 * @param pp the painting parameters object to paint with.
 	 **/
-	void paint_mid(QPainter &p, int left, int right);
+	void paint_mid(QPainter &p, const RowItemPaintParams &pp);
 
 	/**
 	 * Paints the foreground layer of the trace with a QPainter
 	 * @param p the QPainter to paint into.
-	 * @param left the x-coordinate of the left edge of the signal
-	 * @param right the x-coordinate of the right edge of the signal
+	 * @param pp the painting parameters object to paint with.
 	 **/
-	void paint_fore(QPainter &p, int left, int right);
+	void paint_fore(QPainter &p, const RowItemPaintParams &pp);
 
 	void populate_popup_form(QWidget *parent, QFormLayout *form);
 
@@ -128,19 +125,18 @@ public:
 
 private:
 	void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p,
-		QColor text_colour, int text_height, int left, int right, int y,
+		int text_height, const RowItemPaintParams &pp, int y,
 		size_t base_colour) const;
 
 	void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
-		QColor fill, QColor outline, QColor text_color, int h, double x,
-		int y) const;
+		QColor fill, QColor outline, int h, double x, int y) const;
 
 	void draw_range(const pv::data::decode::Annotation &a, QPainter &p,
-		QColor fill, QColor outline, QColor text_color, int h, double start,
+		QColor fill, QColor outline, int h, double start,
 		double end, int y) const;
 
 	void draw_error(QPainter &p, const QString &message,
-		int left, int right);
+		const RowItemPaintParams &pp);
 
 	void draw_unresolved_period(QPainter &p, int h, int left,
 		int right) const;
@@ -192,7 +188,7 @@ private Q_SLOTS:
 	void on_show_hide_decoder(int index);
 
 private:
-	pv::SigSession &session_;
+	pv::Session &session_;
 	std::shared_ptr<pv::data::DecoderStack> decoder_stack_;
 
 	uint64_t decode_start_, decode_end_;