X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=9de93f3479e5ea07697b2e57ee785b3bfbf81916;hb=3ccf0f7f5b1b31ac628a983a2becee6f4c4c1507;hp=e00917f64fa4d49086890ce333d924ed76ad77fc;hpb=c677193dc6e691493081fe87476a04e1674093a5;p=pulseview.git

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index e00917f..9de93f3 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -60,7 +60,6 @@ using boost::shared_mutex;
 
 using pv::data::SignalData;
 using pv::data::Segment;
-using pv::util::format_time;
 using pv::util::TimeUnit;
 using pv::util::Timestamp;
 
@@ -557,6 +556,13 @@ void View::calculate_tick_spacing()
 
 	QFontMetrics m(QApplication::font());
 
+	// Copies of the member variables with the same name, used in the calculation
+	// and written back afterwards, so that we don't emit signals all the time
+	// during the calculation.
+	pv::util::Timestamp tick_period = tick_period_;
+	pv::util::SIPrefix tick_prefix = tick_prefix_;
+	unsigned tick_precision = tick_precision_;
+
 	do {
 		const double min_period = scale_ * min_width;
 
@@ -577,19 +583,18 @@ void View::calculate_tick_spacing()
 				(ScaleUnits[unit++] + tp_margin);
 		} while (tp_with_margin < min_period && unit < countof(ScaleUnits));
 
-		set_tick_period(order_decimal * ScaleUnits[unit - 1]);
-		set_tick_prefix(static_cast<pv::util::SIPrefix>(
-			(order - pv::util::exponent(pv::util::SIPrefix::yocto)) / 3));
+		tick_period = order_decimal * ScaleUnits[unit - 1];
+		tick_prefix = static_cast<pv::util::SIPrefix>(
+			(order - pv::util::exponent(pv::util::SIPrefix::yocto)) / 3);
 
 		// Precision is the number of fractional digits required, not
 		// taking the prefix into account (and it must never be negative)
-		set_tick_precision(std::max(
-			ceil(log10(1 / tick_period_)).convert_to<int>(), 0));
+		tick_precision = std::max(ceil(log10(1 / tick_period)).convert_to<int>(), 0);
 
-		tick_period_width = (tick_period_ / scale_).convert_to<double>();
+		tick_period_width = (tick_period / scale_).convert_to<double>();
 
-		const QString label_text =
-			format_time(max_time, tick_prefix_, time_unit_, tick_precision_);
+		const QString label_text = Ruler::format_time_with_distance(
+			tick_period, max_time, tick_prefix, time_unit_, tick_precision);
 
 		label_width = m.boundingRect(0, 0, INT_MAX, INT_MAX,
 			Qt::AlignLeft | Qt::AlignTop, label_text).width() +
@@ -597,6 +602,10 @@ void View::calculate_tick_spacing()
 
 		min_width += SpacingIncrement;
 	} while (tick_period_width < label_width);
+
+	set_tick_period(tick_period);
+	set_tick_prefix(tick_prefix);
+	set_tick_precision(tick_precision);
 }
 
 void View::update_scroll()