X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Ftrace.h;h=bae5d253619e783f0553f8365fa187dcd75affe3;hb=a28a212c7a9a3470e300911fe8aa62833a62d26a;hp=61433e9c31388afb7cfe0ae2310ae76d0e97add1;hpb=931f20b0dbd480153611493f51fee68f9d29be74;p=pulseview.git

diff --git a/pv/view/trace.h b/pv/view/trace.h
index 61433e9c..bae5d253 100644
--- a/pv/view/trace.h
+++ b/pv/view/trace.h
@@ -23,6 +23,7 @@
 
 #include <QColor>
 #include <QPainter>
+#include <QPen>
 #include <QRect>
 #include <QString>
 
@@ -36,11 +37,14 @@ class SigSession;
 
 namespace view {
 
+class View;
+
 class Trace : public SelectableItem
 {
 	Q_OBJECT
 
 private:
+	static const QPen AxisPen;
 	static const int LabelHitPadding;
 
 protected:
@@ -82,41 +86,79 @@ public:
 	 */
 	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 trace with a QPainter
+	 * Paints the mid-layer of the trace with a QPainter
 	 * @param p the QPainter to paint into.
-	 * @param y the y-coordinate to draw the signal at
 	 * @param left the x-coordinate of the left edge of the signal
 	 * @param right the x-coordinate of the right edge of the signal
-	 * @param scale the scale in seconds per pixel.
-	 * @param offset the time to show at the left hand edge of
-	 *   the view in seconds.
 	 **/
-	virtual void paint(QPainter &p, int y, int left, int right,
-		double scale, double offset) = 0;
+	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.
 	 * @param p the QPainter to paint into.
-	 * @param y the y-coordinate of the signal.
 	 * @param right the x-coordinate of the right edge of the header
 	 * 	area.
 	 * @param hover true if the label is being hovered over by the mouse.
 	 */
-	virtual void paint_label(QPainter &p, int y, int right,
-		bool hover);
+	virtual void paint_label(QPainter &p, int right, bool hover);
 
 	/**
 	 * Determines if a point is in the header label rect.
-	 * @param y the y-coordinate of the signal.
 	 * @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 y, int left, int right,
-		const QPoint &point);
+	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;
+
+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.
+	 */
+	QColor get_text_colour() const;
+
+	/**
+	 * Paints a zero axis across the viewport.
+	 * @param p the QPainter to paint into.
+	 * @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);
+
+	virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
 
 private:
 
@@ -128,18 +170,23 @@ private:
 	/**
 	 * Computes the outline rectangle of a label.
 	 * @param p the QPainter to lay out text with.
-	 * @param y the y-coordinate of the signal.
 	 * @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 y, int right);
+	QRectF get_label_rect(int right);
+
+private slots:
+	void on_action_set_name_triggered();
+
+	void on_action_set_colour_triggered();
 
 signals:
 	void text_changed();	
 
 protected:
 	pv::SigSession &_session;
+	pv::view::View *_view;
 
 	QString _name;
 	QColor _colour;