X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Ftrace.h;h=2d8c7cf1f17d35bafec31ac567c3ba66d94bc56a;hb=27e8df221014d1a8c7769866773e8dbb0486eea8;hp=bae5d253619e783f0553f8365fa187dcd75affe3;hpb=a28a212c7a9a3470e300911fe8aa62833a62d26a;p=pulseview.git

diff --git a/pv/view/trace.h b/pv/view/trace.h
index bae5d253..2d8c7cf1 100644
--- a/pv/view/trace.h
+++ b/pv/view/trace.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_TRACE_H
-#define PULSEVIEW_PV_TRACE_H
+#ifndef PULSEVIEW_PV_VIEW_TRACE_H
+#define PULSEVIEW_PV_VIEW_TRACE_H
 
 #include <QColor>
 #include <QPainter>
@@ -31,6 +31,8 @@
 
 #include "selectableitem.h"
 
+class QFormLayout;
+
 namespace pv {
 
 class SigSession;
@@ -140,7 +142,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
@@ -158,31 +170,23 @@ protected:
 	 */
 	void paint_axis(QPainter &p, int y, int left, int right);
 
-	virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
+	void add_colour_option(QWidget *parent, QFormLayout *form);
 
-private:
+	void create_popup_form();
 
-	/**
-	 * Computes an caches the size of the label text.
-	 */
-	void compute_text_size(QPainter &p);
-
-	/**
-	 * 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_action_set_name_triggered();
+	void on_text_changed(const QString &text);
+
+	void on_colour_changed(const QColor &colour);
 
-	void on_action_set_colour_triggered();
+	void on_popup_closed();
 
 signals:
+	void visibility_changed();
 	void text_changed();	
+	void colour_changed();
 
 protected:
 	pv::SigSession &_session;
@@ -192,10 +196,12 @@ protected:
 	QColor _colour;
 	int _v_offset;
 
-	QSizeF _text_size;
+private:
+	pv::widgets::Popup *_popup;
+	QFormLayout *_popup_form;
 };
 
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_TRACEL_H
+#endif // PULSEVIEW_PV_VIEW_TRACE_H