X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=83863e61ea203e3a3efb08f772425a8510da029d;hp=5dea19474c84714a3f653e8449ff099f0f700625;hb=f76af6375b8aea6b7edb2d6ee838e1589c3490f3;hpb=397c9541a50d9fe88a9877d58e1d149df31eee04

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 5dea1947..83863e61 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -20,15 +20,19 @@
 
 #include "ruler.h"
 #include "view.h"
+#include "viewport.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 +43,22 @@ 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)
 {
+	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;
 
@@ -101,20 +112,61 @@ void Ruler::paintEvent(QPaintEvent *event)
 			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::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)
+		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