X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Ftrace.h;h=ace93d507a0a6c5832ff34f115468e400d360854;hb=13a3528cfa6ed4dc18c44aae2353ac145b0160cc;hp=ca4040d2aae5cee6d79a5f9b590b5dc54727e12b;hpb=aca00b1e0d3483926c53dfd856483a397f1c29a5;p=pulseview.git

diff --git a/pv/view/trace.h b/pv/view/trace.h
index ca4040d2..ace93d50 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:
 	/**
@@ -140,7 +139,17 @@ 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);
+
 protected:
+
 	/**
 	 * Gets the text colour.
 	 * @remarks This colour is computed by comparing the lightness
@@ -160,43 +169,32 @@ protected:
 
 	void add_colour_option(QWidget *parent, QFormLayout *form);
 
-	virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
-
-private:
-
-	/**
-	 * Computes an caches the size of the label text.
-	 */
-	void compute_text_size(QPainter &p);
+	void create_popup_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);
+	virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
 
 private slots:
 	void on_text_changed(const QString &text);
 
 	void on_colour_changed(const QColor &colour);
 
+	void on_popup_closed();
+
 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