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

diff --git a/pv/view/logicsignal.hpp b/pv/view/logicsignal.hpp
index a4f64e6b..7eb67dec 100644
--- a/pv/view/logicsignal.hpp
+++ b/pv/view/logicsignal.hpp
@@ -18,18 +18,21 @@
  * 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>
 
 #include "signal.hpp"
 
 #include <memory>
 
+class QIcon;
 class QToolBar;
 
 namespace sigrok {
-	class Device;
-	class TriggerMatchType;
+class Device;
+class TriggerMatchType;
 }
 
 namespace pv {
@@ -56,8 +59,12 @@ private:
 
 	static const QColor SignalColours[10];
 
+	static QColor TriggerMarkerBackgroundColour;
+	static const int TriggerMarkerPadding;
+	static const char* TriggerMarkerIcons[8];
+
 public:
-	LogicSignal(pv::SigSession &session,
+	LogicSignal(pv::Session &session,
 		std::shared_ptr<sigrok::Device> device,
 		std::shared_ptr<sigrok::Channel> channel,
 		std::shared_ptr<pv::data::Logic> data);
@@ -68,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.
@@ -77,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, int left, int right);
+	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.
+	 **/
+	virtual void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
 
 private:
 	void paint_caps(QPainter &p, QLineF *const lines,
@@ -98,11 +112,17 @@ private:
 
 	void init_trigger_actions(QWidget *parent);
 
-	QAction* match_action(const sigrok::TriggerMatchType *match);
-	const sigrok::TriggerMatchType *action_match(QAction *action);
+	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(
+		QAction *action);
 	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();
 
@@ -118,9 +138,12 @@ 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
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_LOGICSIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_LOGICSIGNAL_HPP