From: Joel Holdsworth <redacted>
Date: Thu, 11 Oct 2012 20:38:24 +0000 (+0100)
Subject: Fixed ruler scale units
X-Git-Tag: pulseview-0.1.0~282
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=1b5813fe7a82d959976389f7bb41bf731f1ff435;p=pulseview.git

Fixed ruler scale units
---

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 27db2f4e..743a11fc 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -68,6 +68,8 @@ void Ruler::paintEvent(QPaintEvent *event)
 	assert(prefix >= 0);
 	assert(prefix < countof(SIPrefixes));
 
+	const double multiplier = pow(0.1, prefix * 3 + FirstSIPrefixPower);
+
 	const int text_height = p.boundingRect(0, 0, INT_MAX, INT_MAX,
 		Qt::AlignLeft | Qt::AlignTop, "8").height();
 
@@ -96,7 +98,7 @@ void Ruler::paintEvent(QPaintEvent *event)
 			// Draw a major tick
 			QString s;
 			QTextStream ts(&s);
-			ts << (t / order_decimal) << SIPrefixes[prefix] << "s";
+			ts << (t * multiplier) << SIPrefixes[prefix] << "s";
 			p.drawText(x, 0, 0, text_height, Qt::AlignCenter |
 				Qt::AlignTop | Qt::TextDontClip, s);
 			p.drawLine(x, text_height, x, height());