mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
core: pass depth_t to get_depth_units()
Commit is longer than expected, because a few of the callers were converted to use depth_t instead of int. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
parent
1d14b03935
commit
992e258524
21 changed files with 82 additions and 84 deletions
|
@ -95,7 +95,7 @@ depth_t units_to_depth(double depth)
|
|||
return internaldepth;
|
||||
}
|
||||
|
||||
double get_depth_units(int mm, int *frac, const char **units)
|
||||
double get_depth_units(depth_t depth, int *frac, const char **units)
|
||||
{
|
||||
int decimals;
|
||||
double d;
|
||||
|
@ -105,12 +105,12 @@ double get_depth_units(int mm, int *frac, const char **units)
|
|||
switch (units_p->length) {
|
||||
case units::METERS:
|
||||
default:
|
||||
d = mm / 1000.0;
|
||||
d = depth.mm / 1000.0;
|
||||
unit = translate("gettextFromC", "m");
|
||||
decimals = d < 20;
|
||||
break;
|
||||
case units::FEET:
|
||||
d = mm_to_feet(mm);
|
||||
d = mm_to_feet(depth.mm);
|
||||
unit = translate("gettextFromC", "ft");
|
||||
decimals = 0;
|
||||
break;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue