X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.hpp;h=769b2fb6f3bd3a9359d63788cd1ee047c8211b14;hb=e899d8bd280bbb88c81b4a41fd7d624194697ef6;hp=7a1c62f570d37227890bf07677284fe72489458f;hpb=0f1f98fe5b6ccc7add3cedc035b0df5d8e5431eb;p=pulseview.git

diff --git a/pv/view/logicsignal.hpp b/pv/view/logicsignal.hpp
index 7a1c62f5..769b2fb6 100644
--- a/pv/view/logicsignal.hpp
+++ b/pv/view/logicsignal.hpp
@@ -59,6 +59,10 @@ private:
 
 	static const QColor SignalColours[10];
 
+	static QColor TriggerMarkerBackgroundColour;
+	static const int TriggerMarkerPadding;
+	static const char* TriggerMarkerIcons[8];
+
 public:
 	LogicSignal(pv::Session &session,
 		std::shared_ptr<sigrok::Device> device,
@@ -80,18 +84,23 @@ public:
 	/**
 	 * Paints the background layer of the signal 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 ViewItemPaintParams &pp);
 
 	/**
 	 * Paints the mid-layer of the signal 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, const ViewItemPaintParams &pp);
+
+	/**
+	 * Paints the foreground layer of the signal with a QPainter
+	 * @param p the QPainter to paint into.
+	 * @param pp the painting parameters object to paint with.
 	 **/
-	void paint_mid(QPainter &p, int left, int right);
+	virtual void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
 
 private:
 	void paint_caps(QPainter &p, QLineF *const lines,
@@ -110,6 +119,7 @@ private:
 	void modify_trigger();
 
 	static const QIcon* get_icon(const char *path);
+	static const QPixmap* get_pixmap(const char *path);
 
 private Q_SLOTS:
 	void on_trigger();
@@ -128,6 +138,7 @@ private:
 	QAction *trigger_change_;
 
 	static QCache<QString, const QIcon> icon_cache_;
+	static QCache<QString, const QPixmap> pixmap_cache_;
 };
 
 } // namespace view