diff options
| author |  Jeremie Guichard <djebrest@gmail.com> | 2017-03-23 08:13:49 +0700 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-03-24 09:39:25 -0700 |
| commit | 597539ce39ab1054851f5aa96daa0fff29699e8f (patch) | |
| tree | 281045e31b92d9952055c954a45883dcb8e02ca3 /profile-widget/divetooltipitem.cpp | |
| parent | d83449f3b56c5dbdfbe0f8e5ae908179ba1d6419 (diff) | |
| download | subsurface-597539ce39ab1054851f5aa96daa0fff29699e8f.tar.gz | |
Fix double to int truncation in C++ code
Wfloat-conversion enabled for C++ part of the code
Fix warnings raised by the flag using lrint
Original issue reported on the mailing list:
The ascent/descent rates are sometimes not what is expected.
E.g. setting the ascent rate to 10m/min results in an actual
ascent rate of 9m/min.
This is due to truncating the ascent rate preference,
then effectively rounding up the time to reach each stop to 2s intervals.
The result being that setting the ascent rate to 10m/min
results in 20s to ascend 3m (9m/min), when it should be exactly 18s.
Reported-by: John Smith <noseygit@hotmail.com>
Reported-by: Rick Walsh <rickmwalsh@gmail.com>
Signed-off-by: Jeremie Guichard <djebrest@gmail.com>
Diffstat (limited to 'profile-widget/divetooltipitem.cpp')
| -rw-r--r-- | profile-widget/divetooltipitem.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/profile-widget/divetooltipitem.cpp b/profile-widget/divetooltipitem.cpp index 4b422fe81..36b1a9b91 100644 --- a/profile-widget/divetooltipitem.cpp +++ b/profile-widget/divetooltipitem.cpp @@ -108,7 +108,7 @@ void ToolTipItem::expand() width = title->boundingRect().width() + sp2; // clip the height if (entryToolTip.first) { - const int minH = entryToolTip.first->y() + entryToolTip.first->pixmap().height() + sp2; + const int minH = lrint(entryToolTip.first->y() + entryToolTip.first->pixmap().height() + sp2); if (height < minH) height = minH; } else if (height < iconMetrics.sz_small) { @@ -245,7 +245,7 @@ void ToolTipItem::refresh(const QPointF &pos) return; refreshTime.start(); - int time = timeAxis->valueAt(pos); + int time = lrint(timeAxis->valueAt(pos)); if (time == lastTime) return; @@ -269,9 +269,9 @@ void ToolTipItem::refresh(const QPointF &pos) painter.setPen(QColor(0, 0, 0, 255)); if (decoMode() == BUEHLMANN) - painter.drawLine(0, 60 - entry->gfline / 2, 16, 60 - entry->gfline / 2); - painter.drawLine(0, 60 - AMB_PERCENTAGE * (entry->pressures.n2 + entry->pressures.he) / entry->ambpressure / 2, - 16, 60 - AMB_PERCENTAGE * (entry->pressures.n2 + entry->pressures.he) / entry->ambpressure /2); + painter.drawLine(0, lrint(60 - entry->gfline / 2), 16, lrint(60 - entry->gfline / 2)); + painter.drawLine(0, lrint(60 - AMB_PERCENTAGE * (entry->pressures.n2 + entry->pressures.he) / entry->ambpressure / 2), + 16, lrint(60 - AMB_PERCENTAGE * (entry->pressures.n2 + entry->pressures.he) / entry->ambpressure /2)); painter.setPen(QColor(0, 0, 0, 127)); for (int i=0; i<16; i++) { painter.drawLine(i, 60, i, 60 - entry->percentages[i] / 2); |