DecodeTrace: Removed set_view

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

diff --git a/pv/view/decodetrace.h b/pv/view/decodetrace.h
index e172cf8fb1999b9b81420f583d9284745d85a8c3..ab495fa06f156ff5763d2896db2a215c0a8e1202 100644 (file)
--- a/pv/view/decodetrace.h
+++ b/pv/view/decodetrace.h
@@ -30,6 +30,7 @@
 #include <QSignalMapper>
 
 #include <pv/prop/binding/decoderoptions.h>
+#include <pv/data/decode/row.h>
 
 struct srd_channel;
 struct srd_decoder;
@@ -89,8 +90,6 @@ public:
 
        const std::shared_ptr<pv::data::DecoderStack>& decoder() const;
 
-       void set_view(pv::view::View *view);
-
        /**
         * Paints the background layer of the trace with a QPainter
         * @param p the QPainter to paint into.
@@ -140,9 +139,7 @@ private:
        void draw_unresolved_period(QPainter &p, int h, int left,
                int right) const;
 
-       double get_pixels_offset() const;
-
-       double get_samples_per_pixel() const;
+       std::pair<double, double> get_pixels_offset_samples_per_pixel() const;
 
        /**
         * Determines the start and end sample for a given pixel range.
@@ -153,7 +150,11 @@ private:
         */
        std::pair<uint64_t, uint64_t> get_sample_range(int x_start, int x_end) const;
 
-       void hover_point_changed();
+       int get_row_at_point(const QPoint &point);
+
+       const QString get_annotation_at_point(const QPoint &point);
+
+       void hide_hover_annotation();
 
        void create_decoder_form(int index,
                std::shared_ptr<pv::data::decode::Decoder> &dec,
@@ -168,6 +169,9 @@ private:
 
        void commit_channels();
 
+public:
+       void hover_point_changed();
+
 private Q_SLOTS:
        void on_new_decode_data();
 
@@ -193,7 +197,7 @@ private:
        std::list<ChannelSelector> _channel_selectors;
        std::vector<pv::widgets::DecoderGroupBox*> _decoder_forms;
 
-       std::vector<QString> _cur_row_headings;
+       std::vector<data::decode::Row> _visible_rows;
        int _text_height, _row_height;
 
        QSignalMapper _delete_mapper, _show_hide_mapper;