Standardize on 'event' as name for all Qt events.

[pulseview.git] / pv / view / cursorpair.cpp

diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp
index 46f2455677a962bc86f92bcfd4b9bc7321b03aa0..f9d3e53ddd3fec6bae38fc39dfdaa3d257ef87f8 100644 (file)
--- a/pv/view/cursorpair.cpp
+++ b/pv/view/cursorpair.cpp
@@ -20,6 +20,7 @@
 
 #include "cursorpair.hpp"
 
+#include "ruler.hpp"
 #include "view.hpp"
 #include "pv/util.hpp"
 
@@ -60,8 +61,9 @@ shared_ptr<Cursor> CursorPair::second() const
        return second_;
 }
 
-void CursorPair::set_time(double time) {
-       const double delta = second_->time() - first_->time();
+void CursorPair::set_time(const pv::util::Timestamp& time)
+{
+       const pv::util::Timestamp delta = second_->time() - first_->time();
        first_->set_time(time);
        second_->set_time(time + delta);
 }
@@ -118,8 +120,7 @@ void CursorPair::paint_label(QPainter &p, const QRect &rect, bool hover)
        const int radius = delta_rect.height() / 2;
        const QRectF text_rect(delta_rect.intersected(
                rect).adjusted(radius, 0, -radius, 0));
-       if (text_rect.width() >= text_size_.width())
-       {
+       if (text_rect.width() >= text_size_.width()) {
                const int highlight_radius = delta_rect.height() / 2 - 2;
 
                if (selected()) {
@@ -143,7 +144,8 @@ void CursorPair::paint_label(QPainter &p, const QRect &rect, bool hover)
        }
 }
 
-void CursorPair::paint_back(QPainter &p, const ViewItemPaintParams &pp) {
+void CursorPair::paint_back(QPainter &p, const ViewItemPaintParams &pp)
+{
        if (!enabled())
                return;
 
@@ -161,11 +163,15 @@ void CursorPair::paint_back(QPainter &p, const ViewItemPaintParams &pp) {
 
 QString CursorPair::format_string()
 {
-       const unsigned int prefix = view_.tick_prefix();
-       const double delta = second_->time() - first_->time();
-       return QString("%1 / %2").
-               arg(util::format_time(delta, prefix, 2)).
-               arg(util::format_si_value(1.0 / fabs(delta), "Hz", -1, 4));
+       const pv::util::SIPrefix prefix = view_.tick_prefix();
+       const pv::util::Timestamp diff = abs(second_->time() - first_->time());
+
+       const QString s1 = Ruler::format_time_with_distance(
+               diff, diff, prefix, view_.time_unit(), view_.tick_precision(), false);
+       const QString s2 = util::format_time_si(
+               1 / diff, pv::util::SIPrefix::unspecified, 4, "Hz", false);
+
+       return QString("%1 / %2").arg(s1).arg(s2);
 }
 
 void CursorPair::compute_text_size(QPainter &p)
@@ -182,8 +188,8 @@ pair<float, float> CursorPair::get_cursor_offsets() const
        assert(second_);
 
        return pair<float, float>(
-               (first_->time() - view_.offset()) / view_.scale(),
-               (second_->time() - view_.offset()) / view_.scale());
+               ((first_->time() - view_.offset()) / view_.scale()).convert_to<float>(),
+               ((second_->time() - view_.offset()) / view_.scale()).convert_to<float>());
 }
 
 } // namespace view