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

diff --git a/pv/view/logicsignal.hpp b/pv/view/logicsignal.hpp
index 7a1c62f5..7eb67dec 100644
--- a/pv/view/logicsignal.hpp
+++ b/pv/view/logicsignal.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_LOGICSIGNAL_H
-#define PULSEVIEW_PV_VIEW_LOGICSIGNAL_H
+#ifndef PULSEVIEW_PV_VIEW_LOGICSIGNAL_HPP
+#define PULSEVIEW_PV_VIEW_LOGICSIGNAL_HPP
 
 #include <QCache>
 
@@ -31,8 +31,8 @@ class QIcon;
 class QToolBar;
 
 namespace sigrok {
-	class Device;
-	class TriggerMatchType;
+class Device;
+class TriggerMatchType;
 }
 
 namespace pv {
@@ -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,
@@ -71,6 +75,8 @@ public:
 
 	std::shared_ptr<pv::data::Logic> logic_data() const;
 
+	void set_logic_data(std::shared_ptr<pv::data::Logic> data);
+
 	/**
 	 * Computes the vertical extents of the contents of this row item.
 	 * @return A pair containing the minimum and maximum y-values.
@@ -80,18 +86,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 +121,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,9 +140,10 @@ private:
 	QAction *trigger_change_;
 
 	static QCache<QString, const QIcon> icon_cache_;
+	static QCache<QString, const QPixmap> pixmap_cache_;
 };
 
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_LOGICSIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_LOGICSIGNAL_HPP