Added missing includes and defintions

[pulseview.git] / pv / view / trace.h

diff --git a/pv/view/trace.h b/pv/view/trace.h
index 07f90f4c92734e718f085f7b9b0bc0fc1d913564..85d137bcbd21cdd50b1c172defc9d6d2a8d2f1d5 100644 (file)
--- 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>
@@ -31,6 +31,8 @@
 
 #include "selectableitem.h"
 
+class QFormLayout;
+
 namespace pv {
 
 class SigSession;
@@ -131,12 +133,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 +160,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 +180,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 +204,4 @@ protected:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_TRACEL_H
+#endif // PULSEVIEW_PV_VIEW_TRACE_H