Trace View: Move ruler time conversion from View to Ruler

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

diff --git a/pv/views/trace/view.cpp b/pv/views/trace/view.cpp
index f1d7aa3dfca872a29bc81f5c0c2c444e4a34e03e..4b95a806a490cf492ad33cb6e2b537b5f8744165 100644 (file)
--- a/pv/views/trace/view.cpp
+++ b/pv/views/trace/view.cpp
@@ -362,12 +362,6 @@ void View::save_settings(QSettings &settings) const
        settings.setValue("splitter_state", splitter_->saveState());
        settings.setValue("segment_display_mode", segment_display_mode_);
 
        settings.setValue("splitter_state", splitter_->saveState());
        settings.setValue("segment_display_mode", segment_display_mode_);
 

-       {
-               stringstream ss;
-               boost::archive::text_oarchive oa(ss);
-               oa << boost::serialization::make_nvp("ruler_shift", ruler_shift_);
-               settings.setValue("ruler_shift", QString::fromStdString(ss.str()));
-       }

        {
                stringstream ss;
                boost::archive::text_oarchive oa(ss);
        {
                stringstream ss;
                boost::archive::text_oarchive oa(ss);


@@ -390,20 +384,6 @@ void View::restore_settings(QSettings &settings)
        if (settings.contains("scale"))
                set_scale(settings.value("scale").toDouble());
 
        if (settings.contains("scale"))
                set_scale(settings.value("scale").toDouble());
 

-       if (settings.contains("ruler_shift")) {
-               util::Timestamp shift;
-               stringstream ss;
-               ss << settings.value("ruler_shift").toString().toStdString();
-
-               try {
-                       boost::archive::text_iarchive ia(ss);
-                       ia >> boost::serialization::make_nvp("ruler_shift", shift);
-                       ruler_shift_ = shift;
-               } catch (boost::archive::archive_exception&) {
-                       qDebug() << "Could not restore the view ruler shift";
-               }
-       }
-

        if (settings.contains("offset")) {
                util::Timestamp offset;
                stringstream ss;
        if (settings.contains("offset")) {
                util::Timestamp offset;
                stringstream ss;


@@ -480,7 +460,7 @@ void View::set_offset(const pv::util::Timestamp& offset, bool force_update)
 {
        if ((offset_ != offset) || force_update) {
                offset_ = offset;
 {
        if ((offset_ != offset) || force_update) {
                offset_ = offset;

-               ruler_offset_ = offset_ + ruler_shift_;
+               ruler_offset_ = offset_ + zero_offset_;

                offset_changed();
        }
 }
                offset_changed();
        }
 }


@@ -495,9 +475,9 @@ const Timestamp& View::ruler_offset() const
        return ruler_offset_;
 }
 
        return ruler_offset_;
 }
 

-void View::set_zero_position(pv::util::Timestamp& position)
+void View::set_zero_position(const pv::util::Timestamp& position)

 {
 {

-       ruler_shift_ = -position;
+       zero_offset_ = -position;

 
        // Force an immediate update of the offsets
        set_offset(offset_, true);
 
        // Force an immediate update of the offsets
        set_offset(offset_, true);


@@ -506,13 +486,18 @@ void View::set_zero_position(pv::util::Timestamp& position)
 
 void View::reset_zero_position()
 {
 
 void View::reset_zero_position()
 {

-       ruler_shift_ = 0;
+       zero_offset_ = 0;

 
        // Force an immediate update of the offsets
        set_offset(offset_, true);
        ruler_->update();
 }
 
 
        // Force an immediate update of the offsets
        set_offset(offset_, true);
        ruler_->update();
 }
 

+pv::util::Timestamp View::zero_offset() const
+{
+       return zero_offset_;
+}
+

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


@@ -810,22 +795,36 @@ bool View::cursors_shown() const
 
 void View::show_cursors(bool show)
 {
 
 void View::show_cursors(bool show)
 {

-       show_cursors_ = show;
-       cursor_state_changed(show);
+       if (show_cursors_ != show) {
+               show_cursors_ = show;
+
+               cursor_state_changed(show);
+               ruler_->update();
+               viewport_->update();
+       }
+}
+
+void View::set_cursors(pv::util::Timestamp& first, pv::util::Timestamp& second)
+{
+       assert(cursors_);
+
+       cursors_->first()->set_time(first);
+       cursors_->second()->set_time(second);
+

        ruler_->update();
        viewport_->update();
 }
 
 void View::centre_cursors()
 {
        ruler_->update();
        viewport_->update();
 }
 
 void View::centre_cursors()
 {

-       if (cursors_) {
-               const double time_width = scale_ * viewport_->width();
-               cursors_->first()->set_time(offset_ + time_width * 0.4);
-               cursors_->second()->set_time(offset_ + time_width * 0.6);
+       assert(cursors_);

 
 

-               ruler_->update();
-               viewport_->update();
-       }
+       const double time_width = scale_ * viewport_->width();
+       cursors_->first()->set_time(offset_ + time_width * 0.4);
+       cursors_->second()->set_time(offset_ + time_width * 0.6);
+
+       ruler_->update();
+       viewport_->update();

 }
 
 shared_ptr<CursorPair> View::cursors() const
 }
 
 shared_ptr<CursorPair> View::cursors() const


@@ -1215,7 +1214,8 @@ void View::set_scroll_default()
 
 void View::determine_if_header_was_shrunk()
 {
 
 void View::determine_if_header_was_shrunk()
 {

-       const int header_pane_width = splitter_->sizes().front();
+       const int header_pane_width =
+               splitter_->sizes().front();  // clazy:exclude=detaching-temporary

 
        // Allow for a slight margin of error so that we also accept
        // slight differences when e.g. a label name change increased
 
        // Allow for a slight margin of error so that we also accept
        // slight differences when e.g. a label name change increased


@@ -1234,7 +1234,7 @@ void View::resize_header_to_fit()
        // splitter to the maximum allowed position.
 
        int splitter_area_width = 0;
        // splitter to the maximum allowed position.
 
        int splitter_area_width = 0;

-       for (int w : splitter_->sizes())
+       for (int w : splitter_->sizes())  // clazy:exclude=range-loop

                splitter_area_width += w;
 
        // Make sure the header has enough horizontal space to show all labels fully
                splitter_area_width += w;
 
        // Make sure the header has enough horizontal space to show all labels fully


@@ -1695,6 +1695,7 @@ void View::capture_state_updated(int state)
                set_time_unit(util::TimeUnit::Samples);
 
                trigger_markers_.clear();
                set_time_unit(util::TimeUnit::Samples);
 
                trigger_markers_.clear();

+               set_zero_position(0);

 
                scale_at_acq_start_ = scale_;
                offset_at_acq_start_ = offset_;
 
                scale_at_acq_start_ = scale_;
                offset_at_acq_start_ = offset_;