Trace View: Move ruler time conversion from View to Ruler

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

diff --git a/pv/views/trace/ruler.cpp b/pv/views/trace/ruler.cpp
index acea8a368b457469e44c11e758f95f935a56e68e..5fa1be2fc4326e2eb5728c6a27035023315ace54 100644 (file)
--- a/pv/views/trace/ruler.cpp
+++ b/pv/views/trace/ruler.cpp
@@ -99,6 +99,11 @@ QString Ruler::format_time_with_distance(
        if (unit == pv::util::TimeUnit::Samples)
                return pv::util::format_time_si_adjusted(t, prefix, precision, "sa", sign);
 
+       QString unit_string;
+       if (unit == pv::util::TimeUnit::Time)
+               unit_string = "s";
+       // Note: In case of pv::util::TimeUnit::None, unit_string remains empty
+
        // View zoomed way out -> low precision (0), big distance (>=60s)
        // -> DD:HH:MM
        if ((precision == 0) && (distance >= limit))
@@ -109,16 +114,31 @@ QString Ruler::format_time_with_distance(
        // View zoomed way in -> high precision (>3), low step size (<1s)
        // -> HH:MM:SS.mmm... or xxxx (si unit) if less than limit seconds
        if (abs(t) < limit)
-               return pv::util::format_time_si_adjusted(t, prefix, precision, "s", sign);
+               return pv::util::format_time_si_adjusted(t, prefix, precision, unit_string, sign);
        else
                return pv::util::format_time_minutes(t, precision, sign);
 }
 
-pv::util::Timestamp Ruler::get_time_from_x_pos(uint32_t x) const
+pv::util::Timestamp Ruler::get_absolute_time_from_x_pos(uint32_t x) const
+{
+       return view_.offset() + ((double)x + 0.5) * view_.scale();
+}
+
+pv::util::Timestamp Ruler::get_ruler_time_from_x_pos(uint32_t x) const
 {
        return view_.ruler_offset() + ((double)x + 0.5) * view_.scale();
 }
 
+pv::util::Timestamp Ruler::get_ruler_time_from_absolute_time(const pv::util::Timestamp& abs_time) const
+{
+       return abs_time + view_.zero_offset();
+}
+
+pv::util::Timestamp Ruler::get_absolute_time_from_ruler_time(const pv::util::Timestamp& ruler_time) const
+{
+       return ruler_time - view_.zero_offset();
+}
+
 void Ruler::contextMenuEvent(QContextMenuEvent *event)
 {
        MarginWidget::contextMenuEvent(event);
@@ -177,7 +197,7 @@ shared_ptr<ViewItem> Ruler::get_mouse_over_item(const QPoint &pt)
 
 void Ruler::mouseDoubleClickEvent(QMouseEvent *event)
 {
-       view_.add_flag(get_time_from_x_pos(event->x()));
+       view_.add_flag(get_ruler_time_from_x_pos(event->x()));
 }
 
 void Ruler::paintEvent(QPaintEvent*)
@@ -330,12 +350,12 @@ void Ruler::invalidate_tick_position_cache()
 
 void Ruler::on_createMarker()
 {
-       view_.add_flag(get_time_from_x_pos(mouse_down_point_.x()));
+       view_.add_flag(get_absolute_time_from_x_pos(mouse_down_point_.x()));
 }
 
 void Ruler::on_setZeroPosition()
 {
-       view_.set_zero_position(get_time_from_x_pos(mouse_down_point_.x()));
+       view_.set_zero_position(get_absolute_time_from_x_pos(mouse_down_point_.x()));
 }
 
 void Ruler::on_toggleHoverMarker()