Corrected pv::view::Trace header gates

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

diff --git a/pv/view/trace.h b/pv/view/trace.h
index 415a7dc28c70c4e273f2bcde3bd5d037306d10f2..243bc2ad41c307799a32b81e03943e7d7db7c3f7 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>
@@ -131,12 +131,16 @@ 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
@@ -154,6 +158,8 @@ protected:
         */
        void paint_axis(QPainter &p, int y, int left, int right);
 
+       virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
+
 private:
 
        /**
@@ -170,6 +176,13 @@ private:
         */
        QRectF get_label_rect(int right);
 
+private slots:
+       void on_action_set_name_triggered();
+
+       void on_action_set_colour_triggered();
+
+       void on_text_changed(const QString &text);
+
 signals:
        void text_changed();    
 
@@ -187,4 +200,4 @@ protected:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_TRACEL_H
+#endif // PULSEVIEW_PV_VIEW_TRACE_H