View: Remove unnecessary methods

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

diff --git a/pv/view/view.hpp b/pv/view/view.hpp
index 5f81d443c8f53e08353e91d13b9534b7a6805dd7..a3610b74114246e7d94aae69859c7f805275cd85 100644 (file)
--- a/pv/view/view.hpp
+++ b/pv/view/view.hpp
@@ -38,7 +38,7 @@
 
 #include "cursorpair.hpp"
 #include "flag.hpp"
-#include "rowitemowner.hpp"
+#include "tracetreeitemowner.hpp"
 
 namespace sigrok {
 class ChannelGroup;
@@ -55,14 +55,15 @@ class Header;
 class Ruler;
 class Trace;
 class Viewport;
+class TriggerMarker;
 
-class View : public QAbstractScrollArea, public RowItemOwner {
+class View : public QAbstractScrollArea, public TraceTreeItemOwner {
        Q_OBJECT
 
 private:
        enum StickyEvents {
-               RowItemHExtentsChanged = 1,
-               RowItemVExtentsChanged = 2
+               TraceTreeItemHExtentsChanged = 1,
+               TraceTreeItemVExtentsChanged = 2
        };
 
 private:
@@ -170,6 +171,12 @@ public:
         */
        void enable_sticky_scrolling(bool state);
 
+       /**
+        * Enables or disables coloured trace backgrounds. If they're not
+        * coloured then they will use alternating colors.
+        */
+       void enable_coloured_bg(bool state);
+
        /**
         * Returns true if cursors are displayed. false otherwise.
         */
@@ -207,9 +214,7 @@ public:
 
        const QPoint& hover_point() const;
 
-       void update_viewport();
-
-       void restack_all_row_items();
+       void restack_all_trace_tree_items();
 
 Q_SIGNALS:
        void hover_point_changed();
@@ -238,6 +243,9 @@ Q_SIGNALS:
        /// Emitted when the time_unit changed.
        void time_unit_changed();
 
+public Q_SLOTS:
+       void trigger_event(util::Timestamp location);
+
 private:
        void get_scroll_layout(double &length, pv::util::Timestamp &offset) const;
 
@@ -257,24 +265,13 @@ private:
 
        void update_scroll();
 
-       void update_layout();
+       void reset_scroll();
 
-       /**
-        * Satisifies RowItem functionality.
-        * @param p the QPainter to paint into.
-        * @param rect the rectangle of the header area.
-        * @param hover true if the label is being hovered over by the mouse.
-        */
-       void paint_label(QPainter &p, const QRect &rect, bool hover);
+       void set_scroll_default();
 
-       /**
-        * Computes the outline rectangle of a label.
-        * @param rect the rectangle of the header area.
-        * @return Returns the rectangle of the signal label.
-        */
-       QRectF label_rect(const QRectF &rect);
+       void update_layout();
 
-       RowItemOwner* find_prevalent_trace_group(
+       TraceTreeItemOwner* find_prevalent_trace_group(
                const std::shared_ptr<sigrok::ChannelGroup> &group,
                const std::unordered_map<std::shared_ptr<sigrok::Channel>,
                        std::shared_ptr<Signal> > &signal_map);
@@ -290,9 +287,9 @@ private:
 
        bool eventFilter(QObject *object, QEvent *event);
 
-       bool viewportEvent(QEvent *e);
+       bool viewportEvent(QEvent *event);
 
-       void resizeEvent(QResizeEvent *e);
+       void resizeEvent(QResizeEvent *event);
 
 public:
        void row_item_appearance_changed(bool label, bool content);
@@ -380,10 +377,15 @@ private:
        std::list< std::shared_ptr<Flag> > flags_;
        char next_flag_text_;
 
+       std::vector< std::shared_ptr<TriggerMarker> > trigger_markers_;
+
        QPoint hover_point_;
 
        unsigned int sticky_events_;
        QTimer lazy_event_handler_;
+
+       // This is true when the defaults couldn't be set due to insufficient info
+       bool scroll_needs_defaults;
 };
 
 } // namespace view