X-Git-Url: http://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;fp=pv%2Fview%2Fruler.cpp;h=5f7b1f67faade83e7d3acf388e8230d26a7d07fa;hp=6f8e89a5b69833ad3449167f0599dc87b87794a4;hb=c677193dc6e691493081fe87476a04e1674093a5;hpb=4b0af0b67fe57e0880bcb8aa13b4fa807f3aaac0

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 6f8e89a5..5f7b1f67 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -156,7 +156,7 @@ void Ruler::paintEvent(QPaintEvent*)
 }
 
 Ruler::TickPositions Ruler::calculate_tick_positions(
-	const double major_period,
+	const pv::util::Timestamp& major_period,
 	const pv::util::Timestamp& offset,
 	const double scale,
 	const int width,
@@ -164,7 +164,8 @@ Ruler::TickPositions Ruler::calculate_tick_positions(
 {
 	TickPositions tp;
 
-	const double minor_period = major_period / MinorTickSubdivision;
+	const double minor_period =
+		(major_period / MinorTickSubdivision).convert_to<double>();
 	const pv::util::Timestamp first_major_division = floor(offset / major_period);
 	const pv::util::Timestamp first_minor_division = ceil(offset / minor_period);
 	const pv::util::Timestamp t0 = first_major_division * major_period;
@@ -175,10 +176,12 @@ Ruler::TickPositions Ruler::calculate_tick_positions(
 	double x;
 
 	do {
-		const pv::util::Timestamp t = t0 + division * minor_period;
+		pv::util::Timestamp t = t0 + division * minor_period;
 		x = ((t - offset) / scale).convert_to<double>();
 
 		if (division % MinorTickSubdivision == 0) {
+			// Recalculate 't' without using 'minor_period' which is of type double.
+			t = t0 + division / MinorTickSubdivision * major_period;
 			tp.major.emplace_back(x, format_function(t));
 		} else {
 			tp.minor.emplace_back(x);