X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=86f73f95e457c7306cbc51e6e55b51e4de939417;hb=84a0d458a4b04141dd45af6dec44d36782ee163e;hp=adab57dbed21344dab3cf39a072492a40950e82f;hpb=3a6fe0818affcb40b2821eab3f633e536377dd81;p=pulseview.git

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index adab57d..86f73f9 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -20,38 +20,24 @@
 
 #include "ruler.h"
 
-#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 <QMouseEvent>
-#include <QPainter>
-#include <QTextStream>
-
-using namespace std;
+using namespace Qt;
 
 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) :
-	QWidget(&parent),
-	_view(parent),
-	_grabbed_marker(NULL)
+	MarginWidget(parent)
 {
 	setMouseTracking(true);
 
@@ -59,24 +45,13 @@ Ruler::Ruler(View &parent) :
 		this, SLOT(hover_point_changed()));
 }
 
-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;
 	const int ValueMargin = 3;
@@ -95,7 +70,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;
 
@@ -104,12 +79,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;
@@ -130,26 +103,24 @@ void Ruler::paintEvent(QPaintEvent*)
 	const double t0 = first_major_division * tick_period;
 
 	int division = (int)round(first_minor_division -
-		first_major_division * MinorTickSubdivision);
+		first_major_division * MinorTickSubdivision) - 1;
 
 	const int major_tick_y1 = text_height + ValueMargin * 2;
 	const int tick_y2 = height();
 	const int minor_tick_y1 = (major_tick_y1 + tick_y2) / 2;
 
-	while (1)
-	{
-		const double t = t0 + division * minor_tick_period;
-		const double x = (t - _view.offset()) / _view.scale();
+	double x;
 
-		if (x >= width())
-			break;
+	do {
+		const double t = t0 + division * minor_tick_period;
+		x = (t - _view.offset()) / _view.scale();
 
 		if (division % MinorTickSubdivision == 0)
 		{
 			// 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));
 		}
@@ -161,69 +132,22 @@ void Ruler::paintEvent(QPaintEvent*)
 		}
 
 		division++;
-	}
 
-	// Draw the cursors
-	draw_cursors(p, prefix);
+	} while (x < width());
 
 	// Draw the hover mark
 	draw_hover_mark(p);
-
-	p.end();
-}
-
-void Ruler::mouseMoveEvent(QMouseEvent *e)
-{
-	if (!_grabbed_marker)
-		return;
-
-	_grabbed_marker->set_time(_view.offset() +
-		((double)e->x() + 0.5) * _view.scale());
-}
-
-void Ruler::mousePressEvent(QMouseEvent *e)
-{
-	if (e->buttons() & Qt::LeftButton) {
-		_grabbed_marker = NULL;
-
-		if (_view.cursors_shown()) {
-			std::pair<Cursor, Cursor> &cursors =
-				_view.cursors();
-			if (cursors.first.get_label_rect(
-				rect()).contains(e->pos()))
-				_grabbed_marker = &cursors.first;
-			else if (cursors.second.get_label_rect(
-				rect()).contains(e->pos()))
-				_grabbed_marker = &cursors.second;
-		}
-	}
-}
-
-void Ruler::mouseReleaseEvent(QMouseEvent *)
-{
-	_grabbed_marker = NULL;
-}
-
-void Ruler::draw_cursors(QPainter &p, unsigned int prefix)
-{
-	if (!_view.cursors_shown())
-		return;
-
-	const QRect r = rect();
-	pair<Cursor, Cursor> &cursors = _view.cursors();
-	cursors.first.paint_label(p, r, prefix);
-	cursors.second.paint_label(p, r, prefix);
 }
 
 void Ruler::draw_hover_mark(QPainter &p)
 {
 	const int x = _view.hover_point().x();
 
-	if (x == -1 || _grabbed_marker)
+	if (x == -1)
 		return;
 
 	p.setPen(QPen(Qt::NoPen));
-	p.setBrush(QBrush(QColor(Qt::black)));
+	p.setBrush(QBrush(palette().color(foregroundRole())));
 
 	const int b = height() - 1;
 	const QPointF points[] = {