X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=ee521f0e82a1203438d8a7420ec2336baec89af4;hp=74bc1f979b5ee7b8f04a4643ad8f455bb9d3c1ab;hb=f3d66e52ed6b454ea7a0662d5e6367e230116a2b;hpb=58864c5c5dffac4254f199356aaeb5eabd608630

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 74bc1f97..ee521f0e 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -18,34 +18,20 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "ruler.h"
+#include "ruler.hpp"
 
-#include "cursor.h"
-#include "view.h"
-#include "viewport.h"
+#include "view.hpp"
+#include "pv/util.hpp"
 
 #include <extdef.h>
 
-#include <assert.h>
-#include <math.h>
-#include <limits.h>
-
-#include <QMouseEvent>
-#include <QPainter>
-#include <QTextStream>
-
-using namespace boost;
-using namespace std;
+using namespace Qt;
 
 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;
 
@@ -54,74 +40,24 @@ Ruler::Ruler(View &parent) :
 {
 	setMouseTracking(true);
 
-	connect(&_view, SIGNAL(hover_point_changed()),
+	connect(&view_, SIGNAL(hover_point_changed()),
 		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)
+QSize Ruler::sizeHint() const
 {
-	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;
+	return QSize(0, RulerHeight);
 }
 
 void Ruler::paintEvent(QPaintEvent*)
 {
-	using namespace Qt;
-
-	const double SpacingIncrement = 32.0f;
-	const double MinValueSpacing = 32.0f;
 	const int ValueMargin = 3;
 
 	QPainter p(this);
 	p.setRenderHint(QPainter::Antialiasing);
 
-	double min_width = SpacingIncrement, typical_width;
-	double tick_period;
-	unsigned int prefix;
-
-	// Find tick spacing, and number formatting that does not cause
-	// value to collide.
-	do
-	{
-		const double min_period = _view.scale() * min_width;
-
-		const int order = (int)floorf(log10f(min_period));
-		const double order_decimal = pow(10, order);
-
-		unsigned int unit = 0;
-
-		do
-		{
-			tick_period = order_decimal * ScaleUnits[unit++];
-		} while (tick_period < min_period && unit < countof(ScaleUnits));
-
-		prefix = (order - FirstSIPrefixPower) / 3;
-		assert(prefix < countof(SIPrefixes));
-
-
-		typical_width = p.boundingRect(0, 0, INT_MAX, INT_MAX,
-			AlignLeft | AlignTop, format_time(_view.offset(),
-			prefix)).width() + MinValueSpacing;
-
-		min_width += SpacingIncrement;
-
-	} while(typical_width > tick_period / _view.scale());
+	const double tick_period = view_.tick_period();
+	const unsigned int prefix = view_.tick_prefix();
 
 	const int text_height = p.boundingRect(0, 0, INT_MAX, INT_MAX,
 		AlignLeft | AlignTop, "8").height();
@@ -131,9 +67,9 @@ void Ruler::paintEvent(QPaintEvent*)
 
 	const double minor_tick_period = tick_period / MinorTickSubdivision;
 	const double first_major_division =
-		floor(_view.offset() / tick_period);
+		floor(view_.offset() / tick_period);
 	const double first_minor_division =
-		ceil(_view.offset() / minor_tick_period);
+		ceil(view_.offset() / minor_tick_period);
 	const double t0 = first_major_division * tick_period;
 
 	int division = (int)round(first_minor_division -
@@ -147,14 +83,14 @@ void Ruler::paintEvent(QPaintEvent*)
 
 	do {
 		const double t = t0 + division * minor_tick_period;
-		x = (t - _view.offset()) / _view.scale();
+		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, prefix));
+				pv::util::format_time(t, prefix));
 			p.drawLine(QPointF(x, major_tick_y1),
 				QPointF(x, tick_y2));
 		}
@@ -169,57 +105,15 @@ void Ruler::paintEvent(QPaintEvent*)
 
 	} while (x < width());
 
-	// Draw the cursors
-	if (_view.cursors_shown())
-		_view.cursors().draw_markers(p, rect(), prefix);
-
 	// Draw the hover mark
 	draw_hover_mark(p);
-
-	p.end();
-}
-
-void Ruler::mouseMoveEvent(QMouseEvent *e)
-{
-	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.reset();
-
-		clear_selection();
-
-		if (_view.cursors_shown()) {
-			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(
-				rect()).contains(e->pos()))
-				_grabbed_marker = cursors.second();
-		}
-
-		if (shared_ptr<TimeMarker> m = _grabbed_marker.lock())
-			m->select();
-
-		selection_changed();
-	}
-}
-
-void Ruler::mouseReleaseEvent(QMouseEvent *)
-{
-	_grabbed_marker.reset();
 }
 
 void Ruler::draw_hover_mark(QPainter &p)
 {
-	const int x = _view.hover_point().x();
+	const int x = view_.hover_point().x();
 
-	if (x == -1 || !_grabbed_marker.expired())
+	if (x == -1)
 		return;
 
 	p.setPen(QPen(Qt::NoPen));