X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.h;h=0f6714cf0ce11661c58e0c264d6973e5350b6753;hb=0715fb8c638b53ac25590841fcbf3a1da3546b68;hp=34a307c919dca35ef7bccd35761ac4003cbf5169;hpb=f9abf97e78bc4825d80926b0ebc6cbaef40768b1;p=pulseview.git

diff --git a/pv/view/logicsignal.h b/pv/view/logicsignal.h
index 34a307c9..0f6714cf 100644
--- a/pv/view/logicsignal.h
+++ b/pv/view/logicsignal.h
@@ -50,7 +50,7 @@ private:
 
 public:
 	LogicSignal(std::shared_ptr<pv::device::DevInst> dev_inst,
-		const sr_channel *const probe,
+		const sr_channel *const channel,
 		std::shared_ptr<pv::data::Logic> data);
 
 	virtual ~LogicSignal();
@@ -76,7 +76,6 @@ public:
 	void paint_mid(QPainter &p, int left, int right);
 
 private:
-
 	void paint_caps(QPainter &p, QLineF *const lines,
 		std::vector< std::pair<int64_t, bool> > &edges,
 		bool level, double samples_per_pixel, double pixels_offset,
@@ -84,26 +83,17 @@ private:
 
 	void init_trigger_actions(QWidget *parent);
 
+	QAction* match_action(int match);
+	int action_match(QAction *action);
 	void populate_popup_form(QWidget *parent, QFormLayout *form);
-	
-	void add_trigger_action(const char *trig_types, char type,
-		QAction *action);
-
-	void update_trigger_actions();
-
-	void set_trigger(char type);
 
-private slots:
-	void on_trigger_none();
-	void on_trigger_rising();
-	void on_trigger_high();
-	void on_trigger_falling();
-	void on_trigger_low();
-	void on_trigger_change();
+private Q_SLOTS:
+	void on_trigger();
 
 private:
 	std::shared_ptr<pv::data::Logic> _data;
 
+	int _trigger_match;
 	QToolBar *_trigger_bar;
 	QAction *_trigger_none;
 	QAction *_trigger_rising;