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

diff --git a/pv/view/logicsignal.h b/pv/view/logicsignal.h
index b0a328c1..99e470db 100644
--- a/pv/view/logicsignal.h
+++ b/pv/view/logicsignal.h
@@ -25,6 +25,8 @@
 
 #include <boost/shared_ptr.hpp>
 
+class QToolBar;
+
 namespace pv {
 
 namespace data {
@@ -52,17 +54,23 @@ public:
 
 	virtual ~LogicSignal();
 
-	void init_context_bar_actions(QWidget *parent);
+	boost::shared_ptr<pv::data::Logic> data() const;
 
-	const std::list<QAction*> get_context_bar_actions();
+	/**
+	 * 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.
+	 **/
+	void paint_back(QPainter &p, int left, int right);
 
 	/**
-	 * Paints the signal with a QPainter
+	 * 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.
 	 **/
-	void paint(QPainter &p, int left, int right);
+	void paint_mid(QPainter &p, int left, int right);
 
 private:
 
@@ -71,8 +79,12 @@ private:
 		bool level, double samples_per_pixel, double pixels_offset,
 		float x_offset, float y_offset);
 
-	static void add_trigger_action(const char *trig_types, char type,
-		QAction *action, std::list<QAction*> &actions);
+	void init_trigger_actions(QWidget *parent);
+
+	void populate_popup_form(QWidget *parent, QFormLayout *form);
+	
+	void add_trigger_action(const char *trig_types, char type,
+		QAction *action);
 
 	void update_trigger_actions();
 
@@ -89,8 +101,7 @@ private slots:
 private:
 	boost::shared_ptr<pv::data::Logic> _data;
 
-	QAction *_separator;
-
+	QToolBar *_trigger_bar;
 	QAction *_trigger_none;
 	QAction *_trigger_rising;
 	QAction *_trigger_high;