X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=a2e280b6f2291cd57ac11ce65403fb1dac9fd99b;hb=cef18fc6160f8f5055f2617fbe06eb082c2a7bd5;hp=27db2f4e844e2398320f9a944026ec084687c59a;hpb=ccdd3ef548ce34f25c6c168598556a350831aa37;p=pulseview.git

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 27db2f4..a2e280b 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the PulseView project.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
  *
@@ -21,7 +21,7 @@
 #include "ruler.h"
 #include "view.h"
 
-#include "../../extdef.h"
+#include <extdef.h>
 
 #include <assert.h>
 #include <math.h>
@@ -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());