X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Futil.cpp;h=cf2d7f90bfcf9761eb4cef4a6b5eb38a7e2c43e3;hp=cf42eb16f25b78a11c5fbef9db610c8f58d9cda0;hb=af95045e903a0d2ac5aac63095eb124038be40c9;hpb=ac98198803da204ae26da8592c6e81a912b4a1af diff --git a/pv/util.cpp b/pv/util.cpp index cf42eb16..cf2d7f90 100644 --- a/pv/util.cpp +++ b/pv/util.cpp @@ -25,6 +25,7 @@ #include #include +#include #include #include @@ -34,38 +35,93 @@ using namespace Qt; namespace pv { namespace util { -static const QString SIPrefixes[17] = - {"y", "z", "a", "f", "p", "n", QChar(0x03BC), "m", "", "k", "M", "G", - "T", "P", "E", "Z", "Y"}; -const int FirstSIPrefix = 8; -const int FirstSIPrefixPower = -(FirstSIPrefix * 3); +static const QString SIPrefixes[17] = { + "y", "z", + "a", "f", "p", + "n", QChar(0x03BC), "m", + "", + "k", "M", "G", + "T", "P", "E", + "Z", "Y"}; +const int EmptySIPrefix = 8; +const int FirstSIPrefixPower = -(EmptySIPrefix * 3); + +// Insert the timestamp value into the stream in fixed-point notation +// (and honor the precision) +static QTextStream& operator<<(QTextStream& stream, const Timestamp& t) +{ + // The multiprecision types already have a function and a stream insertion + // operator to convert them to a string, however these functions abuse a + // precision value of zero to print all available decimal places instead of + // none, and the boost authors refuse to fix this because they don't want + // to break buggy code that relies on this bug. + // (https://svn.boost.org/trac/boost/ticket/10103) + // Therefore we have to work around the case where precision is zero. + + int precision = stream.realNumberPrecision(); + + std::ostringstream ss; + ss << std::fixed; + + if (stream.numberFlags() & QTextStream::ForceSign) { + ss << std::showpos; + } + + if (0 == precision) { + ss + << std::setprecision(1) + << round(t); + } else { + ss + << std::setprecision(precision) + << t; + } + + std::string str(ss.str()); + if (0 == precision) { + // remove the separator and the unwanted decimal place + str.resize(str.size() - 2); + } + + return stream << QString::fromStdString(str); +} -QString format_si_value(double v, QString unit, int prefix, +QString format_si_value(const Timestamp& v, QString unit, int prefix, unsigned int precision, bool sign) { if (prefix < 0) { - int exp = -FirstSIPrefixPower; - - prefix = 0; - while ((fabs(v) * pow(10.0, exp)) > 999.0 && - prefix < (int)(countof(SIPrefixes) - 1)) { - prefix++; - exp -= 3; + // No prefix given, calculate it + + if (v.is_zero()) { + prefix = EmptySIPrefix; + } else { + int exp = -FirstSIPrefixPower; + + prefix = 0; + while ((fabs(v) * pow(10.0, exp)) > 999.0 && + prefix < (int)(countof(SIPrefixes) - 1)) { + prefix++; + exp -= 3; + } } } assert(prefix >= 0); assert(prefix < (int)countof(SIPrefixes)); - const double multiplier = pow(10.0, + const Timestamp multiplier = pow(Timestamp(10), (int)- prefix * 3 - FirstSIPrefixPower); QString s; QTextStream ts(&s); - if (sign) + if (sign && !v.is_zero()) ts << forcesign; - ts << fixed << qSetRealNumberPrecision(precision) << - (v * multiplier) << " " << SIPrefixes[prefix] << unit; + ts + << qSetRealNumberPrecision(precision) + << (v * multiplier) + << ' ' + << SIPrefixes[prefix] + << unit; return s; } @@ -75,26 +131,26 @@ static QString pad_number(unsigned int number, int length) return QString("%1").arg(number, length, 10, QChar('0')); } -static QString format_time_in_full(double t, signed precision, bool force_sign) +static QString format_time_in_full(const Timestamp& t, signed precision) { - const unsigned int whole_seconds = abs((int) t); - const unsigned int days = whole_seconds / (60 * 60 * 24); - const unsigned int hours = (whole_seconds / (60 * 60)) % 24; - const unsigned int minutes = (whole_seconds / 60) % 60; - const unsigned int seconds = whole_seconds % 60; + const Timestamp whole_seconds = floor(abs(t)); + const Timestamp days = floor(whole_seconds / (60 * 60 * 24)); + const unsigned int hours = fmod(whole_seconds / (60 * 60), 24).convert_to(); + const unsigned int minutes = fmod(whole_seconds / 60, 60).convert_to(); + const unsigned int seconds = fmod(whole_seconds, 60).convert_to(); QString s; QTextStream ts(&s); - if (force_sign && (t >= 0)) + if (t >= 0) ts << "+"; - if (t < 0) + else ts << "-"; bool use_padding = false; if (days) { - ts << days << ":"; + ts << days.str().c_str() << ":"; use_padding = true; } @@ -118,11 +174,16 @@ static QString format_time_in_full(double t, signed precision, bool force_sign) if (precision >= 0) { ts << pad_number(seconds, use_padding ? 2 : 0); - const double fraction = fabs(t - whole_seconds); + const Timestamp fraction = fabs(t) - whole_seconds; if (precision > 0 && precision < 1000) { - QString fs = QString("%1").arg(fraction, -(2 + precision), 'f', - precision, QChar('0')); + std::ostringstream ss; + ss + << std::fixed + << std::setprecision(2 + precision) + << std::setfill('0') + << fraction; + std::string fs = ss.str(); ts << "."; @@ -131,7 +192,7 @@ static QString format_time_in_full(double t, signed precision, bool force_sign) // Start at index 2 to skip the "0." at the beginning ts << fs[1 + i]; - if ((i > 0) && (i % 3 == 0)) + if ((i > 0) && (i % 3 == 0) && (i != precision)) ts << " "; } } @@ -140,49 +201,43 @@ static QString format_time_in_full(double t, signed precision, bool force_sign) return s; } -QString format_time(double t, int prefix, TimeUnit unit, - unsigned int precision, double step_size, bool sign) +static QString format_time_with_si(const Timestamp& t, QString unit, + int prefix, unsigned int precision) { - // If we have to use samples then we have no alternative formats - if (unit == Samples) { - // The precision is always given without taking the prefix into account - // so we need to deduct the number of decimals the prefix might imply - const int prefix_order = - -(prefix * 3 + pv::util::FirstSIPrefixPower); + // The precision is always given without taking the prefix into account + // so we need to deduct the number of decimals the prefix might imply + const int prefix_order = + -(prefix * 3 + pv::util::FirstSIPrefixPower); - const unsigned int relative_prec = - (prefix >= pv::util::FirstSIPrefix) ? precision : - std::max((int)(precision - prefix_order), 0); + const unsigned int relative_prec = + (prefix >= EmptySIPrefix) ? precision : + std::max((int)(precision - prefix_order), 0); - return format_si_value(t, "sa", prefix, relative_prec, sign); - } + return format_si_value(t, unit, prefix, relative_prec); +} - // View zoomed way out -> low precision (0), high step size (>60s) - // -> DD:HH:MM - if ((precision == 0) && (step_size >= 60)) { - return format_time_in_full(t, -1, sign); - } +QString format_time(const Timestamp& t, int prefix, TimeUnit unit, + unsigned int precision) +{ + // Make 0 appear as 0, not random +0 or -0 + if (t.is_zero()) + return "0"; + + // If we have to use samples then we have no alternative formats + if (unit == Samples) + return format_time_with_si(t, "sa", prefix, precision); // View in "normal" range -> medium precision, medium step size // -> HH:MM:SS.mmm... or xxxx (si unit) if less than 60 seconds // View zoomed way in -> high precision (>3), low step size (<1s) // -> HH:MM:SS.mmm... or xxxx (si unit) if less than 60 seconds - if (abs(t) < 60) { - // The precision is always given without taking the prefix into account - // so we need to deduct the number of decimals the prefix might imply - const int prefix_order = - -(prefix * 3 + pv::util::FirstSIPrefixPower); - - const unsigned int relative_prec = - (prefix >= pv::util::FirstSIPrefix) ? precision : - std::max((int)(precision - prefix_order), 0); - - return format_si_value(t, "s", prefix, relative_prec, sign); - } else - return format_time_in_full(t, precision, sign); + if (abs(t) < 60) + return format_time_with_si(t, "s", prefix, precision); + else + return format_time_in_full(t, precision); } -QString format_second(double second) +QString format_second(const Timestamp& second) { return format_si_value(second, "s", -1, 0, false); }