X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=ee521f0e82a1203438d8a7420ec2336baec89af4;hb=0f95449910ba4022c2f14196163e77cff9620987;hp=3cc2eb173404e0213c87d6161c198f2b00ad94c1;hpb=abad24e2d61c0c84ac8495c22d29a8a3a49ee9fa;p=pulseview.git

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 3cc2eb17..ee521f0e 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -18,10 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "ruler.h"
+#include "ruler.hpp"
 
-#include "view.h"
-#include "pv/util.h"
+#include "view.hpp"
+#include "pv/util.hpp"
 
 #include <extdef.h>
 
@@ -32,7 +32,6 @@ namespace view {
 
 const int Ruler::RulerHeight = 30;
 const int Ruler::MinorTickSubdivision = 4;
-const int Ruler::ScaleUnits[3] = {1, 2, 5};
 
 const int Ruler::HoverArrowSize = 5;
 
@@ -41,7 +40,7 @@ Ruler::Ruler(View &parent) :
 {
 	setMouseTracking(true);
 
-	connect(&_view, SIGNAL(hover_point_changed()),
+	connect(&view_, SIGNAL(hover_point_changed()),
 		this, SLOT(hover_point_changed()));
 }
 
@@ -57,11 +56,8 @@ void Ruler::paintEvent(QPaintEvent*)
 	QPainter p(this);
 	p.setRenderHint(QPainter::Antialiasing);
 
-	std::pair<double, unsigned int> spacing =
-		calculate_tick_spacing(p, _view.scale(), _view.offset());
-
-	double tick_period = spacing.first;
-	unsigned int prefix = spacing.second;
+	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();
@@ -71,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 -
@@ -87,7 +83,7 @@ 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)
 		{
@@ -115,7 +111,7 @@ void Ruler::paintEvent(QPaintEvent*)
 
 void Ruler::draw_hover_mark(QPainter &p)
 {
-	const int x = _view.hover_point().x();
+	const int x = view_.hover_point().x();
 
 	if (x == -1)
 		return;
@@ -137,41 +133,5 @@ void Ruler::hover_point_changed()
 	update();
 }
 
-std::pair<double, unsigned int> Ruler::calculate_tick_spacing(
-	QPainter& p, double scale, double offset)
-{
-	const double SpacingIncrement = 32.0f;
-	const double MinValueSpacing = 32.0f;
-
-	double min_width = SpacingIncrement, typical_width;
-
-	double tick_period;
-	unsigned int prefix;
-
-	do {
-		const double min_period = scale * min_width;
-
-		const int order = (int)floorf(log10f(min_period));
-		const double order_decimal = pow(10.0, order);
-
-		unsigned int unit = 0;
-
-		do {
-			tick_period = order_decimal * ScaleUnits[unit++];
-		} while (tick_period < min_period && unit < countof(ScaleUnits));
-
-		prefix = (order - pv::util::FirstSIPrefixPower) / 3;
-
-		typical_width = p.boundingRect(0, 0, INT_MAX, INT_MAX,
-			AlignLeft | AlignTop, pv::util::format_time(offset,
-			prefix)).width() + MinValueSpacing;
-
-		min_width += SpacingIncrement;
-
-	} while(typical_width > tick_period / scale);
-
-	return std::make_pair(tick_period, prefix);
-}
-
 } // namespace view
 } // namespace pv