X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=9e29ec294b76786ed3e3e22b7a824be056c71720;hb=f0c9f81c03d2c1d1fa59c357a88d25f6a3128651;hp=a9a8452d47fc6784d6d736762ba4938ce3408895;hpb=b213ef0991a13af0c74ffe5c54382c5c455c5496;p=pulseview.git

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index a9a8452..9e29ec2 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -23,13 +23,10 @@
 #include "cursor.h"
 #include "view.h"
 #include "viewport.h"
+#include "pv/util.h"
 
 #include <extdef.h>
 
-#include <assert.h>
-#include <math.h>
-#include <limits.h>
-
 #include <QApplication>
 #include <QMouseEvent>
 #include <QPainter>
@@ -37,19 +34,16 @@
 
 #include <pv/widgets/popup.h>
 
-using namespace boost;
-using namespace std;
+using namespace Qt;
+using boost::shared_ptr;
 
 namespace pv {
 namespace view {
 
+const int Ruler::RulerHeight = 30;
 const int Ruler::MinorTickSubdivision = 4;
 const int Ruler::ScaleUnits[3] = {1, 2, 5};
 
-const QString Ruler::SIPrefixes[9] =
-	{"f", "p", "n", QChar(0x03BC), "m", "", "k", "M", "G"};
-const int Ruler::FirstSIPrefixPower = -15;
-
 const int Ruler::HoverArrowSize = 5;
 
 Ruler::Ruler(View &parent) :
@@ -70,23 +64,14 @@ void Ruler::clear_selection()
 	update();
 }
 
-QString Ruler::format_time(double t, unsigned int prefix,
-	unsigned int precision)
+
+QSize Ruler::sizeHint() const
 {
-	const double multiplier = pow(10.0,
-		- prefix * 3 - FirstSIPrefixPower);
-
-	QString s;
-	QTextStream ts(&s);
-	ts.setRealNumberPrecision(precision);
-	ts << fixed << forcesign << (t  * multiplier) <<
-		SIPrefixes[prefix] << "s";
-	return s;
+	return QSize(0, RulerHeight);
 }
 
 void Ruler::paintEvent(QPaintEvent*)
 {
-	using namespace Qt;
 
 	const double SpacingIncrement = 32.0f;
 	const double MinValueSpacing = 32.0f;
@@ -106,7 +91,7 @@ void Ruler::paintEvent(QPaintEvent*)
 		const double min_period = _view.scale() * min_width;
 
 		const int order = (int)floorf(log10f(min_period));
-		const double order_decimal = pow(10, order);
+		const double order_decimal = pow(10.0, order);
 
 		unsigned int unit = 0;
 
@@ -115,12 +100,10 @@ void Ruler::paintEvent(QPaintEvent*)
 			tick_period = order_decimal * ScaleUnits[unit++];
 		} while (tick_period < min_period && unit < countof(ScaleUnits));
 
-		prefix = (order - FirstSIPrefixPower) / 3;
-		assert(prefix < countof(SIPrefixes));
-
+		prefix = (order - pv::util::FirstSIPrefixPower) / 3;
 
 		typical_width = p.boundingRect(0, 0, INT_MAX, INT_MAX,
-			AlignLeft | AlignTop, format_time(_view.offset(),
+			AlignLeft | AlignTop, pv::util::format_time(_view.offset(),
 			prefix)).width() + MinValueSpacing;
 
 		min_width += SpacingIncrement;
@@ -158,7 +141,7 @@ void Ruler::paintEvent(QPaintEvent*)
 			// Draw a major tick
 			p.drawText(x, ValueMargin, 0, text_height,
 				AlignCenter | AlignTop | TextDontClip,
-				format_time(t, prefix));
+				pv::util::format_time(t, prefix));
 			p.drawLine(QPointF(x, major_tick_y1),
 				QPointF(x, tick_y2));
 		}