X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftrace.hpp;h=0a6735f59d0787539fec1ef1cdac4e5eb91c645c;hp=95efb60718df78f02b457f759028759cf39a7507;hb=73a25a6e488f1813c1cd12da085a16e4f91ed4da;hpb=ac0708fb7e6b4010d90a569386810d3d2edc7eb9

diff --git a/pv/view/trace.hpp b/pv/view/trace.hpp
index 95efb607..0a6735f5 100644
--- a/pv/view/trace.hpp
+++ b/pv/view/trace.hpp
@@ -31,6 +31,8 @@
 
 #include "tracetreeitem.hpp"
 
+#include "pv/data/signalbase.hpp"
+
 class QFormLayout;
 
 namespace pv {
@@ -49,45 +51,28 @@ private:
 	static const QPen AxisPen;
 	static const int LabelHitPadding;
 
-	static const QColor BrightBGColour;
-	static const QColor DarkBGColour;
+	static const QColor BrightGrayBGColour;
+	static const QColor DarkGrayBGColour;
 
 protected:
-	Trace(QString name);
+	Trace(std::shared_ptr<data::SignalBase> channel);
 
 public:
-	/**
-	 * Gets the name of this signal.
-	 */
-	QString name() const;
-
 	/**
 	 * Sets the name of the signal.
 	 */
 	virtual void set_name(QString name);
 
-	/**
-	 * Get the colour of the signal.
-	 */
-	QColor colour() const;
-
 	/**
 	 * Set the colour of the signal.
 	 */
-	void set_colour(QColor colour);
+	virtual void set_colour(QColor colour);
 
 	/**
 	 * Enables or disables the coloured background for this trace.
 	 */
 	void set_coloured_bg(bool state);
 
-	/**
-	 * Computes the outline rectangle of the viewport hit-box.
-	 * @param rect the rectangle of the viewport area.
-	 * @return Returns the rectangle of the hit-box.
-	 */
-	QRectF hit_box_rect(const ViewItemPaintParams &pp) const;
-
 	/**
 	 * Paints the signal label.
 	 * @param p the QPainter to paint into.
@@ -109,9 +94,9 @@ public:
 
 protected:
 	/**
-	 * Paints the background layer of the signal with a QPainter
-	 * @param p the QPainter to paint into.
-	 * @param pp the painting parameters object to paint with..
+	 * Paints the background layer of the signal with a QPainter.
+	 * @param p The QPainter to paint into.
+	 * @param pp The painting parameters object to paint with.
 	 */
 	virtual void paint_back(QPainter &p, const ViewItemPaintParams &pp);
 
@@ -129,16 +114,20 @@ protected:
 
 	virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
 
-private Q_SLOTS:
-	void on_text_changed(const QString &text);
+protected Q_SLOTS:
+	virtual void on_name_changed(const QString &text);
 
-	void on_colour_changed(const QColor &colour);
+	virtual void on_colour_changed(const QColor &colour);
 
 	void on_popup_closed();
 
+private Q_SLOTS:
+	void on_nameedit_changed(const QString &name);
+
+	void on_colouredit_changed(const QColor &colour);
+
 protected:
-	QString name_;
-	QColor colour_, bgcolour_;
+	std::shared_ptr<data::SignalBase> base_;
 	bool coloured_bg_, coloured_bg_state_;
 
 private: