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

Merge branch 'weight' of git://subsurface.hohndel.org/subsurface

Browse source 
Pull weight management from Dirk Hohndel:
 "This is the fifth or sixth version of this code, I'm begining to lose
  track.  I still struggle with the balance between code duplication and
  unnecessary indirectness and complexity.  Maybe I'm just not finding
  the right level of abstraction.  Maybe I'm just trying too hard.

  The code here is reasonably well tested.  Works for me :-)

  It can import DivingLog xml files with weight systems and correctly
  parses those.  It obviously can read and write weight systems in its
  own file format.  It adds a KG/lbs unit default (and correctly stores
  that).

  The thing I still worry about is the code in equipment.c.  You'll see
  that I tried to abstract things in a way that weight systems and
  cylinders share quite a bit of code - but there's more very similar
  code that isn't shared as my attempts to do so turned into ugly and
  hard to read code.  It always felt like trying to write C++ in C..."

* 'weight' of git://subsurface.hohndel.org/subsurface:
  Add weight system tracking

Fix up some trivial conflicts due to various renaming of globals and
simplification in function interfaces.
This commit is contained in:
Linus Torvalds 2012-03-23 21:07:53 -07:00
commit 81fddfa67e
5 changed files with 648 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

20
dive.h
View file

@ -87,13 +87,29 @@ typedef struct {
pressure_t start, end, sample_start, sample_end;
} cylinder_t;
extern int cylinder_none(cylinder_t *cyl);
typedef struct {
weight_t weight;
const char *description; /* "integrated", "belt", "ankle" */
} weightsystem_t;
extern int cylinder_none(void *_data);
extern int weightsystem_none(void *_data);
extern int get_pressure_units(unsigned int mb, const char **units);
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 grams_to_lbs(int grams)
{
return grams / 453.6;
}
static inline int lbs_to_grams(double lbs)
{
return lbs * 453.6 + 0.5;
}
static inline double ml_to_cuft(int ml)
{
return ml / 28316.8466;
@ -194,6 +210,7 @@ struct event {
};
#define MAX_CYLINDERS (8)
#define MAX_WEIGHTSYSTEMS (4)
struct dive {
int number;
@ -208,6 +225,7 @@ struct dive {
depth_t visibility;
temperature_t airtemp, watertemp;
cylinder_t cylinder[MAX_CYLINDERS];
weightsystem_t weightsystem[MAX_WEIGHTSYSTEMS];
int sac, otu;
struct event *events;
int samples, alloc_samples;