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

Fix dive planner sidebar depth units

Browse source 
The dive planner always showed the depth in our internal units, ie
millimeter, in the sidebar that showed the plan points.

That made little sense in metric mode, and none at all in imperial. The
_graph_ showed things in meter and feet.

So make the DivePlannerPointsModel always convert things to and from the
user units.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Linus Torvalds 2013-10-11 16:39:40 -07:00 • committed by Dirk Hohndel
parent d031b54d16
commit 58b668c714
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dive.c
View file

@ -101,6 +101,13 @@ double get_volume_units(unsigned int ml, int *frac, const char **units)
return vol;
}
unsigned int units_to_depth(double depth)
{
if (get_units()->length == METERS)
return rint(depth * 1000);
return feet_to_mm(depth);
}
double get_depth_units(unsigned int mm, int *frac, const char **units)
{
int decimals;

2
dive.h
View file

@ -185,6 +185,8 @@ extern double get_temp_units(unsigned int mk, const char **units);
extern double get_weight_units(unsigned int grams, int *frac, const char **units);
extern double get_vertical_speed_units(unsigned int mms, int *frac, const char **units);
extern unsigned int units_to_depth(double depth);
static inline double grams_to_lbs(int grams)
{
return grams / 453.6;

4
qt-ui/diveplanner.cpp
View file

@ -937,7 +937,7 @@ QVariant DivePlannerPointsModel::data(const QModelIndex& index, int role) const
divedatapoint p = divepoints.at(index.row());
switch(index.column()) {
case CCSETPOINT: return p.po2;
case DEPTH: return p.depth;
case DEPTH: return rint(get_depth_units(p.depth, NULL, NULL));
case DURATION: return p.time / 60;
case GAS: return strForAir(p);
}
@ -956,7 +956,7 @@ bool DivePlannerPointsModel::setData(const QModelIndex& index, const QVariant& v
if(role == Qt::EditRole) {
divedatapoint& p = divepoints[index.row()];
switch(index.column()) {
case DEPTH: p.depth = value.toInt(); break;
case DEPTH: p.depth = units_to_depth(value.toInt()); break;
case DURATION: p.time = value.toInt() * 60; break;
case CCSETPOINT:{
int po2 = 0;