X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=a442901c3e9c76645e44da9a5a9bd5dd18ca8df9;hp=27db2f4e844e2398320f9a944026ec084687c59a;hb=3f96c34aa5735b72a8c2a48d24ad38b1d9898933;hpb=ccdd3ef548ce34f25c6c168598556a350831aa37

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 27db2f4e..a442901c 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the PulseView project.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
  *
@@ -19,16 +19,22 @@
  */
 
 #include "ruler.h"
+
+#include "cursor.h"
 #include "view.h"
+#include "viewport.h"
 
-#include "../../extdef.h"
+#include <extdef.h>
 
 #include <assert.h>
 #include <math.h>
 
+#include <QMouseEvent>
 #include <QPainter>
 #include <QTextStream>
 
+using namespace std;
+
 namespace pv {
 namespace view {
 
@@ -39,15 +45,23 @@ 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)
+	_view(parent),
+	_grabbed_marker(NULL)
 {
+	setMouseTracking(true);
+
+	connect(&_view, SIGNAL(hover_point_changed()),
+		this, SLOT(hover_point_changed()));
 }
 
 void Ruler::paintEvent(QPaintEvent *event)
 {
 	QPainter p(this);
+	p.setRenderHint(QPainter::Antialiasing);
 
 	const double MinSpacing = 80;
 
@@ -56,18 +70,19 @@ void Ruler::paintEvent(QPaintEvent *event)
 	const int order = (int)floorf(log10f(min_period));
 	const double order_decimal = pow(10, order);
 
-	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));
+	} while (tick_period < min_period && unit < countof(ScaleUnits));
 
-	const int prefix = (order - FirstSIPrefixPower) / 3;
-	assert(prefix >= 0);
+	const unsigned int prefix = (order - FirstSIPrefixPower) / 3;
 	assert(prefix < countof(SIPrefixes));
 
+	const double multiplier = pow(10.0, - prefix * 3 - FirstSIPrefixPower);
+
 	const int text_height = p.boundingRect(0, 0, INT_MAX, INT_MAX,
 		Qt::AlignLeft | Qt::AlignTop, "8").height();
 
@@ -83,36 +98,110 @@ void Ruler::paintEvent(QPaintEvent *event)
 
 	int division = (int)round(first_minor_division -
 		first_major_division * MinorTickSubdivision);
-	while(1)
+	while (1)
 	{
 		const double t = t0 + division * minor_tick_period;
 		const double x = (t - _view.offset()) / _view.scale();
 
-		if(x >= width())
+		if (x >= width())
 			break;
 
-		if(division % MinorTickSubdivision == 0)
+		if (division % MinorTickSubdivision == 0)
 		{
 			// Draw a major tick
 			QString s;
 			QTextStream ts(&s);
-			ts << (t / order_decimal) << SIPrefixes[prefix] << "s";
+			ts << (t * multiplier) << SIPrefixes[prefix] << "s";
 			p.drawText(x, 0, 0, text_height, Qt::AlignCenter |
 				Qt::AlignTop | Qt::TextDontClip, s);
-			p.drawLine(x, text_height, x, height());
+			p.drawLine(QPointF(x, text_height),
+				QPointF(x, height()));
 		}
 		else
 		{
 			// Draw a minor tick
-			p.drawLine(x, (text_height + height()) / 2,
-				x, height());
+			p.drawLine(QPointF(x, (text_height + height()) / 2),
+				QPointF(x, height()));
 		}
 
 		division++;
 	}
 
+	// Draw the cursors
+	draw_cursors(p);
+
+	// 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)
+{
+	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);
+}
+
+void Ruler::draw_hover_mark(QPainter &p)
+{
+	const int x = _view.hover_point().x();
+
+	if (x == -1 || _grabbed_marker)
+		return;
+
+	p.setPen(QPen(Qt::NoPen));
+	p.setBrush(QBrush(QColor(Qt::black)));
+
+	const int b = height() - 1;
+	const QPointF points[] = {
+		QPointF(x, b),
+		QPointF(x - HoverArrowSize, b - HoverArrowSize),
+		QPointF(x + HoverArrowSize, b - HoverArrowSize)
+	};
+	p.drawPolygon(points, countof(points));
+}
+
+void Ruler::hover_point_changed()
+{
+	update();
+}
+
 } // namespace view
 } // namespace pv