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

More consistency improvements

Browse source 
Treat SAC and OTU consistently:
- SAC is now a member of struct dive
- it's calculated / populated at the same time with a helper function with
  consistent API

Create get_volume_units function that returns volumes (e.g. used in SAC
rates) based on preferred units - make sure we have these conversions just
once in the code.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2011-11-01 19:56:14 -07:00
parent 18b8247cb3
commit a487f6c931
3 changed files with 38 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dive.h
View file

@ -87,8 +87,14 @@ typedef struct {
} cylinder_t;
extern double get_depth_units(unsigned int mm, int *frac, const char **units);
extern double get_volume_units(unsigned int mm, int *frac, const char **units);
extern double get_temp_units(unsigned int mm, const char **units);
static inline double ml_to_cuft(int ml)
{
return ml / 28317.0;
}
static inline double mm_to_feet(int mm)
{
return mm * 0.00328084;
@ -177,7 +183,7 @@ struct dive {
depth_t visibility;
temperature_t airtemp, watertemp;
cylinder_t cylinder[MAX_CYLINDERS];
int otu;
int sac, otu;
struct event *events;
int samples, alloc_samples;
struct sample sample[];