Make member variable underscores a suffix instead of a prefix

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

diff --git a/pv/view/view.h b/pv/view/view.h
index 07bd5d9caeade08c0f75b90da5003c423f8dde7a..dec317ccf9a4f2000cd2ec2406f42998965dd936 100644 (file)
--- a/pv/view/view.h
+++ b/pv/view/view.h
@@ -25,10 +25,12 @@
 
 #include <memory>
 #include <set>
+#include <unordered_map>
 #include <vector>
 
 #include <QAbstractScrollArea>
 #include <QSizeF>
+#include <QTimer>
 
 #include <pv/data/signaldata.h>
 
@@ -49,6 +51,12 @@ class Viewport;
 class View : public QAbstractScrollArea, public RowItemOwner {
        Q_OBJECT
 
+private:
+       enum StickyEvents {
+               SelectableItemHExtentsChanged = 1,
+               SelectableItemVExtentsChanged = 2
+       };
+
 private:
        static const double MaxScale;
        static const double MinScale;
@@ -90,7 +98,12 @@ public:
         * seconds.
         */
        double offset() const;
-       int owner_v_offset() const;
+       int owner_visual_v_offset() const;
+
+       /**
+        * Returns the number of nested parents that this row item owner has.
+        */
+       unsigned int depth() const;
 
        void zoom(double steps);
        void zoom(double steps, int offset);
@@ -140,6 +153,8 @@ public:
 
        void update_viewport();
 
+       void restack_all_row_items();
+
 Q_SIGNALS:
        void hover_point_changed();
 
@@ -181,6 +196,17 @@ private:
         */
        QRectF label_rect(int right);
 
+       static bool add_channels_to_owner(
+               const std::vector< std::shared_ptr<sigrok::Channel> > &channels,
+               RowItemOwner *owner, int &offset,
+               std::unordered_map<std::shared_ptr<sigrok::Channel>,
+                       std::shared_ptr<Signal> > &signal_map,
+               std::function<bool (std::shared_ptr<RowItem>)> filter_func =
+                       std::function<bool (std::shared_ptr<RowItem>)>());
+
+       static void apply_offset(
+               std::shared_ptr<RowItem> row_item, int &offset);
+
 private:
        bool eventFilter(QObject *object, QEvent *event);
 
@@ -188,6 +214,11 @@ private:
 
        void resizeEvent(QResizeEvent *e);
 
+public:
+       void appearance_changed(bool label, bool content);
+
+       void extents_changed(bool horz, bool vert);
+
 private Q_SLOTS:
 
        void h_scroll_value_changed(int value);
@@ -200,31 +231,34 @@ private Q_SLOTS:
 
        void on_signals_moved();
 
-       void on_geometry_updated();
+       void process_sticky_events();
 
        void on_hover_point_changed();
 
 private:
-       SigSession &_session;
+       SigSession &session_;
 
-       Viewport *_viewport;
-       Ruler *_ruler;
-       CursorHeader *_cursorheader;
-       Header *_header;
+       Viewport *viewport_;
+       Ruler *ruler_;
+       CursorHeader *cursorheader_;
+       Header *header_;
 
        /// The view time scale in seconds per pixel.
-       double _scale;
+       double scale_;
 
        /// The view time offset in seconds.
-       double _offset;
+       double offset_;
+
+       int v_offset_;
+       bool updating_scroll_;
 
-       int _v_offset;
-       bool _updating_scroll;
+       bool show_cursors_;
+       CursorPair cursors_;
 
-       bool _show_cursors;
-       CursorPair _cursors;
+       QPoint hover_point_;
 
-       QPoint _hover_point;
+       unsigned int sticky_events_;
+       QTimer lazy_event_handler_;
 };
 
 } // namespace view