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

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index c5f194f2..97a0d8f1 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -19,6 +19,8 @@
  */
 
 #include "ruler.h"
+
+#include "cursor.h"
 #include "view.h"
 #include "viewport.h"
 
@@ -26,11 +28,14 @@
 
 #include <assert.h>
 #include <math.h>
+#include <limits.h>
 
 #include <QMouseEvent>
 #include <QPainter>
 #include <QTextStream>
 
+using namespace std;
+
 namespace pv {
 namespace view {
 
@@ -45,7 +50,8 @@ const int Ruler::HoverArrowSize = 5;
 
 Ruler::Ruler(View &parent) :
 	QWidget(&parent),
-	_view(parent)
+	_view(parent),
+	_grabbed_marker(NULL)
 {
 	setMouseTracking(true);
 
@@ -53,7 +59,7 @@ Ruler::Ruler(View &parent) :
 		this, SLOT(hover_point_changed()));
 }
 
-void Ruler::paintEvent(QPaintEvent *event)
+void Ruler::paintEvent(QPaintEvent*)
 {
 	QPainter p(this);
 	p.setRenderHint(QPainter::Antialiasing);
@@ -71,10 +77,9 @@ void Ruler::paintEvent(QPaintEvent *event)
 	do
 	{
 		tick_period = order_decimal * ScaleUnits[unit++];
-	} while(tick_period < min_period && unit < countof(ScaleUnits));
+	} while (tick_period < min_period && unit < countof(ScaleUnits));
 
 	const unsigned int prefix = (order - FirstSIPrefixPower) / 3;
-	assert(prefix >= 0);
 	assert(prefix < countof(SIPrefixes));
 
 	const double multiplier = pow(10.0, - prefix * 3 - FirstSIPrefixPower);
@@ -83,7 +88,7 @@ void Ruler::paintEvent(QPaintEvent *event)
 		Qt::AlignLeft | Qt::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 =
@@ -94,15 +99,15 @@ 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;
@@ -123,16 +128,63 @@ void Ruler::paintEvent(QPaintEvent *event)
 		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)
+
+	if (x == -1 || _grabbed_marker)
 		return;
 
 	p.setPen(QPen(Qt::NoPen));