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

diff --git a/pv/view/logicsignal.h b/pv/view/logicsignal.h
index 37870be6..17f6eb26 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,25 +49,31 @@ private:
 	static const QColor SignalColours[10];
 
 public:
-	LogicSignal(pv::SigSession &session, const sr_probe *const probe,
+	LogicSignal(boost::shared_ptr<pv::DevInst> dev_inst,
+		const sr_probe *const probe,
 		boost::shared_ptr<pv::data::Logic> data);
 
 	virtual ~LogicSignal();
 
-	const std::list<QAction*> get_context_bar_actions();
+	boost::shared_ptr<pv::data::SignalData> data() const;
+
+	boost::shared_ptr<pv::data::Logic> logic_data() const;
 
 	/**
-	 * 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:
 
@@ -74,8 +82,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();
 
@@ -92,23 +104,16 @@ 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;
+	QToolBar *_trigger_bar;
+	QAction *_trigger_none;
+	QAction *_trigger_rising;
+	QAction *_trigger_high;
+	QAction *_trigger_falling;
+	QAction *_trigger_low;
+	QAction *_trigger_change;
 };
 
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_LOGICSIGNAL_H
+#endif // PULSEVIEW_PV_VIEW_LOGICSIGNAL_H