X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftrace.h;h=c6c92e2d619d1a24572602b81a5f4594c888a6ea;hp=b82aaa6f792871c451be5a706478e499486e82bb;hb=a77dac4e7ab85ac97f7ff63862d28948ae4dec61;hpb=3c1001230d7dd6ee68d21ed46082f5f97d3b4bfc

diff --git a/pv/view/trace.h b/pv/view/trace.h
index b82aaa6f..c6c92e2d 100644
--- a/pv/view/trace.h
+++ b/pv/view/trace.h
@@ -85,7 +85,7 @@ public:
 	 */
 	virtual bool enabled() const = 0;
 
-	virtual void set_view(pv::view::View *view);
+	void set_view(pv::view::View *view);
 
 	/**
 	 * Paints the background layer of the trace with a QPainter
@@ -112,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.
@@ -120,16 +120,6 @@ public:
 	 */
 	virtual void paint_label(QPainter &p, int right, bool hover);
 
-	/**
-	 * Determines if a point is in the header label rect.
-	 * @param left the x-coordinate of the left edge of the header
-	 * 	area.
-	 * @param right the x-coordinate of the right edge of the header
-	 * 	area.
-	 * @param point the point to test.
-	 */
-	bool pt_in_label_rect(int left, int right, const QPoint &point);
-
 	virtual QMenu* create_context_menu(QWidget *parent);
 
 	pv::widgets::Popup* create_popup(QWidget *parent);
@@ -141,12 +131,14 @@ public:
 
 	/**
 	 * 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);
+	QRectF label_rect(int right);
+
+public:
+	virtual void hover_point_changed();
 
 protected:
 
@@ -173,16 +165,14 @@ protected:
 
 	virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
 
-	void close_popup();
-
-private slots:
+private Q_SLOTS:
 	void on_text_changed(const QString &text);
 
 	void on_colour_changed(const QColor &colour);
 
 	void on_popup_closed();
 
-signals:
+Q_SIGNALS:
 	void visibility_changed();
 	void text_changed();	
 	void colour_changed();