X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.hpp;h=769b2fb6f3bd3a9359d63788cd1ee047c8211b14;hp=30dea6f4fb39c9d271c7448d44d52d2713d491ca;hb=5a6a4ce3e32a250cd586f4755573ed3bed530d7b;hpb=aa5e914074b759c82974d1096f22164481eec006

diff --git a/pv/view/logicsignal.hpp b/pv/view/logicsignal.hpp
index 30dea6f4..769b2fb6 100644
--- a/pv/view/logicsignal.hpp
+++ b/pv/view/logicsignal.hpp
@@ -21,10 +21,13 @@
 #ifndef PULSEVIEW_PV_VIEW_LOGICSIGNAL_H
 #define PULSEVIEW_PV_VIEW_LOGICSIGNAL_H
 
+#include <QCache>
+
 #include "signal.hpp"
 
 #include <memory>
 
+class QIcon;
 class QToolBar;
 
 namespace sigrok {
@@ -56,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,
@@ -77,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,
@@ -98,6 +110,7 @@ private:
 
 	void init_trigger_actions(QWidget *parent);
 
+	const std::vector<int32_t> get_trigger_types() const;
 	QAction* action_from_trigger_type(
 		const sigrok::TriggerMatchType *match);
 	const sigrok::TriggerMatchType* trigger_type_from_action(
@@ -105,6 +118,9 @@ private:
 	void populate_popup_form(QWidget *parent, QFormLayout *form);
 	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();
 
@@ -120,6 +136,9 @@ private:
 	QAction *trigger_falling_;
 	QAction *trigger_low_;
 	QAction *trigger_change_;
+
+	static QCache<QString, const QIcon> icon_cache_;
+	static QCache<QString, const QPixmap> pixmap_cache_;
 };
 
 } // namespace view