mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-05 00:21:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

core: convert divecomputer.c to C++

Browse source 
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-05-01 18:21:06 +02:00
parent 7befde6c94
commit 25bcd6e543
3 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Subsurface-mobile.pro
View file

@ -49,7 +49,7 @@ SOURCES += subsurface-mobile-main.cpp \
core/profile.cpp \ core/profile.cpp \
core/device.cpp \ core/device.cpp \
core/dive.cpp \ core/dive.cpp \
core/divecomputer.c \ core/divecomputer.cpp \
core/divefilter.cpp \ core/divefilter.cpp \
core/event.c \ core/event.c \
core/eventtype.cpp \ core/eventtype.cpp \

2
core/CMakeLists.txt
View file

@ -61,7 +61,7 @@ set(SUBSURFACE_CORE_LIB_SRCS
devicedetails.h devicedetails.h
dive.cpp dive.cpp
dive.h dive.h
divecomputer.c divecomputer.cpp
divecomputer.h divecomputer.h
dive.h dive.h
divefilter.cpp divefilter.cpp

64
core/divecomputer.c → core/divecomputer.cpp
View file

@ -117,7 +117,7 @@ static void fill_samples_no_avg(struct sample *s, int max_d, int max_t, double s
} }
} }
void fake_dc(struct divecomputer *dc) extern "C" void fake_dc(struct divecomputer *dc)
{ {
alloc_samples(dc, 6); alloc_samples(dc, 6);
struct sample *fake = dc->sample; struct sample *fake = dc->sample;
@ -154,7 +154,7 @@ void fake_dc(struct divecomputer *dc)
if (avg_d == 0) { if (avg_d == 0) {
/* we try for a sane slope, but bow to the insanity of /* we try for a sane slope, but bow to the insanity of
* the user supplied data */ * the user supplied data */
fill_samples_no_avg(fake, max_d, max_t, MAX(2.0 * max_d / max_t, (double)prefs.ascratelast6m)); fill_samples_no_avg(fake, max_d, max_t, std::max(2.0 * max_d / max_t, (double)prefs.ascratelast6m));
if (fake[3].time.seconds == 0) { // just a 4 point profile if (fake[3].time.seconds == 0) { // just a 4 point profile
dc->samples = 4; dc->samples = 4;
fake[3].time.seconds = max_t; fake[3].time.seconds = max_t;
@ -199,7 +199,7 @@ void fake_dc(struct divecomputer *dc)
* saving the dive mode for each event. When the events occur AFTER 'time' seconds, the last stored divemode * saving the dive mode for each event. When the events occur AFTER 'time' seconds, the last stored divemode
* is returned. This function is self-tracking, relying on setting the event pointer 'evp' so that, in each iteration * is returned. This function is self-tracking, relying on setting the event pointer 'evp' so that, in each iteration
* that calls this function, the search does not have to begin at the first event of the dive */ * that calls this function, the search does not have to begin at the first event of the dive */
enum divemode_t get_current_divemode(const struct divecomputer *dc, int time, const struct event **evp, enum divemode_t *divemode) extern "C" enum divemode_t get_current_divemode(const struct divecomputer *dc, int time, const struct event **evp, enum divemode_t *divemode)
{ {
const struct event *ev = *evp; const struct event *ev = *evp;
if (dc) { if (dc) {
@ -221,12 +221,12 @@ enum divemode_t get_current_divemode(const struct divecomputer *dc, int time, co
/* helper function to make it easier to work with our structures /* helper function to make it easier to work with our structures
* we don't interpolate here, just use the value from the last sample up to that time */ * we don't interpolate here, just use the value from the last sample up to that time */
int get_depth_at_time(const struct divecomputer *dc, unsigned int time) extern "C" int get_depth_at_time(const struct divecomputer *dc, unsigned int time)
{ {
int depth = 0; int depth = 0;
if (dc && dc->sample) if (dc && dc->sample)
for (int i = 0; i < dc->samples; i++) { for (int i = 0; i < dc->samples; i++) {
if (dc->sample[i].time.seconds > time) if (dc->sample[i].time.seconds > (int)time)
break; break;
depth = dc->sample[i].depth.mm; depth = dc->sample[i].depth.mm;
} }
@ -236,7 +236,7 @@ int get_depth_at_time(const struct divecomputer *dc, unsigned int time)
/* The first divecomputer is embedded in the dive structure. Free its data but not /* The first divecomputer is embedded in the dive structure. Free its data but not
* the structure itself. For all remainding dcs in the list, free data *and* structures. */ * the structure itself. For all remainding dcs in the list, free data *and* structures. */
void free_dive_dcs(struct divecomputer *dc) extern "C" void free_dive_dcs(struct divecomputer *dc)
{ {
free_dc_contents(dc); free_dc_contents(dc);
STRUCTURED_LIST_FREE(struct divecomputer, dc->next, free_dc); STRUCTURED_LIST_FREE(struct divecomputer, dc->next, free_dc);
@ -244,17 +244,17 @@ void free_dive_dcs(struct divecomputer *dc)
/* make room for num samples; if not enough space is available, the sample /* make room for num samples; if not enough space is available, the sample
* array is reallocated and the existing samples are copied. */ * array is reallocated and the existing samples are copied. */
void alloc_samples(struct divecomputer *dc, int num) extern "C" void alloc_samples(struct divecomputer *dc, int num)
{ {
if (num > dc->alloc_samples) { if (num > dc->alloc_samples) {
dc->alloc_samples = (num * 3) / 2 + 10; dc->alloc_samples = (num * 3) / 2 + 10;
dc->sample = realloc(dc->sample, dc->alloc_samples * sizeof(struct sample)); dc->sample = (struct sample *)realloc(dc->sample, dc->alloc_samples * sizeof(struct sample));
if (!dc->sample) if (!dc->sample)
dc->samples = dc->alloc_samples = 0; dc->samples = dc->alloc_samples = 0;
} }
} }
void free_samples(struct divecomputer *dc) extern "C" void free_samples(struct divecomputer *dc)
{ {
if (dc) { if (dc) {
free(dc->sample); free(dc->sample);
@ -264,7 +264,7 @@ void free_samples(struct divecomputer *dc)
} }
} }
struct sample *prepare_sample(struct divecomputer *dc) extern "C" struct sample *prepare_sample(struct divecomputer *dc)
{ {
if (dc) { if (dc) {
int nr = dc->samples; int nr = dc->samples;
@ -291,12 +291,12 @@ struct sample *prepare_sample(struct divecomputer *dc)
} }
void finish_sample(struct divecomputer *dc) extern "C" void finish_sample(struct divecomputer *dc)
{ {
dc->samples++; dc->samples++;
} }
struct sample *add_sample(const struct sample *sample, int time, struct divecomputer *dc) extern "C" struct sample *add_sample(const struct sample *sample, int time, struct divecomputer *dc)
{ {
struct sample *p = prepare_sample(dc); struct sample *p = prepare_sample(dc);
@ -314,7 +314,7 @@ struct sample *add_sample(const struct sample *sample, int time, struct divecomp
* *
* This ignores any surface time in the middle of the dive. * This ignores any surface time in the middle of the dive.
*/ */
void fixup_dc_duration(struct divecomputer *dc) extern "C" void fixup_dc_duration(struct divecomputer *dc)
{ {
int duration, i; int duration, i;
int lasttime, lastdepth, depthtime; int lasttime, lastdepth, depthtime;
@ -347,7 +347,7 @@ void fixup_dc_duration(struct divecomputer *dc)
* What do the dive computers say the water temperature is? * What do the dive computers say the water temperature is?
* (not in the samples, but as dc property for dcs that support that) * (not in the samples, but as dc property for dcs that support that)
*/ */
unsigned int dc_watertemp(const struct divecomputer *dc) extern "C" unsigned int dc_watertemp(const struct divecomputer *dc)
{ {
int sum = 0, nr = 0; int sum = 0, nr = 0;
@ -365,7 +365,7 @@ unsigned int dc_watertemp(const struct divecomputer *dc)
/* /*
* What do the dive computers say the air temperature is? * What do the dive computers say the air temperature is?
*/ */
unsigned int dc_airtemp(const struct divecomputer *dc) extern "C" unsigned int dc_airtemp(const struct divecomputer *dc)
{ {
int sum = 0, nr = 0; int sum = 0, nr = 0;
@ -381,7 +381,7 @@ unsigned int dc_airtemp(const struct divecomputer *dc)
} }
/* copies all events in this dive computer */ /* copies all events in this dive computer */
void copy_events(const struct divecomputer *s, struct divecomputer *d) extern "C" void copy_events(const struct divecomputer *s, struct divecomputer *d)
{ {
const struct event *ev; const struct event *ev;
struct event **pev; struct event **pev;
@ -398,7 +398,7 @@ void copy_events(const struct divecomputer *s, struct divecomputer *d)
*pev = NULL; *pev = NULL;
} }
void copy_samples(const struct divecomputer *s, struct divecomputer *d) extern "C" void copy_samples(const struct divecomputer *s, struct divecomputer *d)
{ {
/* instead of carefully copying them one by one and calling add_sample /* instead of carefully copying them one by one and calling add_sample
* over and over again, let's just copy the whole blob */ * over and over again, let's just copy the whole blob */
@ -415,12 +415,12 @@ void copy_samples(const struct divecomputer *s, struct divecomputer *d)
if(!nr) if(!nr)
return; return;
d->sample = malloc(nr * sizeof(struct sample)); d->sample = (struct sample *)malloc(nr * sizeof(struct sample));
if (d->sample) if (d->sample)
memcpy(d->sample, s->sample, nr * sizeof(struct sample)); memcpy(d->sample, s->sample, nr * sizeof(struct sample));
} }
void add_event_to_dc(struct divecomputer *dc, struct event *ev) extern "C" void add_event_to_dc(struct divecomputer *dc, struct event *ev)
{ {
struct event **p; struct event **p;
@ -433,7 +433,7 @@ void add_event_to_dc(struct divecomputer *dc, struct event *ev)
*p = ev; *p = ev;
} }
struct event *add_event(struct divecomputer *dc, unsigned int time, int type, int flags, int value, const char *name) extern "C" struct event *add_event(struct divecomputer *dc, unsigned int time, int type, int flags, int value, const char *name)
{ {
struct event *ev = create_event(time, type, flags, value, name); struct event *ev = create_event(time, type, flags, value, name);
@ -446,7 +446,7 @@ struct event *add_event(struct divecomputer *dc, unsigned int time, int type, in
} }
/* Substitutes an event in a divecomputer for another. No reordering is performed! */ /* Substitutes an event in a divecomputer for another. No reordering is performed! */
void swap_event(struct divecomputer *dc, struct event *from, struct event *to) extern "C" void swap_event(struct divecomputer *dc, struct event *from, struct event *to)
{ {
for (struct event **ep = &dc->events; *ep; ep = &(*ep)->next) { for (struct event **ep = &dc->events; *ep; ep = &(*ep)->next) {
if (*ep == from) { if (*ep == from) {
@ -459,7 +459,7 @@ void swap_event(struct divecomputer *dc, struct event *from, struct event *to)
} }
/* Remove given event from dive computer. Does *not* free the event. */ /* Remove given event from dive computer. Does *not* free the event. */
void remove_event_from_dc(struct divecomputer *dc, struct event *event) extern "C" void remove_event_from_dc(struct divecomputer *dc, struct event *event)
{ {
for (struct event **ep = &dc->events; *ep; ep = &(*ep)->next) { for (struct event **ep = &dc->events; *ep; ep = &(*ep)->next) {
if (*ep == event) { if (*ep == event) {
@ -470,7 +470,7 @@ void remove_event_from_dc(struct divecomputer *dc, struct event *event)
} }
} }
void add_extra_data(struct divecomputer *dc, const char *key, const char *value) extern "C" void add_extra_data(struct divecomputer *dc, const char *key, const char *value)
{ {
struct extra_data **ed = &dc->extra_data; struct extra_data **ed = &dc->extra_data;
@ -484,7 +484,7 @@ void add_extra_data(struct divecomputer *dc, const char *key, const char *value)
while (*ed) while (*ed)
ed = &(*ed)->next; ed = &(*ed)->next;
*ed = malloc(sizeof(struct extra_data)); *ed = (struct extra_data *)malloc(sizeof(struct extra_data));
if (*ed) { if (*ed) {
(*ed)->key = strdup(key); (*ed)->key = strdup(key);
(*ed)->value = strdup(value); (*ed)->value = strdup(value);
@ -498,7 +498,7 @@ void add_extra_data(struct divecomputer *dc, const char *key, const char *value)
* positive for "same dive" and negative for "definitely * positive for "same dive" and negative for "definitely
* not the same dive" * not the same dive"
*/ */
int match_one_dc(const struct divecomputer *a, const struct divecomputer *b) extern "C" int match_one_dc(const struct divecomputer *a, const struct divecomputer *b)
{ {
/* Not same model? Don't know if matching.. */ /* Not same model? Don't know if matching.. */
if (!a->model || !b->model) if (!a->model || !b->model)
@ -527,7 +527,7 @@ static void free_extra_data(struct extra_data *ed)
free((void *)ed->value); free((void *)ed->value);
} }
void free_dc_contents(struct divecomputer *dc) extern "C" void free_dc_contents(struct divecomputer *dc)
{ {
free(dc->sample); free(dc->sample);
free((void *)dc->model); free((void *)dc->model);
@ -537,7 +537,7 @@ void free_dc_contents(struct divecomputer *dc)
STRUCTURED_LIST_FREE(struct extra_data, dc->extra_data, free_extra_data); STRUCTURED_LIST_FREE(struct extra_data, dc->extra_data, free_extra_data);
} }
void free_dc(struct divecomputer *dc) extern "C" void free_dc(struct divecomputer *dc)
{ {
free_dc_contents(dc); free_dc_contents(dc);
free(dc); free(dc);
@ -545,12 +545,12 @@ void free_dc(struct divecomputer *dc)
static const char *planner_dc_name = "planned dive"; static const char *planner_dc_name = "planned dive";
bool is_dc_planner(const struct divecomputer *dc) extern "C" bool is_dc_planner(const struct divecomputer *dc)
{ {
return dc && same_string(dc->model, planner_dc_name); return same_string(dc->model, planner_dc_name);
} }
void make_planner_dc(struct divecomputer *dc) extern "C" void make_planner_dc(struct divecomputer *dc)
{ {
free((void *)dc->model); free((void *)dc->model);
dc->model = strdup(planner_dc_name); dc->model = strdup(planner_dc_name);
@ -558,12 +558,12 @@ void make_planner_dc(struct divecomputer *dc)
const char *manual_dc_name = "manually added dive"; const char *manual_dc_name = "manually added dive";
bool is_dc_manually_added_dive(const struct divecomputer *dc) extern "C" bool is_dc_manually_added_dive(const struct divecomputer *dc)
{ {
return dc && same_string(dc->model, manual_dc_name); return dc && same_string(dc->model, manual_dc_name);
} }
void make_manually_added_dive_dc(struct divecomputer *dc) extern "C" void make_manually_added_dive_dc(struct divecomputer *dc)
{ {
free((void *)dc->model); free((void *)dc->model);
dc->model = strdup(manual_dc_name); dc->model = strdup(manual_dc_name);