X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Ftrace.h;h=ca4040d2aae5cee6d79a5f9b590b5dc54727e12b;hb=aca00b1e0d3483926c53dfd856483a397f1c29a5;hp=07f90f4c92734e718f085f7b9b0bc0fc1d913564;hpb=fe08b6e8a85c80ae738757f7d85aa38ef7c4bdc3;p=pulseview.git

diff --git a/pv/view/trace.h b/pv/view/trace.h
index 07f90f4..ca4040d 100644
--- a/pv/view/trace.h
+++ b/pv/view/trace.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_TRACE_H
-#define PULSEVIEW_PV_TRACE_H
+#ifndef PULSEVIEW_PV_VIEW_TRACE_H
+#define PULSEVIEW_PV_VIEW_TRACE_H
 
 #include <QColor>
 #include <QPainter>
@@ -131,12 +131,24 @@ public:
 	 */
 	bool pt_in_label_rect(int left, int right, const QPoint &point);
 
-protected:
+	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.
@@ -146,6 +158,10 @@ protected:
 	 */
 	void paint_axis(QPainter &p, int y, int left, int right);
 
+	void add_colour_option(QWidget *parent, QFormLayout *form);
+
+	virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
+
 private:
 
 	/**
@@ -162,8 +178,15 @@ private:
 	 */
 	QRectF get_label_rect(int right);
 
+private slots:
+	void on_text_changed(const QString &text);
+
+	void on_colour_changed(const QColor &colour);
+
 signals:
+	void visibility_changed();
 	void text_changed();	
+	void colour_changed();
 
 protected:
 	pv::SigSession &_session;
@@ -179,4 +202,4 @@ protected:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_TRACEL_H
+#endif // PULSEVIEW_PV_VIEW_TRACE_H