Added missing includes and defintions

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

diff --git a/pv/view/trace.h b/pv/view/trace.h
index ff65a2138536945d2f95115ffbfc38738331862c..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,14 +31,12 @@
 
 #include "selectableitem.h"
 
+class QFormLayout;
+
 namespace pv {
 
 class SigSession;
 
-namespace widgets {
-class Popup;
-}
-
 namespace view {
 
 class View;
@@ -162,6 +160,8 @@ 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:
@@ -181,12 +181,14 @@ private:
        QRectF get_label_rect(int right);
 
 private slots:
-       void on_action_set_name_triggered();
+       void on_text_changed(const QString &text);
 
-       void on_action_set_colour_triggered();
+       void on_colour_changed(const QColor &colour);
 
 signals:
+       void visibility_changed();
        void text_changed();    
+       void colour_changed();
 
 protected:
        pv::SigSession &_session;
@@ -202,4 +204,4 @@ protected:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_TRACEL_H
+#endif // PULSEVIEW_PV_VIEW_TRACE_H