X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Ftrace.h;h=5cab44040051ba3bc2bb71a0c181ee24f27714c5;hb=7db87de3cf2079f49ad395fba3a0b16f2b0f8ce5;hp=05adf6cf58b1b579d9b5e969bef33bb1175c8e21;hpb=bda016e024cb6785fc4d0b49e60aa7bcbd7fba95;p=pulseview.git

diff --git a/pv/view/trace.h b/pv/view/trace.h
index 05adf6cf..5cab4404 100644
--- a/pv/view/trace.h
+++ b/pv/view/trace.h
@@ -31,10 +31,9 @@
 
 #include "selectableitem.h"
 
-namespace pv {
-
-class SigSession;
+class QFormLayout;
 
+namespace pv {
 namespace view {
 
 class View;
@@ -48,7 +47,7 @@ private:
 	static const int LabelHitPadding;
 
 protected:
-	Trace(SigSession &session, QString name);
+	Trace(QString name);
 
 public:
 	/**
@@ -113,7 +112,7 @@ public:
 	virtual void paint_fore(QPainter &p, int left, int right);
 
 	/**
-	 * Paints the signal label into a QGLWidget.
+	 * Paints the signal label.
 	 * @param p the QPainter to paint into.
 	 * @param right the x-coordinate of the right edge of the header
 	 * 	area.
@@ -140,7 +139,19 @@ public:
 	 */
 	int get_y() const;
 
+	/**
+	 * Computes the outline rectangle of a label.
+	 * @param p the QPainter to lay out text with.
+	 * @param right the x-coordinate of the right edge of the header
+	 * 	area.
+	 * @return Returns the rectangle of the signal label.
+	 */
+	QRectF get_label_rect(int right);
+
+	bool eventFilter(QObject *obj, QEvent *evt);
+
 protected:
+
 	/**
 	 * Gets the text colour.
 	 * @remarks This colour is computed by comparing the lightness
@@ -160,42 +171,34 @@ protected:
 
 	void add_colour_option(QWidget *parent, QFormLayout *form);
 
-	virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
-
-private:
+	void create_popup_form();
 
-	/**
-	 * Computes an caches the size of the label text.
-	 */
-	void compute_text_size(QPainter &p);
+	virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
 
-	/**
-	 * Computes the outline rectangle of a label.
-	 * @param p the QPainter to lay out text with.
-	 * @param right the x-coordinate of the right edge of the header
-	 * 	area.
-	 * @return Returns the rectangle of the signal label.
-	 */
-	QRectF get_label_rect(int right);
+	void close_popup();
 
-private slots:
+private Q_SLOTS:
 	void on_text_changed(const QString &text);
 
 	void on_colour_changed(const QColor &colour);
 
-signals:
+	void on_popup_closed();
+
+Q_SIGNALS:
+	void visibility_changed();
 	void text_changed();	
 	void colour_changed();
 
 protected:
-	pv::SigSession &_session;
 	pv::view::View *_view;
 
 	QString _name;
 	QColor _colour;
 	int _v_offset;
 
-	QSizeF _text_size;
+private:
+	pv::widgets::Popup *_popup;
+	QFormLayout *_popup_form;
 };
 
 } // namespace view