X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fcursorpair.cpp;h=5ee90aa1357e6f2f89ce32f1cffbf14dcbdb3506;hp=7b9f671f036f603809ec420d172cde2198d7f479;hb=a8743cd962b2d18082c6ddaeb554d56013919d95;hpb=60d9b99a32e551cffd2b537d3e157d578a761c9b diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp index 7b9f671f..5ee90aa1 100644 --- 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" @@ -161,11 +162,15 @@ void CursorPair::paint_back(QPainter &p, const ViewItemPaintParams &pp) { QString CursorPair::format_string() { - const unsigned int prefix = view_.tick_prefix(); - const pv::util::Timestamp delta = second_->time() - first_->time(); - return QString("%1 / %2"). - arg(util::format_time(delta, prefix, view_.time_unit(), 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)