X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.h;h=de1f2ec8e50b4a24da231843bd47d5e44c85c6fa;hb=bb3030b34e44733036acdfe5b4d4ec0705146831;hp=99e470dba6951b26e26f30f8128b9804fe3b3bfb;hpb=767281c8881e4ed35607cbff4b270dfd55d0ef67;p=pulseview.git

diff --git a/pv/view/logicsignal.h b/pv/view/logicsignal.h
index 99e470db..de1f2ec8 100644
--- a/pv/view/logicsignal.h
+++ b/pv/view/logicsignal.h
@@ -18,12 +18,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_LOGICSIGNAL_H
-#define PULSEVIEW_PV_LOGICSIGNAL_H
+#ifndef PULSEVIEW_PV_VIEW_LOGICSIGNAL_H
+#define PULSEVIEW_PV_VIEW_LOGICSIGNAL_H
 
 #include "signal.h"
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 class QToolBar;
 
@@ -49,12 +49,15 @@ private:
 	static const QColor SignalColours[10];
 
 public:
-	LogicSignal(pv::SigSession &session, const sr_probe *const probe,
-		boost::shared_ptr<pv::data::Logic> data);
+	LogicSignal(std::shared_ptr<pv::device::DevInst> dev_inst,
+		const sr_channel *const probe,
+		std::shared_ptr<pv::data::Logic> data);
 
 	virtual ~LogicSignal();
 
-	boost::shared_ptr<pv::data::Logic> data() const;
+	std::shared_ptr<pv::data::SignalData> data() const;
+
+	std::shared_ptr<pv::data::Logic> logic_data() const;
 
 	/**
 	 * Paints the background layer of the signal with a QPainter
@@ -73,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,
@@ -81,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();
+	void on_trigger();
 
 private:
-	boost::shared_ptr<pv::data::Logic> _data;
+	std::shared_ptr<pv::data::Logic> _data;
 
+	int _trigger_match;
 	QToolBar *_trigger_bar;
 	QAction *_trigger_none;
 	QAction *_trigger_rising;
@@ -113,4 +106,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_LOGICSIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_LOGICSIGNAL_H