Add a spin box widget for timestamp values

[pulseview.git] / pv / view / ruler.cpp

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 2f9b140eec8d0f9d1649155166b89f3a0638e5cd..2cd1275348d737f9f2f3c6fd1868c977118fe7aa 100644 (file)
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -91,16 +91,15 @@ void Ruler::paintEvent(QPaintEvent*)
        p.setRenderHint(QPainter::Antialiasing);
 
        const double tick_period = view_.tick_period();
-       const unsigned int prefix = view_.tick_prefix();
 
        // Draw the tick marks
        p.setPen(palette().color(foregroundRole()));
 
        const double minor_tick_period = tick_period / MinorTickSubdivision;
        const double first_major_division =
-               floor(view_.offset() / tick_period);
+               floor(view_.offset() / tick_period).convert_to<double>();
        const double first_minor_division =
-               ceil(view_.offset() / minor_tick_period);
+               ceil(view_.offset() / minor_tick_period).convert_to<double>();
        const double t0 = first_major_division * tick_period;
 
        int division = (int)round(first_minor_division -
@@ -115,14 +114,15 @@ 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()).convert_to<double>();
 
                if (division % MinorTickSubdivision == 0)
                {
                        // Draw a major tick
                        p.drawText(x, ValueMargin, 0, text_height,
                                AlignCenter | AlignTop | TextDontClip,
-                               pv::util::format_time(t, prefix));
+                               util::format_time(t, view_.tick_prefix(), view_.time_unit(),
+                                       view_.tick_precision()));
                        p.drawLine(QPointF(x, major_tick_y1),
                                QPointF(x, ruler_height));
                }