X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=74bc1f979b5ee7b8f04a4643ad8f455bb9d3c1ab;hb=0c0218fd70bde15f2ccd20f39f6d3ddddd3e1691;hp=4649b10d69648ddfc4625acb8a94ef01b8d9a32c;hpb=f260e3bfe8cc0f221b3d4498b548295b9168ffbf;p=pulseview.git

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 4649b10d..74bc1f97 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -34,6 +34,7 @@
 #include <QPainter>
 #include <QTextStream>
 
+using namespace boost;
 using namespace std;
 
 namespace pv {
@@ -49,9 +50,7 @@ const int Ruler::FirstSIPrefixPower = -15;
 const int Ruler::HoverArrowSize = 5;
 
 Ruler::Ruler(View &parent) :
-	QWidget(&parent),
-	_view(parent),
-	_grabbed_marker(NULL)
+	MarginWidget(parent)
 {
 	setMouseTracking(true);
 
@@ -59,6 +58,28 @@ Ruler::Ruler(View &parent) :
 		this, SLOT(hover_point_changed()));
 }
 
+void Ruler::clear_selection()
+{
+	CursorPair &cursors = _view.cursors();
+	cursors.first()->select(false);
+	cursors.second()->select(false);
+	update();
+}
+
+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;
@@ -73,7 +94,6 @@ void Ruler::paintEvent(QPaintEvent*)
 	double min_width = SpacingIncrement, typical_width;
 	double tick_period;
 	unsigned int prefix;
-	double multiplier;
 
 	// Find tick spacing, and number formatting that does not cause
 	// value to collide.
@@ -94,11 +114,10 @@ void Ruler::paintEvent(QPaintEvent*)
 		prefix = (order - FirstSIPrefixPower) / 3;
 		assert(prefix < countof(SIPrefixes));
 
-		multiplier = pow(10.0, - prefix * 3 - FirstSIPrefixPower);
 
 		typical_width = p.boundingRect(0, 0, INT_MAX, INT_MAX,
 			AlignLeft | AlignTop, format_time(_view.offset(),
-			multiplier, prefix)).width() + MinValueSpacing;
+			prefix)).width() + MinValueSpacing;
 
 		min_width += SpacingIncrement;
 
@@ -118,26 +137,24 @@ void Ruler::paintEvent(QPaintEvent*)
 	const double t0 = first_major_division * tick_period;
 
 	int division = (int)round(first_minor_division -
-		first_major_division * MinorTickSubdivision);
+		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;
 
-	while (1)
-	{
-		const double t = t0 + division * minor_tick_period;
-		const double x = (t - _view.offset()) / _view.scale();
+	double x;
 
-		if (x >= width())
-			break;
+	do {
+		const double t = t0 + division * minor_tick_period;
+		x = (t - _view.offset()) / _view.scale();
 
 		if (division % MinorTickSubdivision == 0)
 		{
 			// Draw a major tick
 			p.drawText(x, ValueMargin, 0, text_height,
 				AlignCenter | AlignTop | TextDontClip,
-				format_time(t, multiplier, prefix));
+				format_time(t, prefix));
 			p.drawLine(QPointF(x, major_tick_y1),
 				QPointF(x, tick_y2));
 		}
@@ -149,10 +166,12 @@ void Ruler::paintEvent(QPaintEvent*)
 		}
 
 		division++;
-	}
+
+	} while (x < width());
 
 	// Draw the cursors
-	draw_cursors(p);
+	if (_view.cursors_shown())
+		_view.cursors().draw_markers(p, rect(), prefix);
 
 	// Draw the hover mark
 	draw_hover_mark(p);
@@ -162,67 +181,49 @@ void Ruler::paintEvent(QPaintEvent*)
 
 void Ruler::mouseMoveEvent(QMouseEvent *e)
 {
-	if (!_grabbed_marker)
-		return;
-
-	_grabbed_marker->set_time(_view.offset() +
-		((double)e->x() + 0.5) * _view.scale());
+	if (shared_ptr<TimeMarker> m = _grabbed_marker.lock())
+		m->set_time(_view.offset() +
+			((double)e->x() + 0.5) * _view.scale());
 }
 
 void Ruler::mousePressEvent(QMouseEvent *e)
 {
 	if (e->buttons() & Qt::LeftButton) {
-		_grabbed_marker = NULL;
+		_grabbed_marker.reset();
+
+		clear_selection();
 
 		if (_view.cursors_shown()) {
-			std::pair<Cursor, Cursor> &cursors =
-				_view.cursors();
-			if (cursors.first.get_label_rect(
+			CursorPair &cursors = _view.cursors();
+			if (cursors.first()->get_label_rect(
 				rect()).contains(e->pos()))
-				_grabbed_marker = &cursors.first;
-			else if (cursors.second.get_label_rect(
+				_grabbed_marker = cursors.first();
+			else if (cursors.second()->get_label_rect(
 				rect()).contains(e->pos()))
-				_grabbed_marker = &cursors.second;
+				_grabbed_marker = cursors.second();
 		}
-	}
-}
 
-void Ruler::mouseReleaseEvent(QMouseEvent *)
-{
-	_grabbed_marker = NULL;
-}
+		if (shared_ptr<TimeMarker> m = _grabbed_marker.lock())
+			m->select();
 
-QString Ruler::format_time(double t, double multiplier,
-	unsigned int prefix)
-{
-	QString s;
-	QTextStream ts(&s);
-	ts.setRealNumberPrecision(0);
-	ts << fixed << forcesign << (t  * multiplier) <<
-		SIPrefixes[prefix] << "s";
-	return s;
+		selection_changed();
+	}
 }
 
-void Ruler::draw_cursors(QPainter &p)
+void Ruler::mouseReleaseEvent(QMouseEvent *)
 {
-	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);
+	_grabbed_marker.reset();
 }
 
 void Ruler::draw_hover_mark(QPainter &p)
 {
 	const int x = _view.hover_point().x();
 
-	if (x == -1 || _grabbed_marker)
+	if (x == -1 || !_grabbed_marker.expired())
 		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[] = {