Fix various typos in code comments.

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

diff --git a/pv/view/view.hpp b/pv/view/view.hpp
index 90a9b877cb04b164d5bedd8d19f1c244fd1cc848..25d1dbf78b1b8afb2134d0ceb3aec2f7759b1ea2 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:
@@ -133,7 +134,7 @@ public:
        /**
         * Returns period of the graticule time markings.
         */
-       double tick_period() const;
+       const pv::util::Timestamp& tick_period() const;
 
        /**
         * Returns the unit of time currently used.
@@ -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.
         */
@@ -209,7 +216,7 @@ public:
 
        void update_viewport();
 
-       void restack_all_row_items();
+       void restack_all_trace_tree_items();
 
 Q_SIGNALS:
        void hover_point_changed();
@@ -238,6 +245,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;
 
@@ -260,7 +270,7 @@ private:
        void update_layout();
 
        /**
-        * Satisifies RowItem functionality.
+        * Satisfies TraceTreeItem 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.
@@ -274,7 +284,7 @@ private:
         */
        QRectF label_rect(const QRectF &rect);
 
-       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 +300,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);
@@ -343,7 +353,7 @@ private Q_SLOTS:
         * Sets the 'tick_period_' member and emits the 'tick_period_changed'
         * signal if needed.
         */
-       void set_tick_period(double tick_period);
+       void set_tick_period(const pv::util::Timestamp& tick_period);
 
        /**
         * Sets the 'time_unit' member and emits the 'time_unit_changed'
@@ -369,7 +379,7 @@ private:
        bool always_zoom_to_fit_;
        QTimer delayed_view_updater_;
 
-       double tick_period_;
+       pv::util::Timestamp tick_period_;
        pv::util::SIPrefix tick_prefix_;
        unsigned int tick_precision_;
        util::TimeUnit time_unit_;
@@ -380,6 +390,8 @@ 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_;