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

planner: turn UNIT_FACTOR macro into function

Browse source 
No apparent reason why this is a hard-to-read macro.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-03-08 11:21:02 +01:00 • committed by bstoeger
parent 9a052cd089
commit b542a39a00
1 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
qt-models/diveplannermodel.cpp
View file

@ -25,7 +25,11 @@
#define VARIATIONS_IN_BACKGROUND 1 #define VARIATIONS_IN_BACKGROUND 1
#define UNIT_FACTOR ((prefs.units.length == units::METERS) ? 1000.0 / 60.0 : feet_to_mm(1.0) / 60.0) static double unit_factor()
{
return prefs.units.length == units::METERS ? 1000.0 / 60.0
: feet_to_mm(1.0) / 60.0;
}
static constexpr int decotimestep = 60; // seconds static constexpr int decotimestep = 60; // seconds
@ -587,52 +591,52 @@ void DivePlannerPointsModel::setLastStop6m(bool value)
void DivePlannerPointsModel::setAscrate75Display(int rate) void DivePlannerPointsModel::setAscrate75Display(int rate)
{ {
qPrefDivePlanner::set_ascrate75(lrint(rate * UNIT_FACTOR)); qPrefDivePlanner::set_ascrate75(lrint(rate * unit_factor()));
emitDataChanged(); emitDataChanged();
} }
int DivePlannerPointsModel::ascrate75Display() const int DivePlannerPointsModel::ascrate75Display() const
{ {
return lrint((float)prefs.ascrate75 / UNIT_FACTOR); return lrint((float)prefs.ascrate75 / unit_factor());
} }
void DivePlannerPointsModel::setAscrate50Display(int rate) void DivePlannerPointsModel::setAscrate50Display(int rate)
{ {
qPrefDivePlanner::set_ascrate50(lrint(rate * UNIT_FACTOR)); qPrefDivePlanner::set_ascrate50(lrint(rate * unit_factor()));
emitDataChanged(); emitDataChanged();
} }
int DivePlannerPointsModel::ascrate50Display() const int DivePlannerPointsModel::ascrate50Display() const
{ {
return lrint((float)prefs.ascrate50 / UNIT_FACTOR); return lrint((float)prefs.ascrate50 / unit_factor());
} }
void DivePlannerPointsModel::setAscratestopsDisplay(int rate) void DivePlannerPointsModel::setAscratestopsDisplay(int rate)
{ {
qPrefDivePlanner::set_ascratestops(lrint(rate * UNIT_FACTOR)); qPrefDivePlanner::set_ascratestops(lrint(rate * unit_factor()));
emitDataChanged(); emitDataChanged();
} }
int DivePlannerPointsModel::ascratestopsDisplay() const int DivePlannerPointsModel::ascratestopsDisplay() const
{ {
return lrint((float)prefs.ascratestops / UNIT_FACTOR); return lrint((float)prefs.ascratestops / unit_factor());
} }
void DivePlannerPointsModel::setAscratelast6mDisplay(int rate) void DivePlannerPointsModel::setAscratelast6mDisplay(int rate)
{ {
qPrefDivePlanner::set_ascratelast6m(lrint(rate * UNIT_FACTOR)); qPrefDivePlanner::set_ascratelast6m(lrint(rate * unit_factor()));
emitDataChanged(); emitDataChanged();
} }
int DivePlannerPointsModel::ascratelast6mDisplay() const int DivePlannerPointsModel::ascratelast6mDisplay() const
{ {
return lrint((float)prefs.ascratelast6m / UNIT_FACTOR); return lrint((float)prefs.ascratelast6m / unit_factor());
} }
void DivePlannerPointsModel::setDescrateDisplay(int rate) void DivePlannerPointsModel::setDescrateDisplay(int rate)
{ {
qPrefDivePlanner::set_descrate(lrint(rate * UNIT_FACTOR)); qPrefDivePlanner::set_descrate(lrint(rate * unit_factor()));
emitDataChanged(); emitDataChanged();
} }
int DivePlannerPointsModel::descrateDisplay() const int DivePlannerPointsModel::descrateDisplay() const
{ {
return lrint((float)prefs.descrate / UNIT_FACTOR); return lrint((float)prefs.descrate / unit_factor());
} }
void DivePlannerPointsModel::setVerbatim(bool value) void DivePlannerPointsModel::setVerbatim(bool value)