X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Ftrace.h;h=83eb826546184e87e91005a7e461cb9e1f8bc5fc;hb=0dda6fe595932b2e340930104fad8ac4fc574895;hp=de68dea1b1ab376d5ea03ed51207b250760dfe79;hpb=0891e69b714a1eaf8b0d5c2e85f092e9f0b44088;p=pulseview.git

diff --git a/pv/view/trace.h b/pv/view/trace.h
index de68dea1..83eb8265 100644
--- a/pv/view/trace.h
+++ b/pv/view/trace.h
@@ -29,16 +29,19 @@
 
 #include <stdint.h>
 
-#include "selectableitem.h"
+#include "rowitem.h"
 
 class QFormLayout;
 
 namespace pv {
-namespace view {
 
-class View;
+namespace widgets {
+class Popup;
+}
+
+namespace view {
 
-class Trace : public SelectableItem
+class Trace : public RowItem
 {
 	Q_OBJECT
 
@@ -53,7 +56,7 @@ public:
 	/**
 	 * Gets the name of this signal.
 	 */
-	QString get_name() const;
+	QString name() const;
 
 	/**
 	 * Sets the name of the signal.
@@ -63,7 +66,7 @@ public:
 	/**
 	 * Get the colour of the signal.
 	 */
-	QColor get_colour() const;
+	QColor colour() const;
 
 	/**
 	 * Set the colour of the signal.
@@ -71,48 +74,7 @@ public:
 	void set_colour(QColor colour);
 
 	/**
-	 * Gets the vertical layout offset of this signal.
-	 */
-	int get_v_offset() const;
-
-	/**
-	 * Sets the vertical layout offset of this signal.
-	 */
-	void set_v_offset(int v_offset);
-
-	/**
-	 * Returns true if the trace is visible and enabled.
-	 */
-	virtual bool enabled() const = 0;
-
-	virtual void set_view(pv::view::View *view);
-
-	/**
-	 * Paints the background layer of the trace with a QPainter
-	 * @param p the QPainter to paint into.
-	 * @param left the x-coordinate of the left edge of the signal
-	 * @param right the x-coordinate of the right edge of the signal
-	 **/
-	virtual void paint_back(QPainter &p, int left, int right);
-
-	/**
-	 * Paints the mid-layer of the trace with a QPainter
-	 * @param p the QPainter to paint into.
-	 * @param left the x-coordinate of the left edge of the signal
-	 * @param right the x-coordinate of the right edge of the signal
-	 **/
-	virtual void paint_mid(QPainter &p, int left, int right);
-
-	/**
-	 * Paints the foreground layer of the trace with a QPainter
-	 * @param p the QPainter to paint into.
-	 * @param left the x-coordinate of the left edge of the signal
-	 * @param right the x-coordinate of the right edge of the signal
-	 **/
-	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,35 +82,17 @@ 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);
 
-	/**
-	 * Gets the y-offset of the axis.
-	 */
-	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);
+	QRectF label_rect(int right) const;
 
 protected:
 
@@ -175,8 +119,6 @@ protected:
 
 	virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
 
-	void close_popup();
-
 private Q_SLOTS:
 	void on_text_changed(const QString &text);
 
@@ -184,17 +126,9 @@ private Q_SLOTS:
 
 	void on_popup_closed();
 
-Q_SIGNALS:
-	void visibility_changed();
-	void text_changed();	
-	void colour_changed();
-
 protected:
-	pv::view::View *_view;
-
 	QString _name;
 	QColor _colour;
-	int _v_offset;
 
 private:
 	pv::widgets::Popup *_popup;