diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2013-05-10 08:56:56 -0700 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2013-05-10 08:59:09 -0700 |
commit | bfef1d021970c57ce007fb4c29d62b0a1f4e13a2 (patch) | |
tree | 2d9129c677121e54a8cb5d4da09b3466f006fef6 | |
parent | 9a403330673ffe1812a46e2afe4f473ca39f672b (diff) | |
download | subsurface-bfef1d021970c57ce007fb4c29d62b0a1f4e13a2.tar.gz |
Fix some compiler warnings
Passing the alignment as int instead of float or double was actually a bug
as CENTER is defined as (-0.5) ...
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r-- | profile.h | 2 | ||||
-rw-r--r-- | qt-ui/profilegraphics.cpp | 4 | ||||
-rw-r--r-- | qt-ui/profilegraphics.h | 2 |
3 files changed, 3 insertions, 5 deletions
@@ -14,7 +14,7 @@ struct graphics_context; struct plot_info; struct plot_data { unsigned int in_deco:1; - unsigned int cylinderindex; + int cylinderindex; int sec; /* pressure[0] is sensor pressure * pressure[1] is interpolated pressure */ diff --git a/qt-ui/profilegraphics.cpp b/qt-ui/profilegraphics.cpp index 71aebd19f..5607cb3b8 100644 --- a/qt-ui/profilegraphics.cpp +++ b/qt-ui/profilegraphics.cpp @@ -550,7 +550,7 @@ void ProfileGraphicsView::plot_cylinder_pressure_text() } } -void ProfileGraphicsView::plot_pressure_value(int mbar, int sec, int xalign, int yalign) +void ProfileGraphicsView::plot_pressure_value(int mbar, int sec, double xalign, double yalign) { int pressure; const char *unit; @@ -1234,7 +1234,6 @@ void ToolTipItem::setRect(const QRectF& r) void ToolTipItem::collapse() { - QRectF newRect = childrenBoundingRect(); QPropertyAnimation *animation = new QPropertyAnimation(this, "rect"); animation->setDuration(100); animation->setStartValue(boundingRect()); @@ -1244,7 +1243,6 @@ void ToolTipItem::collapse() void ToolTipItem::expand() { - QRectF currentRect = rectangle; QRectF nextRectangle; double width = 0, height = title->boundingRect().height() + SPACING; diff --git a/qt-ui/profilegraphics.h b/qt-ui/profilegraphics.h index 288c9230a..a2033ca75 100644 --- a/qt-ui/profilegraphics.h +++ b/qt-ui/profilegraphics.h @@ -83,7 +83,7 @@ private: void plot_text_samples(); void plot_depth_sample(struct plot_data *entry, text_render_options_t *tro); void plot_cylinder_pressure_text(); - void plot_pressure_value(int mbar, int sec, int xalign, int yalign); + void plot_pressure_value(int mbar, int sec, double xalign, double yalign); void plot_deco_text(); void plot_pp_gas_profile(); void plot_pp_text(); |