mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use M_OR_FT macro instead of switch statement

Browse source 
This is easier to read and also avoids an incorrect gcc warning.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-12-20 09:20:18 -08:00
parent f0da41c937
commit 4ab58d6b47
3 changed files with 4 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
helpers.h
View file

@ -35,6 +35,8 @@ QString get_trip_date_string(timestamp_t when, int nr);
extern DiveComputerList dcList; extern DiveComputerList dcList;
#define M_OR_FT(_m,_f) ((prefs.units.length == units::METERS) ? ((_m) * 1000) : (feet_to_mm(_f)))
#if defined __APPLE__ #if defined __APPLE__
#define TITLE_OR_TEXT(_t,_m) "", _t + "\n" + _m #define TITLE_OR_TEXT(_t,_m) "", _t + "\n" + _m
#else #else

2
qt-ui/diveplanner.cpp
View file

@ -30,8 +30,6 @@
#define MAX_DEPTH M_OR_FT(150, 450) #define MAX_DEPTH M_OR_FT(150, 450)
#define MIN_DEPTH M_OR_FT(20, 60) #define MIN_DEPTH M_OR_FT(20, 60)
#define M_OR_FT(_m,_f) ((prefs.units.length == units::METERS) ? ((_m) * 1000) : (feet_to_mm(_f)))
QString gasToStr(const int o2Permille, const int hePermille) { QString gasToStr(const int o2Permille, const int hePermille) {
uint o2 = (o2Permille + 5) / 10, he = (hePermille + 5) / 10; uint o2 = (o2Permille + 5) / 10, he = (hePermille + 5) / 10;
QString result = is_air(o2Permille, hePermille) ? QObject::tr("AIR") QString result = is_air(o2Permille, hePermille) ? QObject::tr("AIR")

15
qt-ui/profilegraphics.cpp
View file

@ -505,11 +505,7 @@ void ProfileGraphicsView::plot_depth_scale()
/* Depth markers: every 30 ft or 10 m*/ /* Depth markers: every 30 ft or 10 m*/
maxdepth = get_maxdepth(&gc.pi); maxdepth = get_maxdepth(&gc.pi);
gc.topy = 0; gc.bottomy = maxdepth; gc.topy = 0; gc.bottomy = maxdepth;
marker = M_OR_FT(10,30);
switch (prefs.units.length) {
case units::METERS: marker = 10000; break;
case units::FEET: marker = 9144; break; /* 30 ft */
}
/* don't write depth labels all the way to the bottom as /* don't write depth labels all the way to the bottom as
* there may be other graphs below the depth plot (like * there may be other graphs below the depth plot (like
@ -1155,14 +1151,7 @@ void ProfileGraphicsView::plot_depth_profile()
/* Depth markers: every 30 ft or 10 m*/ /* Depth markers: every 30 ft or 10 m*/
gc.leftx = 0; gc.rightx = 1.0; gc.leftx = 0; gc.rightx = 1.0;
gc.topy = 0; gc.bottomy = maxdepth; gc.topy = 0; gc.bottomy = maxdepth;
switch (prefs.units.length) { marker = M_OR_FT(10,30);
case units::METERS:
marker = 10000;
break;
case units::FEET:
marker = 9144;
break; /* 30 ft */
}
maxline = qMax(gc.pi.maxdepth + marker, maxdepth * 2 / 3); maxline = qMax(gc.pi.maxdepth + marker, maxdepth * 2 / 3);
c = getColor(DEPTH_GRID); c = getColor(DEPTH_GRID);