X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fsignal.h;h=540eb6eda38899b3027a9f3a4baac45ecb39b3ba;hb=03ce95a9bb81c05bae0da9de189d280214db67c3;hp=81576dd4d19a9ef0a56465a8146c1f70e206ab08;hpb=931f20b0dbd480153611493f51fee68f9d29be74;p=pulseview.git

diff --git a/pv/view/signal.h b/pv/view/signal.h
index 81576dd..540eb6e 100644
--- a/pv/view/signal.h
+++ b/pv/view/signal.h
@@ -22,7 +22,6 @@
 #define PULSEVIEW_PV_SIGNAL_H
 
 #include <QComboBox>
-#include <QPen>
 #include <QWidgetAction>
 
 #include <stdint.h>
@@ -43,9 +42,6 @@ class Signal : public Trace
 {
 	Q_OBJECT
 
-private:
-	static const QPen SignalAxisPen;
-
 protected:
 	Signal(pv::SigSession &session, const sr_probe *const probe);
 
@@ -60,16 +56,9 @@ public:
 	 */
 	bool enabled() const;
 
-protected:
+	const sr_probe* probe() const;
 
-	/**
-	 * Paints a zero axis across the viewport.
-	 * @param p the QPainter to paint into.
-	 * @param y the y-offset of the axis.
-	 * @param left the x-coordinate of the left edge of the view.
-	 * @param right the x-coordinate of the right edge of the view.
-	 */
-	void paint_axis(QPainter &p, int y, int left, int right);
+	virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
 
 private slots:
 	void on_text_changed(const QString &text);
@@ -77,8 +66,7 @@ private slots:
 protected:
 	const sr_probe *const _probe;
 
-	QWidgetAction _name_action;
-	QComboBox _name_widget;
+	QComboBox *_name_widget;
 	bool _updating_name_widget;
 };