summaryrefslogtreecommitdiff
path: root/DSLogic-gui/pv/view/ruler.cpp
diff options
context:
space:
mode:
authorSven Wegener <sven.wegener@stealer.net>2014-06-30 09:38:31 +0200
committerSven Wegener <sven.wegener@stealer.net>2014-06-30 09:38:31 +0200
commit79de83205964ee0182940ef7cec86b46896ed0e6 (patch)
treeccf532205a550ac926e52069649a1cc41aa555a6 /DSLogic-gui/pv/view/ruler.cpp
parent3de7dbb24c71c0d894dbd734ddf9258683d9e2e1 (diff)
Update from DSLogic-v0.3.tar.gzHEADmaster
Signed-off-by: Sven Wegener <sven.wegener@stealer.net>
Diffstat (limited to 'DSLogic-gui/pv/view/ruler.cpp')
-rw-r--r--DSLogic-gui/pv/view/ruler.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/DSLogic-gui/pv/view/ruler.cpp b/DSLogic-gui/pv/view/ruler.cpp
index 1441318..f049beb 100644
--- a/DSLogic-gui/pv/view/ruler.cpp
+++ b/DSLogic-gui/pv/view/ruler.cpp
@@ -99,7 +99,7 @@ QString Ruler::format_freq(double period, unsigned precision)
assert(order >= FirstSIPrefixPower);
const unsigned int prefix = ceil((order - FirstSIPrefixPower) / 3.0f);
const double multiplier = pow(10.0,
- - prefix * 3 - FirstSIPrefixPower);
+ static_cast<double>(- prefix * 3 - FirstSIPrefixPower));
QString s;
QTextStream ts(&s);
@@ -114,7 +114,7 @@ QString Ruler::format_time(double t, unsigned int prefix,
unsigned int precision)
{
const double multiplier = pow(10.0,
- - prefix * 3 - FirstSIPrefixPower);
+ static_cast<double>(- prefix * 3 - FirstSIPrefixPower));
QString s;
QTextStream ts(&s);
@@ -318,7 +318,7 @@ void Ruler::draw_tick_mark(QPainter &p)
//const int order = (int)floorf(log10f(_min_period));
const int order = ceil(log10f(_min_period));
- const double order_decimal = pow(10, order);
+ const double order_decimal = pow(10.0, static_cast<double>(order));
unsigned int unit = 0;