X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.h;h=92d4cb0f704777589cb1681f4bde61b9518fcd50;hb=6e89374a6796f8d5d9cc61b0a2f7e98562a034ae;hp=023787573c243ad334008f1a18481999ebdb3fa9;hpb=e0fc58100fbcd6c3bfd5aecb213d7541a3436622;p=pulseview.git

diff --git a/pv/view/logicsignal.h b/pv/view/logicsignal.h
index 02378757..92d4cb0f 100644
--- a/pv/view/logicsignal.h
+++ b/pv/view/logicsignal.h
@@ -18,13 +18,15 @@
  * 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>
 
+class QToolBar;
+
 namespace pv {
 
 namespace data {
@@ -47,24 +49,28 @@ private:
 	static const QColor SignalColours[10];
 
 public:
-	LogicSignal(pv::SigSession &session, const sr_probe *const probe,
+	LogicSignal(pv::SigSession &session, sr_probe *const probe,
 		boost::shared_ptr<pv::data::Logic> data);
 
 	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:
 
@@ -73,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();
 
@@ -91,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;
@@ -104,4 +113,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_LOGICSIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_LOGICSIGNAL_H