X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.h;h=18b549811e604665fda5133bb3078c4e9c596954;hp=37870be6ed23928115f1462802d51057e05e3b31;hb=f9abdc014adda6771828db4c8caa8f66e066b7a3;hpb=139fef92964a91cbdd1f7c4c280485c0fb02f9c7

diff --git a/pv/view/logicsignal.h b/pv/view/logicsignal.h
index 37870be6..18b54981 100644
--- a/pv/view/logicsignal.h
+++ b/pv/view/logicsignal.h
@@ -52,20 +52,27 @@ 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 signal with a QPainter
+	 * Paints the background layer of the signal with a QPainter
 	 * @param p the QPainter to paint into.
-	 * @param y the y-coordinate to draw the signal at.
 	 * @param left the x-coordinate of the left edge of the signal.
 	 * @param right the x-coordinate of the right edge of the signal.
-	 * @param scale the scale in seconds per pixel.
-	 * @param offset the time to show at the left hand edge of
-	 *   the view in seconds.
 	 **/
-	void paint(QPainter &p, int y, int left, int right, double scale,
-		double offset);
+	void paint_back(QPainter &p, int left, int right);
+
+	/**
+	 * 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_mid(QPainter &p, int left, int right);
 
 private:
 
@@ -92,20 +99,14 @@ private slots:
 private:
 	boost::shared_ptr<pv::data::Logic> _data;
 
-	QAction _separator;
-
-	QIcon _icon_trigger_none;
-	QAction _trigger_none;
-	QIcon _icon_trigger_rising;
-	QAction _trigger_rising;
-	QIcon _icon_trigger_high;
-	QAction _trigger_high;
-	QIcon _icon_trigger_falling;
-	QAction _trigger_falling;
-	QIcon _icon_trigger_low;
-	QAction _trigger_low;
-	QIcon _icon_trigger_change;
-	QAction _trigger_change;
+	QAction *_separator;
+
+	QAction *_trigger_none;
+	QAction *_trigger_rising;
+	QAction *_trigger_high;
+	QAction *_trigger_falling;
+	QAction *_trigger_low;
+	QAction *_trigger_change;
 };
 
 } // namespace view