View: Fully integrate the "zero trigger time" setting

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

diff --git a/pv/views/trace/view.hpp b/pv/views/trace/view.hpp
index 28c94e5285d1dfc6cc21c06daa618138f3723bc8..9529e7a3fee25a3c057a76c5c1c76a5ebc0c4d08 100644 (file)
--- a/pv/views/trace/view.hpp
+++ b/pv/views/trace/view.hpp
@@ -162,6 +162,10 @@ public:
         */
        const pv::util::Timestamp& ruler_offset() const;
 
+       void set_zero_position(pv::util::Timestamp& position);
+
+       void reset_zero_position();
+
        /**
         * Returns the vertical scroll offset.
         */
@@ -187,6 +191,11 @@ public:
         */
        const pv::util::Timestamp& tick_period() const;
 
+       /**
+        * Returns number of minor division ticks per time marking.
+        */
+       unsigned int minor_tick_count() const;
+
        /**
         * Returns the unit of time currently used.
         */
@@ -324,7 +333,7 @@ Q_SIGNALS:
        void segment_display_mode_changed(int mode, bool segment_selectable);
 
 public Q_SLOTS:
-       void trigger_event(util::Timestamp location);
+       void trigger_event(int segment_id, util::Timestamp location);
 
 private:
        void get_scroll_layout(double &length, pv::util::Timestamp &offset) const;
@@ -398,6 +407,8 @@ private Q_SLOTS:
        void on_segment_completed(int new_segment_id);
        void on_segment_changed(int segment);
 
+       void on_settingViewTriggerIsZeroTime_changed(const QVariant new_value);
+
        virtual void perform_delayed_view_update();
 
        void process_sticky_events();
@@ -406,7 +417,7 @@ private Q_SLOTS:
         * Sets the 'offset_' and ruler_offset_ members and emits the 'offset_changed'
         * signal if needed.
         */
-       void set_offset(const pv::util::Timestamp& offset);
+       void set_offset(const pv::util::Timestamp& offset, bool force_update = false);
 
        /**
         * Sets the 'scale_' member and emits the 'scale_changed'
@@ -479,6 +490,7 @@ private:
 
        pv::util::Timestamp tick_period_;
        pv::util::SIPrefix tick_prefix_;
+       unsigned int minor_tick_count_;
        unsigned int tick_precision_;
        util::TimeUnit time_unit_;