Rename create_context_menu() to create_header_context_menu()

[pulseview.git] / pv / views / trace / decodetrace.hpp

diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp
index 00fe7f424cc5a12bcaf2bdc78a2a0dc7a689f23c..4d9e59c162b7484d2c748dbfb2afd492f5f7be25 100644 (file)
--- a/pv/views/trace/decodetrace.hpp
+++ b/pv/views/trace/decodetrace.hpp
@@ -33,6 +33,7 @@
 #include <QTimer>
 
 #include <pv/binding/decoder.hpp>
+#include <pv/data/decode/annotation.hpp>
 #include <pv/data/decode/row.hpp>
 #include <pv/data/signalbase.hpp>
 
@@ -117,7 +118,7 @@ public:
 
        void populate_popup_form(QWidget *parent, QFormLayout *form);
 
-       QMenu* create_context_menu(QWidget *parent);
+       QMenu* create_header_context_menu(QWidget *parent);
 
        void delete_pressed();
 
@@ -130,14 +131,15 @@ private:
                int h, const ViewItemPaintParams &pp, int y,
                QColor row_color, int row_title_width) const;
 
-       void draw_annotation_block(vector<pv::data::decode::Annotation> annotations,
+       void draw_annotation_block(qreal start, qreal end,
+               pv::data::decode::Annotation::Class ann_class, bool use_ann_format,
                QPainter &p, int h, int y, QColor row_color) const;
 
        void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
-               int h, double x, int y) const;
+               int h, qreal x, int y) const;
 
        void draw_range(const pv::data::decode::Annotation &a, QPainter &p,
-               int h, double start, double end, int y, const ViewItemPaintParams &pp,
+               int h, qreal start, qreal end, int y, const ViewItemPaintParams &pp,
                int row_title_width) const;
 
        void draw_error(QPainter &p, const QString &message,
@@ -174,7 +176,7 @@ private:
                const data::DecodeChannel *ch);
 
 public:
-       void hover_point_changed(const QPoint &hp);
+       virtual void hover_point_changed(const QPoint &hp);
 
 private Q_SLOTS:
        void on_new_annotations();