diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-02-11 11:22:00 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-02-12 11:18:12 -0800 |
| commit | dcfda29da6d5539c602935f3518749942dad2153 (patch) | |
| tree | 09d16c0933950f450c96af489c2d167a3db36648 | |
| parent | 9edb7811ef3366cf5ee378a07adb7121fab8630a (diff) | |
| download | subsurface-dcfda29da6d5539c602935f3518749942dad2153.tar.gz | |
Add dive site data structure
This leaves location and gps coordinates in the struct dive to allow a
step by step migration.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | dive.h | 1 | ||||
| -rw-r--r-- | divesite.c | 2 | ||||
| -rw-r--r-- | divesite.h | 47 | ||||
| -rw-r--r-- | subsurface.pro | 2 |
4 files changed, 52 insertions, 0 deletions
@@ -319,6 +319,7 @@ struct dive { bool downloaded; timestamp_t when; char *location; + uint32_t dive_site_uuid; char *notes; char *divemaster, *buddy; int rating; diff --git a/divesite.c b/divesite.c new file mode 100644 index 000000000..1d3bb1c0d --- /dev/null +++ b/divesite.c @@ -0,0 +1,2 @@ +/* divesite.c */ +#include "divesite.h" diff --git a/divesite.h b/divesite.h new file mode 100644 index 000000000..e11a10738 --- /dev/null +++ b/divesite.h @@ -0,0 +1,47 @@ +#ifndef DIVESITE_H +#define DIVESITE_H + +#include "units.h" +#include <stdlib.h> + +struct dive_site +{ + uint32_t uuid; + char *name; + degrees_t latitude, longitude; + char *description; + char *notes; +}; + +struct dive_site_table { + int nr, allocated; + struct dive_site **dive_sites; +}; + +extern struct dive_site_table dive_site_table; + +static inline struct dive_site *get_dive_site(int nr) +{ + if (nr >= dive_site_table.nr || nr < 0) + return NULL; + return dive_site_table.dive_sites[nr]; +} + +static inline struct dive_site *get_dive_site_by_uuid(uint32_t uuid) +{ + for (int i = 0; i < dive_site_table.nr; i++) + if (get_dive_site(i)->uuid == uuid) + return get_dive_site(i); + return NULL; +} + +/* there could be multiple sites of the same name - return the first one */ +static inline struct dive_site *get_dive_site_by_name(const char *name) +{ + for (int i = 0; i < dive_site_table.nr; i++) + if (get_dive_site(i)->name == name) + return get_dive_site(i); + return NULL; +} + +#endif // DIVESITE_H diff --git a/subsurface.pro b/subsurface.pro index 2469b8aa9..4853796c0 100644 --- a/subsurface.pro +++ b/subsurface.pro @@ -29,6 +29,7 @@ HEADERS = \ display.h \ dive.h \ divelist.h \ + divesite.h \ file.h \ gettextfromc.h \ gettext.h \ @@ -119,6 +120,7 @@ SOURCES = \ device.c \ dive.c \ divelist.c \ + divesite.c \ equipment.c \ file.c \ gettextfromc.cpp \ |