X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftrace.hpp;h=9f0ecd44c2a54ca82706775887db0e453792c6fa;hp=88df33eadb0bddc74ff00b61774eba65ecdb757c;hb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329

diff --git a/pv/view/trace.hpp b/pv/view/trace.hpp
index 88df33ea..9f0ecd44 100644
--- a/pv/view/trace.hpp
+++ b/pv/view/trace.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_TRACE_H
-#define PULSEVIEW_PV_VIEW_TRACE_H
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP
 
 #include <QColor>
 #include <QPainter>
@@ -29,7 +29,9 @@
 
 #include <stdint.h>
 
-#include "rowitem.hpp"
+#include "tracetreeitem.hpp"
+
+#include "pv/data/signalbase.hpp"
 
 class QFormLayout;
 
@@ -39,9 +41,10 @@ namespace widgets {
 class Popup;
 }
 
-namespace view {
+namespace views {
+namespace TraceView {
 
-class Trace : public RowItem
+class Trace : public TraceTreeItem
 {
 	Q_OBJECT
 
@@ -49,38 +52,35 @@ private:
 	static const QPen AxisPen;
 	static const int LabelHitPadding;
 
+	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.
+	 * Set the colour of the signal.
 	 */
-	QColor colour() const;
+	virtual void set_colour(QColor colour);
 
 	/**
-	 * Set the colour of the signal.
+	 * Enables or disables the coloured background for this trace.
 	 */
-	void set_colour(QColor colour);
+	void set_coloured_bg(bool state);
 
 	/**
 	 * Paints the signal label.
 	 * @param p the QPainter to paint into.
-	 * @param right the x-coordinate of the right edge of the header
-	 * 	area.
+	 * @param rect the rectangle of the header area.
 	 * @param hover true if the label is being hovered over by the mouse.
 	 */
-	virtual void paint_label(QPainter &p, int right, bool hover);
+	virtual void paint_label(QPainter &p, const QRect &rect, bool hover);
 
 	virtual QMenu* create_context_menu(QWidget *parent);
 
@@ -88,30 +88,26 @@ public:
 
 	/**
 	 * Computes the outline rectangle of a label.
-	 * @param right the x-coordinate of the right edge of the header
-	 * 	area.
+	 * @param rect the rectangle of the header area.
 	 * @return Returns the rectangle of the signal label.
 	 */
-	QRectF label_rect(int right) const;
+	QRectF label_rect(const QRectF &rect) const;
 
 protected:
-
 	/**
-	 * Gets the text colour.
-	 * @remarks This colour is computed by comparing the lightness
-	 * of the trace colour against a threshold to determine whether
-	 * white or black would be more visible.
+	 * 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.
 	 */
-	QColor get_text_colour() const;
+	virtual void paint_back(QPainter &p, const ViewItemPaintParams &pp);
 
 	/**
 	 * Paints a zero axis across the viewport.
 	 * @param p the QPainter to paint into.
+	 * @param pp the painting parameters object to paint with.
 	 * @param y the y-offset of the axis.
-	 * @param left the x-coordinate of the left edge of the view.
-	 * @param right the x-coordinate of the right edge of the view.
 	 */
-	void paint_axis(QPainter &p, int y, int left, int right);
+	void paint_axis(QPainter &p, const ViewItemPaintParams &pp, int y);
 
 	void add_colour_option(QWidget *parent, QFormLayout *form);
 
@@ -119,23 +115,29 @@ 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_;
+	std::shared_ptr<data::SignalBase> base_;
+	bool coloured_bg_, coloured_bg_state_;
 
 private:
 	pv::widgets::Popup *popup_;
 	QFormLayout *popup_form_;
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_TRACE_H
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP