View: Fully integrate the "zero trigger time" setting

diff --git a/pv/views/trace/view.cpp b/pv/views/trace/view.cpp
index 00a1c23968c0eb255b2f2b4a9957ce63242569e2..35b6807dfc75c11ba825831c1552ee17fe490f5a 100644 (file)
--- a/pv/views/trace/view.cpp
+++ b/pv/views/trace/view.cpp
@@ -79,6 +79,7 @@ using std::make_pair;
 using std::make_shared;
 using std::min;
 using std::pair;
 using std::make_shared;
 using std::min;
 using std::pair;

+using std::placeholders::_1;

 using std::set;
 using std::set_difference;
 using std::shared_ptr;
 using std::set;
 using std::set_difference;
 using std::shared_ptr;


@@ -198,6 +199,9 @@ View::View(Session &session, bool is_main_view, QWidget *parent) :
        GlobalSettings settings;
        coloured_bg_ = settings.value(GlobalSettings::Key_View_ColouredBG).toBool();
 
        GlobalSettings settings;
        coloured_bg_ = settings.value(GlobalSettings::Key_View_ColouredBG).toBool();
 

+       GlobalSettings::register_change_handler(GlobalSettings::Key_View_TriggerIsZeroTime,
+               bind(&View::on_settingViewTriggerIsZeroTime_changed, this, _1));
+

        connect(scrollarea_->horizontalScrollBar(), SIGNAL(valueChanged(int)),
                this, SLOT(h_scroll_value_changed(int)));
        connect(scrollarea_->verticalScrollBar(), SIGNAL(valueChanged(int)),
        connect(scrollarea_->horizontalScrollBar(), SIGNAL(valueChanged(int)),
                this, SLOT(h_scroll_value_changed(int)));
        connect(scrollarea_->verticalScrollBar(), SIGNAL(valueChanged(int)),


@@ -432,27 +436,43 @@ void View::set_scale(double scale)
        }
 }
 
        }
 }
 

-void View::set_offset(const pv::util::Timestamp& offset)
+void View::set_offset(const pv::util::Timestamp& offset, bool force_update)

 {
 {

-       if (offset_ != offset) {
+       if ((offset_ != offset) || force_update) {

                offset_ = offset;
                ruler_offset_ = offset_ + ruler_shift_;
                offset_changed();
        }
 }
 
                offset_ = offset;
                ruler_offset_ = offset_ + ruler_shift_;
                offset_changed();
        }
 }
 

-// Returns the internal version of the time offset

 const Timestamp& View::offset() const
 {
        return offset_;
 }
 
 const Timestamp& View::offset() const
 {
        return offset_;
 }
 

-// Returns the ruler version of the time offset

 const Timestamp& View::ruler_offset() const
 {
        return ruler_offset_;
 }
 
 const Timestamp& View::ruler_offset() const
 {
        return ruler_offset_;
 }
 

