X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Futil.cpp;h=2e54adeaed3dffae88cb2b7354ce9eb57395302b;hp=2a04aaec7d99e68fb7ef9295c6ec4e40f5476425;hb=208c6fc371951fe74ba5a08a0950f2837eef8b7b;hpb=4bc10a910593fda2d378d62a57448cec4b2166bf diff --git a/pv/util.cpp b/pv/util.cpp index 2a04aaec..2e54adea 100644 --- a/pv/util.cpp +++ b/pv/util.cpp @@ -32,9 +32,10 @@ using namespace Qt; namespace pv { namespace util { -static const QString SIPrefixes[9] = - {"f", "p", "n", QChar(0x03BC), "m", "", "k", "M", "G"}; -const int FirstSIPrefixPower = -15; +static const QString SIPrefixes[17] = + {"y", "z", "a", "f", "p", "n", QChar(0x03BC), "m", "", "k", "M", "G", + "T", "P", "E", "Z", "Y"}; +const int FirstSIPrefixPower = -24; QString format_si_value(double v, QString unit, int prefix, unsigned int precision, bool sign) @@ -60,8 +61,8 @@ QString format_si_value(double v, QString unit, int prefix, QTextStream ts(&s); if (sign) ts << forcesign; - ts << fixed << qSetRealNumberPrecision(precision) - << (v * multiplier) << SIPrefixes[prefix] << unit; + ts << fixed << qSetRealNumberPrecision(precision) << + (v * multiplier) << " " << SIPrefixes[prefix] << unit; return s; }