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

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 9f7cff2c..9e639383 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -59,32 +59,62 @@ 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);
 
-	const double MinSpacing = 80;
+	double min_width = SpacingIncrement, typical_width;
+	double tick_period;
+	unsigned int prefix;
+
+	// Find tick spacing, and number formatting that does not cause
+	// value to collide.
+	do
+	{
+		const double min_period = _view.scale() * min_width;
 
-	const double min_period = _view.scale() * MinSpacing;
+		const int order = (int)floorf(log10f(min_period));
+		const double order_decimal = pow(10, order);
 
-	const int order = (int)floorf(log10f(min_period));
-	const double order_decimal = pow(10, order);
+		unsigned int unit = 0;
 
-	unsigned int unit = 0;
-	double tick_period = 0.0f;
+		do
+		{
+			tick_period = order_decimal * ScaleUnits[unit++];
+		} while (tick_period < min_period && unit < countof(ScaleUnits));
 
-	do
-	{
-		tick_period = order_decimal * ScaleUnits[unit++];
-	} while (tick_period < min_period && unit < countof(ScaleUnits));
+		prefix = (order - FirstSIPrefixPower) / 3;
+		assert(prefix < countof(SIPrefixes));
 
-	const unsigned int prefix = (order - FirstSIPrefixPower) / 3;
-	assert(prefix < countof(SIPrefixes));
 
-	const double multiplier = pow(10.0, - prefix * 3 - FirstSIPrefixPower);
+		typical_width = p.boundingRect(0, 0, INT_MAX, INT_MAX,
+			AlignLeft | AlignTop, format_time(_view.offset(),
+			prefix)).width() + MinValueSpacing;
+
+		min_width += SpacingIncrement;
+
+	} while(typical_width > tick_period / _view.scale());
 
 	const int text_height = p.boundingRect(0, 0, INT_MAX, INT_MAX,
 		AlignLeft | AlignTop, "8").height();
@@ -100,38 +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
-			QString s;
-			QTextStream ts(&s);
-			ts << (t * multiplier) << SIPrefixes[prefix] << "s";
-			p.drawText(x, 0, 0, text_height, AlignCenter |
-				AlignTop | TextDontClip, s);
-			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);
@@ -171,15 +203,15 @@ void Ruler::mouseReleaseEvent(QMouseEvent *)
 	_grabbed_marker = NULL;
 }
 
-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)
@@ -190,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[] = {