X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=3cc2eb173404e0213c87d6161c198f2b00ad94c1;hb=7c238e082a6fadc14f90285805f5901cc8f68570;hp=c5f194f2f76f4011009107659c2ad70790605e6f;hpb=b3a7c0136e427d823eec18b14780182740e9de5d;p=pulseview.git

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index c5f194f2..3cc2eb17 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -19,33 +19,25 @@
  */
 
 #include "ruler.h"
+
 #include "view.h"
-#include "viewport.h"
+#include "pv/util.h"
 
 #include <extdef.h>
 
-#include <assert.h>
-#include <math.h>
-
-#include <QMouseEvent>
-#include <QPainter>
-#include <QTextStream>
+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)
+	MarginWidget(parent)
 {
 	setMouseTracking(true);
 
@@ -53,37 +45,29 @@ Ruler::Ruler(View &parent) :
 		this, SLOT(hover_point_changed()));
 }
 
-void Ruler::paintEvent(QPaintEvent *event)
+QSize Ruler::sizeHint() const
 {
-	QPainter p(this);
-	p.setRenderHint(QPainter::Antialiasing);
-
-	const double MinSpacing = 80;
-
-	const double min_period = _view.scale() * MinSpacing;
-
-	const int order = (int)floorf(log10f(min_period));
-	const double order_decimal = pow(10, order);
+	return QSize(0, RulerHeight);
+}
 
-	unsigned int unit = 0;
-	double tick_period = 0.0f;
+void Ruler::paintEvent(QPaintEvent*)
+{
+	const int ValueMargin = 3;
 
-	do
-	{
-		tick_period = order_decimal * ScaleUnits[unit++];
-	} while(tick_period < min_period && unit < countof(ScaleUnits));
+	QPainter p(this);
+	p.setRenderHint(QPainter::Antialiasing);
 
-	const unsigned int prefix = (order - FirstSIPrefixPower) / 3;
-	assert(prefix >= 0);
-	assert(prefix < countof(SIPrefixes));
+	std::pair<double, unsigned int> spacing =
+		calculate_tick_spacing(p, _view.scale(), _view.offset());
 
-	const double multiplier = pow(10.0, - prefix * 3 - FirstSIPrefixPower);
+	double tick_period = spacing.first;
+	unsigned int prefix = spacing.second;
 
 	const int text_height = p.boundingRect(0, 0, INT_MAX, INT_MAX,
-		Qt::AlignLeft | Qt::AlignTop, "8").height();
+		AlignLeft | AlignTop, "8").height();
 
 	// Draw the tick marks
-	p.setPen(Qt::black);
+	p.setPen(palette().color(foregroundRole()));
 
 	const double minor_tick_period = tick_period / MinorTickSubdivision;
 	const double first_major_division =
@@ -93,50 +77,51 @@ void Ruler::paintEvent(QPaintEvent *event)
 	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;
 
-		if(x >= width())
-			break;
+	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(division % MinorTickSubdivision == 0)
+	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, Qt::AlignCenter |
-				Qt::AlignTop | Qt::TextDontClip, s);
-			p.drawLine(QPointF(x, text_height),
-				QPointF(x, height()));
+			p.drawText(x, ValueMargin, 0, text_height,
+				AlignCenter | AlignTop | TextDontClip,
+				pv::util::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 hover mark
 	draw_hover_mark(p);
-
-	p.end();
 }
 
 void Ruler::draw_hover_mark(QPainter &p)
 {
 	const int x = _view.hover_point().x();
-	if(x == -1)
+
+	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[] = {
@@ -152,5 +137,41 @@ void Ruler::hover_point_changed()
 	update();
 }
 
+std::pair<double, unsigned int> Ruler::calculate_tick_spacing(
+	QPainter& p, double scale, double offset)
+{
+	const double SpacingIncrement = 32.0f;
+	const double MinValueSpacing = 32.0f;
+
+	double min_width = SpacingIncrement, typical_width;
+
+	double tick_period;
+	unsigned int prefix;
+
+	do {
+		const double min_period = scale * min_width;
+
+		const int order = (int)floorf(log10f(min_period));
+		const double order_decimal = pow(10.0, order);
+
+		unsigned int unit = 0;
+
+		do {
+			tick_period = order_decimal * ScaleUnits[unit++];
+		} while (tick_period < min_period && unit < countof(ScaleUnits));
+
+		prefix = (order - pv::util::FirstSIPrefixPower) / 3;
+
+		typical_width = p.boundingRect(0, 0, INT_MAX, INT_MAX,
+			AlignLeft | AlignTop, pv::util::format_time(offset,
+			prefix)).width() + MinValueSpacing;
+
+		min_width += SpacingIncrement;
+
+	} while(typical_width > tick_period / scale);
+
+	return std::make_pair(tick_period, prefix);
+}
+
 } // namespace view
 } // namespace pv