X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=9e639383942ed1149702f9e369b16452a46eba1f;hp=350e49dcff0a2ee14656173ced94b422a9fc2697;hb=64b678ba0bf16e3a3c1aceffef170f3dbcc588d3;hpb=3f509c1f40fa91f3bf4468b648cdb01bc45b0cb8

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 350e49dc..9e639383 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -59,12 +59,27 @@ Ruler::Ruler(View &parent) :
 		this, SLOT(hover_point_changed()));
 }
 
+QString Ruler::format_time(double t, unsigned int prefix,
+	unsigned int precision)
+{
+	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;
+}
+
 void Ruler::paintEvent(QPaintEvent*)
 {
 	using namespace Qt;
 
 	const double SpacingIncrement = 32.0f;
 	const double MinValueSpacing = 32.0f;
+	const int ValueMargin = 3;
 
 	QPainter p(this);
 	p.setRenderHint(QPainter::Antialiasing);
@@ -72,7 +87,6 @@ void Ruler::paintEvent(QPaintEvent*)
 	double min_width = SpacingIncrement, typical_width;
 	double tick_period;
 	unsigned int prefix;
-	double multiplier;
 
 	// Find tick spacing, and number formatting that does not cause
 	// value to collide.
@@ -93,11 +107,10 @@ void Ruler::paintEvent(QPaintEvent*)
 		prefix = (order - FirstSIPrefixPower) / 3;
 		assert(prefix < countof(SIPrefixes));
 
-		multiplier = pow(10.0, - prefix * 3 - FirstSIPrefixPower);
 
 		typical_width = p.boundingRect(0, 0, INT_MAX, INT_MAX,
 			AlignLeft | AlignTop, format_time(_view.offset(),
-			multiplier, prefix)).width() + MinValueSpacing;
+			prefix)).width() + MinValueSpacing;
 
 		min_width += SpacingIncrement;
 
@@ -117,36 +130,40 @@ void Ruler::paintEvent(QPaintEvent*)
 	const double t0 = first_major_division * tick_period;
 
 	int division = (int)round(first_minor_division -
-		first_major_division * MinorTickSubdivision);
-	while (1)
-	{
-		const double t = t0 + division * minor_tick_period;
-		const double x = (t - _view.offset()) / _view.scale();
+		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;
 
-		if (x >= width())
-			break;
+	double x;
+
+	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, 0, 0, text_height, AlignCenter |
-				AlignTop | TextDontClip,
-				format_time(t, multiplier, prefix));
-			p.drawLine(QPointF(x, text_height),
-				QPointF(x, height()));
+			p.drawText(x, ValueMargin, 0, text_height,
+				AlignCenter | AlignTop | TextDontClip,
+				format_time(t, prefix));
+			p.drawLine(QPointF(x, major_tick_y1),
+				QPointF(x, tick_y2));
 		}
 		else
 		{
 			// Draw a minor tick
-			p.drawLine(QPointF(x, (text_height + height()) / 2),
-				QPointF(x, height()));
+			p.drawLine(QPointF(x, minor_tick_y1),
+				QPointF(x, tick_y2));
 		}
 
 		division++;
-	}
+
+	} while (x < width());
 
 	// Draw the cursors
-	draw_cursors(p);
+	draw_cursors(p, prefix);
 
 	// Draw the hover mark
 	draw_hover_mark(p);
@@ -186,26 +203,15 @@ void Ruler::mouseReleaseEvent(QMouseEvent *)
 	_grabbed_marker = NULL;
 }
 
-QString Ruler::format_time(double t, double multiplier,
-	unsigned int prefix)
-{
-	QString s;
-	QTextStream ts(&s);
-	ts.setRealNumberPrecision(0);
-	ts << fixed << forcesign << (t  * multiplier) <<
-		SIPrefixes[prefix] << "s";
-	return s;
-}
-
-void Ruler::draw_cursors(QPainter &p)
+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);
-	cursors.second.paint_label(p, r);
+	cursors.first.paint_label(p, r, prefix);
+	cursors.second.paint_label(p, r, prefix);
 }
 
 void Ruler::draw_hover_mark(QPainter &p)
@@ -216,7 +222,7 @@ void Ruler::draw_hover_mark(QPainter &p)
 		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[] = {