X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Futil.cpp;h=d2d70827335d0fb86cbeb0b0a2cd160ebc33569b;hp=ff1b484899a19507c882079014dc917062c7ccf1;hb=dae21ebcf60d6a5d7c194736b1dc792a5cbf06a5;hpb=6f1f59c8785228aa24b8e999c90fe98cef7bc051

diff --git a/pv/util.cpp b/pv/util.cpp
index ff1b4848..d2d70827 100644
--- a/pv/util.cpp
+++ b/pv/util.cpp
@@ -24,6 +24,8 @@
 
 #include <assert.h>
 
+#include <algorithm>
+
 #include <QTextStream>
 #include <QDebug>
 
@@ -35,7 +37,9 @@ 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 FirstSIPrefixPower = -24;
+const int FirstSIPrefix = 8;
+const int FirstSIPrefixPower = -(FirstSIPrefix * 3);
+const double MinTimeDelta = 1e-15; // Anything below 1 fs can be considered zero
 
 QString format_si_value(double v, QString unit, int prefix,
 	unsigned int precision, bool sign)
@@ -52,7 +56,7 @@ QString format_si_value(double v, QString unit, int prefix,
 	}
 
 	assert(prefix >= 0);
-	assert(prefix < countof(SIPrefixes));
+	assert(prefix < (int)countof(SIPrefixes));
 
 	const double multiplier = pow(10.0,
 		(int)- prefix * 3 - FirstSIPrefixPower);
@@ -61,16 +65,115 @@ 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;
 }
 
-QString format_time(double t, int prefix,
-	unsigned int precision, bool sign)
+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)
+{
+	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;
+
+	QString s;
+	QTextStream ts(&s);
+
+	if (t >= 0)
+		ts << "+";
+	else
+		ts << "-";
+
+	bool use_padding = false;
+
+	if (days) {
+		ts << days << ":";
+		use_padding = true;
+	}
+
+	if (hours || days) {
+		ts << pad_number(hours, use_padding ? 2 : 0) << ":";
+		use_padding = true;
+	}
+
+	if (minutes || hours || days) {
+		ts << pad_number(minutes, use_padding ? 2 : 0);
+		use_padding = true;
+
+		// We're not showing any seconds with a negative precision
+		if (precision >= 0)
+			 ts << ":";
+	}
+
+	// precision < 0: Use DD:HH:MM format
+	// precision = 0: Use DD:HH:MM:SS format
+	// precision > 0: Use DD:HH:MM:SS.mmm nnn ppp fff format
+	if (precision >= 0) {
+		ts << pad_number(seconds, use_padding ? 2 : 0);
+
+		const double fraction = fabs(t) - whole_seconds;
+
+		if (precision > 0 && precision < 1000) {
+			QString fs = QString("%1").arg(fraction, -(2 + precision), 'f',
+				precision, QChar('0'));
+
+			ts << ".";
+
+			// Copy all digits, inserting spaces as unit separators
+			for (int i = 1; i <= precision; i++) {
+				// Start at index 2 to skip the "0." at the beginning
+				ts << fs[1 + i];
+
+				if ((i > 0) && (i % 3 == 0))
+					ts << " ";
+			}
+		}
+	}
+
+	return s;
+}
+
+static QString format_time_with_si(double t, QString unit, int prefix,
+	unsigned int precision)
+{
+	// 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, unit, prefix, relative_prec);
+}
+
+QString format_time(double t, int prefix, TimeUnit unit, unsigned int precision)
 {
-	return format_si_value(t, "s", prefix, precision, sign);
+	// Make 0 appear as 0, not random +0 or -0
+	if (fabs(t) < MinTimeDelta)
+		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)
+		return format_time_with_si(t, "s", prefix, precision);
+	else
+		return format_time_in_full(t, precision);
 }
 
 QString format_second(double second)