X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fruler.hpp;h=cf63eaff7c7cb27ae0b2ec451801bda05b23677d;hp=d01b151243aeb2ea3c9a32ab8a3077cf20a76677;hb=2220e94218298b208041c5e828595d9e1b842c88;hpb=4b0af0b67fe57e0880bcb8aa13b4fa807f3aaac0

diff --git a/pv/view/ruler.hpp b/pv/view/ruler.hpp
index d01b1512..cf63eaff 100644
--- a/pv/view/ruler.hpp
+++ b/pv/view/ruler.hpp
@@ -29,6 +29,12 @@
 #include "marginwidget.hpp"
 #include <pv/util.hpp>
 
+namespace RulerTest {
+class tick_position_test_0;
+class tick_position_test_1;
+class tick_position_test_2;
+}
+
 namespace pv {
 namespace view {
 
@@ -39,6 +45,10 @@ class Ruler : public MarginWidget
 {
 	Q_OBJECT
 
+	friend class RulerTest::tick_position_test_0;
+	friend class RulerTest::tick_position_test_1;
+	friend class RulerTest::tick_position_test_2;
+
 private:
 
 	/// Height of the ruler in multipes of the text height
@@ -62,6 +72,39 @@ public:
 	 */
 	QSize extended_size_hint() const;
 
+	/**
+	 * Formats a timestamp depending on its distance to another timestamp.
+	 *
+	 * Heuristic function, useful when multiple timestamps should be put side by
+	 * side. The function procedes in the following order:
+	 *   - If 't' is zero, "0" is returned.
+	 *   - If 'unit' is 'TimeUnit::Samples', 'pv::util::format_time_si_adjusted()'
+	 *     is used to format 't'.
+	 *   - If a zoomed out view is detected (determined by 'precision' and
+	 *     'distance'), 'pv::util::format_time_minutes() is used.
+	 *   - For timestamps "near the origin" (determined by 'distance'),
+	 *    'pv::util::format_time_si_adjusted()' is used.
+	 *   - If none of the previous was true, 'pv::util::format_time_minutes()'
+	 *     is used again.
+	 *
+	 * @param distance The distance between the timestamp to format and
+	 *        an adjacent one.
+	 * @param t The value to format
+	 * @param prefix The SI prefix to use.
+	 * @param unit The representation of the timestamp value.
+	 * @param precision The number of digits after the decimal separator.
+	 * @param sign Whether or not to add a sign also for positive numbers.
+	 *
+	 * @return The formated value.
+	 */
+	static QString format_time_with_distance(
+		const pv::util::Timestamp& distance,
+		const pv::util::Timestamp& t,
+		pv::util::SIPrefix prefix = pv::util::SIPrefix::unspecified,
+		pv::util::TimeUnit unit = pv::util::TimeUnit::Time,
+		unsigned precision = 0,
+		bool sign = true);
+
 private:
 	/**
 	 * Gets the time items.
@@ -77,7 +120,6 @@ private:
 	std::shared_ptr<pv::view::ViewItem> get_mouse_over_item(
 		const QPoint &pt);
 
-private:
 	void paintEvent(QPaintEvent *event);
 
 	void mouseDoubleClickEvent(QMouseEvent *e);
@@ -116,7 +158,7 @@ private:
 	 *         tick positions.
 	 */
 	static TickPositions calculate_tick_positions(
-		const double major_period,
+		const pv::util::Timestamp& major_period,
 		const pv::util::Timestamp& offset,
 		const double scale,
 		const int width,