Moved all srd commands into decode thread, implemented error messages

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

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index ad7082e63bf35a62d7c785ebfe3395db0d58b5db..bf1507a7fab31d0117e67ec4d18e50db8a0bbab0 100644 (file)
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -30,6 +30,7 @@
 #include <math.h>
 #include <limits.h>
 
+#include <QApplication>
 #include <QMouseEvent>
 #include <QPainter>
 #include <QTextStream>
@@ -73,7 +74,7 @@ QString Ruler::format_time(double t, unsigned int prefix,
        unsigned int precision)
 {
        const double multiplier = pow(10.0,
-               - prefix * 3 - FirstSIPrefixPower);
+               (int)- prefix * 3 - FirstSIPrefixPower);
 
        QString s;
        QTextStream ts(&s);
@@ -105,7 +106,7 @@ void Ruler::paintEvent(QPaintEvent*)
                const double min_period = _view.scale() * min_width;
 
                const int order = (int)floorf(log10f(min_period));
-               const double order_decimal = pow(10, order);
+               const double order_decimal = pow(10.0, order);
 
                unsigned int unit = 0;