Provide a settings checkbox for showing zero at the trigger

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

diff --git a/pv/views/trace/view.hpp b/pv/views/trace/view.hpp
index da05691f42f5274b8c8fd86d54ffeccd80230927..28c94e5285d1dfc6cc21c06daa618138f3723bc8 100644 (file)
--- a/pv/views/trace/view.hpp
+++ b/pv/views/trace/view.hpp
@@ -151,11 +151,17 @@ public:
        double scale() const;
 
        /**
-        * Returns the time offset of the left edge of the view in
-        * seconds.
+        * Returns the internal view version of the time offset of the left edge
+        * of the view in seconds.
         */
        const pv::util::Timestamp& offset() const;
 
+       /**
+        * Returns the ruler version of the time offset of the left edge
+        * of the view in seconds.
+        */
+       const pv::util::Timestamp& ruler_offset() const;
+
        /**
         * Returns the vertical scroll offset.
         */
@@ -191,12 +197,18 @@ public:
         */
        unsigned int depth() const;
 
+       /**
+        * Returns the currently displayed segment, starting at 0.
+        */
+       uint32_t current_segment() const;
+
        /**
         * Returns whether the currently shown segment can be influenced
         * (selected) or not.
         */
        bool segment_is_selectable() const;
 
+       Trace::SegmentDisplayMode segment_display_mode() const;
        void set_segment_display_mode(Trace::SegmentDisplayMode mode);
 
        void zoom(double steps);
@@ -308,7 +320,8 @@ Q_SIGNALS:
        void segment_changed(int segment_id);
 
        /// Emitted when the multi-segment display mode changed
-       void segment_display_mode_changed(bool segment_selectable);
+       /// @param mode is a value of Trace::SegmentDisplayMode
+       void segment_display_mode_changed(int mode, bool segment_selectable);
 
 public Q_SLOTS:
        void trigger_event(util::Timestamp location);
@@ -382,6 +395,7 @@ private Q_SLOTS:
        void capture_state_updated(int state);
 
        void on_new_segment(int new_segment_id);
+       void on_segment_completed(int new_segment_id);
        void on_segment_changed(int segment);
 
        virtual void perform_delayed_view_update();
@@ -389,7 +403,7 @@ private Q_SLOTS:
        void process_sticky_events();
 
        /**
-        * Sets the 'offset_' member and emits the 'offset_changed'
+        * Sets the 'offset_' and ruler_offset_ members and emits the 'offset_changed'
         * signal if needed.
         */
        void set_offset(const pv::util::Timestamp& offset);
@@ -424,6 +438,11 @@ private Q_SLOTS:
         */
        void set_time_unit(pv::util::TimeUnit time_unit);
 
+       /**
+        * Sets the current segment with the first segment starting at 0.
+        */
+       void set_current_segment(uint32_t segment_id);
+
 private:
        CustomScrollArea *scrollarea_;
        Viewport *viewport_;
@@ -437,8 +456,6 @@ private:
        vector< shared_ptr<DecodeTrace> > decode_traces_;
 #endif
 
-       /// The ID of the currently displayed segment
-       int current_segment_;
        Trace::SegmentDisplayMode segment_display_mode_;
 
        /// Signals whether the user can change the currently shown segment.
@@ -447,8 +464,10 @@ private:
        /// The view time scale in seconds per pixel.
        double scale_;
 
-       /// The view time offset in seconds.
+       /// The internal view version of the time offset in seconds.
        pv::util::Timestamp offset_;
+       /// The ruler version of the time offset in seconds.
+       pv::util::Timestamp ruler_offset_;
 
        bool updating_scroll_;
        bool settings_restored_;