Fix bug #477 by keeping track of visible rows, not just titles

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

diff --git a/pv/view/decodetrace.h b/pv/view/decodetrace.h
index 9a991fcb436c63596fb3c2d3cedd9fff4b7a3aa3..9e0faace5847294090f617b6ffbdd26f80200e9e 100644 (file)
--- a/pv/view/decodetrace.h
+++ b/pv/view/decodetrace.h
@@ -25,12 +25,12 @@
 
 #include <list>
 #include <map>
+#include <memory>
 
 #include <QSignalMapper>
 
-#include <boost/shared_ptr.hpp>
-
 #include <pv/prop/binding/decoderoptions.h>
+#include <pv/data/decode/row.h>
 
 struct srd_channel;
 struct srd_decoder;
@@ -62,10 +62,10 @@ class DecodeTrace : public Trace
        Q_OBJECT
 
 private:
-       struct ProbeSelector
+       struct ChannelSelector
        {
                const QComboBox *_combo;
-               const boost::shared_ptr<pv::data::decode::Decoder> _decoder;
+               const std::shared_ptr<pv::data::decode::Decoder> _decoder;
                const srd_channel *_pdch;
        };
 
@@ -83,12 +83,12 @@ private:
 
 public:
        DecodeTrace(pv::SigSession &session,
-               boost::shared_ptr<pv::data::DecoderStack> decoder_stack,
+               std::shared_ptr<pv::data::DecoderStack> decoder_stack,
                int index);
 
        bool enabled() const;
 
-       const boost::shared_ptr<pv::data::DecoderStack>& decoder() const;
+       const std::shared_ptr<pv::data::DecoderStack>& decoder() const;
 
        void set_view(pv::view::View *view);
 
@@ -124,8 +124,7 @@ public:
 
 private:
        void draw_annotation(const pv::data::decode::Annotation &a, QPainter &p,
-               QColor text_colour, int text_height, int left, int right,
-               double samples_per_pixel, double pixels_offset, int y,
+               QColor text_colour, int text_height, int left, int right, int y,
                size_t base_colour) const;
 
        void draw_instant(const pv::data::decode::Annotation &a, QPainter &p,
@@ -140,27 +139,52 @@ private:
                int left, int right);
 
        void draw_unresolved_period(QPainter &p, int h, int left,
-               int right, double samples_per_pixel, double pixels_offset);
+               int right) const;
+
+       double get_pixels_offset() const;
+
+       double get_samples_per_pixel() const;
+
+       /**
+        * Determines the start and end sample for a given pixel range.
+        * @param x_start the X coordinate of the start sample in the view
+        * @param x_end the X coordinate of the end sample in the view
+        * @return Returns a pair containing the start sample and the end
+        *      sample that correspond to the start and end coordinates.
+        */
+       std::pair<uint64_t, uint64_t> get_sample_range(int x_start, int x_end) const;
+
+       bool hover_point_is_over_trace();
+
+       int get_row_at_hover_point();
+
+       const QString get_annotation_at_hover_point();
+
+       void show_hover_annotation();
+
+       void hide_hover_annotation();
+
+       void hover_point_changed();
 
        void create_decoder_form(int index,
-               boost::shared_ptr<pv::data::decode::Decoder> &dec,
+               std::shared_ptr<pv::data::decode::Decoder> &dec,
                QWidget *parent, QFormLayout *form);
 
-       QComboBox* create_probe_selector(QWidget *parent,
-               const boost::shared_ptr<pv::data::decode::Decoder> &dec,
+       QComboBox* create_channel_selector(QWidget *parent,
+               const std::shared_ptr<pv::data::decode::Decoder> &dec,
                const srd_channel *const pdch);
 
-       void commit_decoder_probes(
-               boost::shared_ptr<data::decode::Decoder> &dec);
+       void commit_decoder_channels(
+               std::shared_ptr<data::decode::Decoder> &dec);
 
-       void commit_probes();
+       void commit_channels();
 
-private slots:
+private Q_SLOTS:
        void on_new_decode_data();
 
        void on_delete();
 
-       void on_probe_selected(int);
+       void on_channel_selected(int);
 
        void on_stack_decoder(srd_decoder *decoder);
 
@@ -170,17 +194,18 @@ private slots:
 
 private:
        pv::SigSession &_session;
-       boost::shared_ptr<pv::data::DecoderStack> _decoder_stack;
+       std::shared_ptr<pv::data::DecoderStack> _decoder_stack;
 
        uint64_t _decode_start, _decode_end;
 
-       std::list< boost::shared_ptr<pv::prop::binding::DecoderOptions> >
+       std::list< std::shared_ptr<pv::prop::binding::DecoderOptions> >
                _bindings;
 
-       std::list<ProbeSelector> _probe_selectors;
+       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;
 };