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

diff --git a/pv/view/logicsignal.hpp b/pv/view/logicsignal.hpp
index a4f64e6b..7a1c62f5 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 {
@@ -57,7 +60,7 @@ private:
 	static const QColor SignalColours[10];
 
 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);
@@ -98,11 +101,16 @@ 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);
+
 private Q_SLOTS:
 	void on_trigger();
 
@@ -118,6 +126,8 @@ private:
 	QAction *trigger_falling_;
 	QAction *trigger_low_;
 	QAction *trigger_change_;
+
+	static QCache<QString, const QIcon> icon_cache_;
 };
 
 } // namespace view