X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Ftrace.h;h=c6c92e2d619d1a24572602b81a5f4594c888a6ea;hb=a77dac4e7ab85ac97f7ff63862d28948ae4dec61;hp=72f8e8a8986a092d82870c666e64d8a361c8bb3a;hpb=37fd11b167b2c258610b629bc4e17fc158b13a48;p=pulseview.git

diff --git a/pv/view/trace.h b/pv/view/trace.h
index 72f8e8a8..c6c92e2d 100644
--- a/pv/view/trace.h
+++ b/pv/view/trace.h
@@ -34,9 +34,6 @@
 class QFormLayout;
 
 namespace pv {
-
-class SigSession;
-
 namespace view {
 
 class View;
@@ -50,7 +47,7 @@ private:
 	static const int LabelHitPadding;
 
 protected:
-	Trace(SigSession &session, QString name);
+	Trace(QString name);
 
 public:
 	/**
@@ -88,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
@@ -115,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.
@@ -123,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);
@@ -142,7 +129,19 @@ public:
 	 */
 	int get_y() const;
 
+	/**
+	 * Computes the outline rectangle of a label.
+	 * @param right the x-coordinate of the right edge of the header
+	 * 	area.
+	 * @return Returns the rectangle of the signal label.
+	 */
+	QRectF label_rect(int right);
+
+public:
+	virtual void hover_point_changed();
+
 protected:
+
 	/**
 	 * Gets the text colour.
 	 * @remarks This colour is computed by comparing the lightness
@@ -166,44 +165,25 @@ protected:
 
 	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);
-
-	/**
-	 * 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);
-
-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();
 
 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;