+void View::set_zero_position(pv::util::Timestamp& position)
+{
+       ruler_shift_ = -position;
+
+       // Force an immediate update of the offsets
+       set_offset(offset_, true);
+       ruler_->update();
+}
+
+void View::reset_zero_position()
+{
+       ruler_shift_ = 0;
+
+       // Force an immediate update of the offsets
+       set_offset(offset_, true);
+       ruler_->update();
+}
+

 int View::owner_visual_v_offset() const
 {
        return -scrollarea_->verticalScrollBar()->sliderPosition();
 int View::owner_visual_v_offset() const
 {
        return -scrollarea_->verticalScrollBar()->sliderPosition();


@@ -541,10 +561,19 @@ void View::set_current_segment(uint32_t segment_id)
        for (shared_ptr<DecodeTrace> dt : decode_traces_)
                dt->set_current_segment(current_segment_);
 
        for (shared_ptr<DecodeTrace> dt : decode_traces_)
                dt->set_current_segment(current_segment_);
 

+       vector<util::Timestamp> triggers = session_.get_triggers(current_segment_);
+

        trigger_markers_.clear();
        trigger_markers_.clear();

-       for (util::Timestamp timestamp : session_.get_triggers(segment_id))
+       for (util::Timestamp timestamp : triggers)

                trigger_markers_.push_back(make_shared<TriggerMarker>(*this, timestamp));
 
                trigger_markers_.push_back(make_shared<TriggerMarker>(*this, timestamp));
 

+       // When enabled, the first trigger for this segment is used as the zero position
+       GlobalSettings settings;
+       bool trigger_is_zero_time = settings.value(GlobalSettings::Key_View_TriggerIsZeroTime).toBool();
+
+       if (trigger_is_zero_time && (triggers.size() > 0))
+               set_zero_position(triggers.front());
+

        viewport_->update();
 
        segment_changed(segment_id);
        viewport_->update();
 
        segment_changed(segment_id);


@@ -838,14 +867,15 @@ void View::trigger_event(int segment_id, util::Timestamp location)
        if ((uint32_t)segment_id != current_segment_)
                return;
 
        if ((uint32_t)segment_id != current_segment_)
                return;
 

-       // Set up ruler_shift if the Key_View_TriggerIsZeroTime option is set.
+       // Set zero location if the Key_View_TriggerIsZeroTime setting is set and
+       // if this is the first trigger for this segment.

        GlobalSettings settings;
        bool trigger_is_zero_time = settings.value(GlobalSettings::Key_View_TriggerIsZeroTime).toBool();
 
        GlobalSettings settings;
        bool trigger_is_zero_time = settings.value(GlobalSettings::Key_View_TriggerIsZeroTime).toBool();
 

-       ruler_shift_ = (trigger_is_zero_time) ? (-location) : (0);
-       // Force an immediate update of both offsets
-       offset_ -= 0.001;
-       set_offset(offset_ + 0.001);
+       size_t trigger_count = session_.get_triggers(current_segment_).size();
+
+       if (trigger_is_zero_time && trigger_count == 1)
+               set_zero_position(location);

 
        trigger_markers_.push_back(make_shared<TriggerMarker>(*this, location));
 }
 
        trigger_markers_.push_back(make_shared<TriggerMarker>(*this, location));
 }


@@ -1563,6 +1593,17 @@ void View::on_segment_changed(int segment)
        }
 }
 
        }
 }
 

+void View::on_settingViewTriggerIsZeroTime_changed(const QVariant new_value)
+{
+       if (new_value.toBool()) {
+               // The first trigger for this segment is used as the zero position
+               vector<util::Timestamp> triggers = session_.get_triggers(current_segment_);
+               if (triggers.size() > 0)
+                       set_zero_position(triggers.front());
+       } else
+               reset_zero_position();
+}
+

 void View::perform_delayed_view_update()
 {
        if (always_zoom_to_fit_) {
 void View::perform_delayed_view_update()
 {
        if (always_zoom_to_fit_) {

diff --git a/pv/views/trace/view.hpp b/pv/views/trace/view.hpp
index fb097b01cfb604fb9893d4d50390ca7b64e5100f..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;
 
         */
        const pv::util::Timestamp& ruler_offset() const;
 

+       void set_zero_position(pv::util::Timestamp& position);
+
+       void reset_zero_position();
+

        /**
         * Returns the vertical scroll offset.
         */
        /**
         * Returns the vertical scroll offset.
         */


@@ -403,6 +407,8 @@ private Q_SLOTS:
        void on_segment_completed(int new_segment_id);
        void on_segment_changed(int segment);
 
        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();
        virtual void perform_delayed_view_update();
 
        void process_sticky_events();


@@ -411,7 +417,7 @@ private Q_SLOTS:
         * Sets the 'offset_' and ruler_offset_ members and emits the 'offset_changed'
         * signal if needed.
         */
         * 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'
 
        /**
         * Sets the 'scale_' member and emits the 'scale_changed'