X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=934b0a67edc0e5f6a974cd6ad81e64d141d1d910;hp=9e639383942ed1149702f9e369b16452a46eba1f;hb=f9abf97e78bc4825d80926b0ebc6cbaef40768b1;hpb=64b678ba0bf16e3a3c1aceffef170f3dbcc588d3

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 9e639383..934b0a67 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -23,35 +23,32 @@
 #include "cursor.h"
 #include "view.h"
 #include "viewport.h"
+#include "pv/util.h"
 
 #include <extdef.h>
 
-#include <assert.h>
-#include <math.h>
-#include <limits.h>
-
+#include <QApplication>
 #include <QMouseEvent>
 #include <QPainter>
 #include <QTextStream>
 
-using namespace std;
+#include <pv/widgets/popup.h>
+
+using namespace Qt;
+using std::shared_ptr;
 
 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),
-	_grabbed_marker(NULL)
+	MarginWidget(parent),
+	_dragging(false)
 {
 	setMouseTracking(true);
 
@@ -59,23 +56,22 @@ Ruler::Ruler(View &parent) :
 		this, SLOT(hover_point_changed()));
 }
 
-QString Ruler::format_time(double t, unsigned int prefix,
-	unsigned int precision)
+void Ruler::clear_selection()
 {
-	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;
+	CursorPair &cursors = _view.cursors();
+	cursors.first()->select(false);
+	cursors.second()->select(false);
+	update();
+}
+
+
+QSize Ruler::sizeHint() const
+{
+	return QSize(0, RulerHeight);
 }
 
 void Ruler::paintEvent(QPaintEvent*)
 {
-	using namespace Qt;
 
 	const double SpacingIncrement = 32.0f;
 	const double MinValueSpacing = 32.0f;
@@ -95,7 +91,7 @@ void Ruler::paintEvent(QPaintEvent*)
 		const double min_period = _view.scale() * min_width;
 
 		const int order = (int)floorf(log10f(min_period));
-		const double order_decimal = pow(10, order);
+		const double order_decimal = pow(10.0, order);
 
 		unsigned int unit = 0;
 
@@ -104,12 +100,10 @@ void Ruler::paintEvent(QPaintEvent*)
 			tick_period = order_decimal * ScaleUnits[unit++];
 		} while (tick_period < min_period && unit < countof(ScaleUnits));
 
-		prefix = (order - FirstSIPrefixPower) / 3;
-		assert(prefix < countof(SIPrefixes));
-
+		prefix = (order - pv::util::FirstSIPrefixPower) / 3;
 
 		typical_width = p.boundingRect(0, 0, INT_MAX, INT_MAX,
-			AlignLeft | AlignTop, format_time(_view.offset(),
+			AlignLeft | AlignTop, pv::util::format_time(_view.offset(),
 			prefix)).width() + MinValueSpacing;
 
 		min_width += SpacingIncrement;
@@ -147,7 +141,7 @@ void Ruler::paintEvent(QPaintEvent*)
 			// Draw a major tick
 			p.drawText(x, ValueMargin, 0, text_height,
 				AlignCenter | AlignTop | TextDontClip,
-				format_time(t, prefix));
+				pv::util::format_time(t, prefix));
 			p.drawLine(QPointF(x, major_tick_y1),
 				QPointF(x, tick_y2));
 		}
@@ -163,7 +157,8 @@ void Ruler::paintEvent(QPaintEvent*)
 	} while (x < width());
 
 	// Draw the cursors
-	draw_cursors(p, prefix);
+	if (_view.cursors_shown())
+		_view.cursors().draw_markers(p, rect(), prefix);
 
 	// Draw the hover mark
 	draw_hover_mark(p);
@@ -173,52 +168,68 @@ void Ruler::paintEvent(QPaintEvent*)
 
 void Ruler::mouseMoveEvent(QMouseEvent *e)
 {
-	if (!_grabbed_marker)
+	if (!(e->buttons() & Qt::LeftButton))
 		return;
+	
+	if ((e->pos() - _mouse_down_point).manhattanLength() <
+		QApplication::startDragDistance())
+		return;
+
+	_dragging = true;
 
-	_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;
+	if (e->buttons() & Qt::LeftButton)
+	{
+		_mouse_down_point = e->pos();
+
+		_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();
 		}
+
+		if (shared_ptr<TimeMarker> m = _grabbed_marker.lock())
+			m->select();
+
+		selection_changed();
 	}
 }
 
 void Ruler::mouseReleaseEvent(QMouseEvent *)
 {
-	_grabbed_marker = NULL;
-}
-
-void Ruler::draw_cursors(QPainter &p, unsigned int prefix)
-{
-	if (!_view.cursors_shown())
-		return;
+	using pv::widgets::Popup;
+
+	if (!_dragging)
+		if (shared_ptr<TimeMarker> m = _grabbed_marker.lock()) {
+			Popup *const p = m->create_popup(&_view);
+			p->set_position(mapToGlobal(QPoint(m->get_x(),
+				height())), Popup::Bottom);
+			p->show();
+		}
 
-	const QRect r = rect();
-	pair<Cursor, Cursor> &cursors = _view.cursors();
-	cursors.first.paint_label(p, r, prefix);
-	cursors.second.paint_label(p, r, prefix);
+	_dragging = false;
+	_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 || _dragging)
 		return;
 
 	p.setPen(QPen(Qt::NoPen));