Make member variable underscores a suffix instead of a prefix

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

diff --git a/pv/view/decodetrace.h b/pv/view/decodetrace.h
index 9e0faace5847294090f617b6ffbdd26f80200e9e..9704f69a0d4b73e44ac94b7b1a151220ca67ad95 100644 (file)
--- a/pv/view/decodetrace.h
+++ b/pv/view/decodetrace.h
@@ -64,9 +64,9 @@ class DecodeTrace : public Trace
 private:
        struct ChannelSelector
        {
-               const QComboBox *_combo;
-               const std::shared_ptr<pv::data::decode::Decoder> _decoder;
-               const srd_channel *_pdch;
+               const QComboBox *combo_;
+               const std::shared_ptr<pv::data::decode::Decoder> decoder_;
+               const srd_channel *pdch_;
        };
 
 private:
@@ -90,7 +90,11 @@ public:
 
        const std::shared_ptr<pv::data::DecoderStack>& decoder() const;
 
-       void set_view(pv::view::View *view);
+       /**
+        * Computes the vertical extents of the contents of this row item.
+        * @return A pair containing the minimum and maximum y-values.
+        */
+       std::pair<int, int> v_extents() const;
 
        /**
         * Paints the background layer of the trace with a QPainter
@@ -141,9 +145,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.
@@ -154,18 +156,12 @@ private:
         */
        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();
+       int get_row_at_point(const QPoint &point);
 
-       void show_hover_annotation();
+       const QString get_annotation_at_point(const QPoint &point);
 
        void hide_hover_annotation();
 
-       void hover_point_changed();
-
        void create_decoder_form(int index,
                std::shared_ptr<pv::data::decode::Decoder> &dec,
                QWidget *parent, QFormLayout *form);
@@ -179,6 +175,9 @@ private:
 
        void commit_channels();
 
+public:
+       void hover_point_changed();
+
 private Q_SLOTS:
        void on_new_decode_data();
 
@@ -193,21 +192,21 @@ private Q_SLOTS:
        void on_show_hide_decoder(int index);
 
 private:
-       pv::SigSession &_session;
-       std::shared_ptr<pv::data::DecoderStack> _decoder_stack;
+       pv::SigSession &session_;
+       std::shared_ptr<pv::data::DecoderStack> decoder_stack_;
 
-       uint64_t _decode_start, _decode_end;
+       uint64_t decode_start_, decode_end_;
 
        std::list< std::shared_ptr<pv::prop::binding::DecoderOptions> >
-               _bindings;
+               bindings_;
 
-       std::list<ChannelSelector> _channel_selectors;
-       std::vector<pv::widgets::DecoderGroupBox*> _decoder_forms;
+       std::list<ChannelSelector> channel_selectors_;
+       std::vector<pv::widgets::DecoderGroupBox*> decoder_forms_;
 
-       std::vector<data::decode::Row> _visible_rows;
-       int _text_height, _row_height;
+       std::vector<data::decode::Row> visible_rows_;
+       int text_height_, row_height_;
 
-       QSignalMapper _delete_mapper, _show_hide_mapper;
+       QSignalMapper delete_mapper_, show_hide_mapper_;
 };
 
 } // namespace view