2017-04-27 18:18:03 +00:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2013-04-15 03:10:25 +00:00
|
|
|
/* statistics.c
|
2011-11-02 16:10:57 +00:00
|
|
|
*
|
2013-04-15 03:10:25 +00:00
|
|
|
* core logic for the Info & Stats page -
|
|
|
|
* char *get_minutes(int seconds);
|
|
|
|
* void process_all_dives(struct dive *dive, struct dive **prev_dive);
|
|
|
|
* void get_selected_dives_text(char *buffer, int size);
|
2011-11-02 16:10:57 +00:00
|
|
|
*/
|
2013-10-06 15:55:58 +00:00
|
|
|
#include "gettext.h"
|
2013-10-05 07:29:09 +00:00
|
|
|
#include <string.h>
|
2012-12-20 23:46:47 +00:00
|
|
|
#include <ctype.h>
|
2011-11-02 16:10:57 +00:00
|
|
|
|
|
|
|
#include "dive.h"
|
|
|
|
#include "display.h"
|
|
|
|
#include "divelist.h"
|
2013-04-15 03:10:25 +00:00
|
|
|
#include "statistics.h"
|
2011-11-02 16:10:57 +00:00
|
|
|
|
2012-01-15 21:19:39 +00:00
|
|
|
static stats_t stats;
|
2013-04-15 03:10:25 +00:00
|
|
|
stats_t stats_selection;
|
|
|
|
stats_t *stats_monthly = NULL;
|
|
|
|
stats_t *stats_yearly = NULL;
|
2013-11-24 01:09:34 +00:00
|
|
|
stats_t *stats_by_trip = NULL;
|
2016-01-17 19:18:36 +00:00
|
|
|
stats_t *stats_by_type = NULL;
|
2012-09-10 19:17:28 +00:00
|
|
|
|
2013-01-24 21:08:19 +00:00
|
|
|
static void process_temperatures(struct dive *dp, stats_t *stats)
|
2013-01-24 18:58:59 +00:00
|
|
|
{
|
2018-02-18 20:55:57 +00:00
|
|
|
temperature_t min_temp, mean_temp, max_temp = {.mkelvin = 0};
|
2013-01-24 18:58:59 +00:00
|
|
|
|
2018-02-18 20:55:57 +00:00
|
|
|
max_temp.mkelvin = dp->maxtemp.mkelvin;
|
|
|
|
if (max_temp.mkelvin && (!stats->max_temp.mkelvin || max_temp.mkelvin > stats->max_temp.mkelvin))
|
|
|
|
stats->max_temp.mkelvin = max_temp.mkelvin;
|
2013-01-24 18:58:59 +00:00
|
|
|
|
2018-02-18 20:55:57 +00:00
|
|
|
min_temp.mkelvin = dp->mintemp.mkelvin;
|
|
|
|
if (min_temp.mkelvin && (!stats->min_temp.mkelvin || min_temp.mkelvin < stats->min_temp.mkelvin))
|
|
|
|
stats->min_temp.mkelvin = min_temp.mkelvin;
|
2013-01-24 18:58:59 +00:00
|
|
|
|
2018-02-18 20:55:57 +00:00
|
|
|
if (min_temp.mkelvin || max_temp.mkelvin) {
|
|
|
|
mean_temp.mkelvin = min_temp.mkelvin;
|
|
|
|
if (mean_temp.mkelvin)
|
|
|
|
mean_temp.mkelvin = (mean_temp.mkelvin + max_temp.mkelvin) / 2;
|
2013-01-24 18:58:59 +00:00
|
|
|
else
|
2018-02-18 20:55:57 +00:00
|
|
|
mean_temp.mkelvin = max_temp.mkelvin;
|
|
|
|
stats->combined_temp.mkelvin += mean_temp.mkelvin;
|
2013-01-24 18:58:59 +00:00
|
|
|
stats->combined_count++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-03-14 17:01:34 +00:00
|
|
|
static void process_dive(struct dive *dp, stats_t *stats)
|
|
|
|
{
|
2016-11-10 09:15:11 +00:00
|
|
|
int old_tadt, sac_time = 0;
|
2017-12-17 17:12:08 +00:00
|
|
|
int32_t duration = dp->duration.seconds;
|
2012-03-14 17:01:34 +00:00
|
|
|
|
2016-11-10 09:15:11 +00:00
|
|
|
old_tadt = stats->total_average_depth_time.seconds;
|
2013-02-08 06:48:07 +00:00
|
|
|
stats->total_time.seconds += duration;
|
|
|
|
if (duration > stats->longest_time.seconds)
|
|
|
|
stats->longest_time.seconds = duration;
|
|
|
|
if (stats->shortest_time.seconds == 0 || duration < stats->shortest_time.seconds)
|
|
|
|
stats->shortest_time.seconds = duration;
|
2013-02-09 04:44:04 +00:00
|
|
|
if (dp->maxdepth.mm > stats->max_depth.mm)
|
|
|
|
stats->max_depth.mm = dp->maxdepth.mm;
|
|
|
|
if (stats->min_depth.mm == 0 || dp->maxdepth.mm < stats->min_depth.mm)
|
|
|
|
stats->min_depth.mm = dp->maxdepth.mm;
|
2013-01-24 18:58:59 +00:00
|
|
|
|
2013-01-24 21:08:19 +00:00
|
|
|
process_temperatures(dp, stats);
|
2012-07-01 03:12:11 +00:00
|
|
|
|
|
|
|
/* Maybe we should drop zero-duration dives */
|
2013-02-08 06:48:07 +00:00
|
|
|
if (!duration)
|
2012-07-01 03:12:11 +00:00
|
|
|
return;
|
2016-11-10 09:15:11 +00:00
|
|
|
if (dp->meandepth.mm) {
|
|
|
|
stats->total_average_depth_time.seconds += duration;
|
2017-03-09 16:07:30 +00:00
|
|
|
stats->avg_depth.mm = lrint((1.0 * old_tadt * stats->avg_depth.mm +
|
|
|
|
duration * dp->meandepth.mm) /
|
|
|
|
stats->total_average_depth_time.seconds);
|
2016-11-10 09:15:11 +00:00
|
|
|
}
|
2014-07-17 15:14:42 +00:00
|
|
|
if (dp->sac > 100) { /* less than .1 l/min is bogus, even with a pSCR */
|
2018-02-20 21:59:09 +00:00
|
|
|
sac_time = stats->total_sac_time.seconds + duration;
|
|
|
|
stats->avg_sac.mliter = lrint((1.0 * stats->total_sac_time.seconds * stats->avg_sac.mliter +
|
2014-02-28 04:09:57 +00:00
|
|
|
duration * dp->sac) /
|
2017-03-09 16:07:30 +00:00
|
|
|
sac_time);
|
2012-03-14 17:01:34 +00:00
|
|
|
if (dp->sac > stats->max_sac.mliter)
|
|
|
|
stats->max_sac.mliter = dp->sac;
|
|
|
|
if (stats->min_sac.mliter == 0 || dp->sac < stats->min_sac.mliter)
|
|
|
|
stats->min_sac.mliter = dp->sac;
|
2018-02-20 21:59:09 +00:00
|
|
|
stats->total_sac_time.seconds = sac_time;
|
2012-03-14 17:01:34 +00:00
|
|
|
}
|
|
|
|
}
|
2011-11-02 16:10:57 +00:00
|
|
|
|
2013-04-15 03:10:25 +00:00
|
|
|
char *get_minutes(int seconds)
|
2012-09-10 19:17:28 +00:00
|
|
|
{
|
|
|
|
static char buf[80];
|
|
|
|
snprintf(buf, sizeof(buf), "%d:%.2d", FRACTION(seconds, 60));
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
|
2013-04-15 03:10:25 +00:00
|
|
|
void process_all_dives(struct dive *dive, struct dive **prev_dive)
|
2011-11-02 16:10:57 +00:00
|
|
|
{
|
|
|
|
int idx;
|
|
|
|
struct dive *dp;
|
2012-09-20 00:35:52 +00:00
|
|
|
struct tm tm;
|
2012-09-10 19:17:28 +00:00
|
|
|
int current_year = 0;
|
|
|
|
int current_month = 0;
|
|
|
|
int year_iter = 0;
|
|
|
|
int month_iter = 0;
|
|
|
|
int prev_month = 0, prev_year = 0;
|
2013-11-24 01:09:34 +00:00
|
|
|
int trip_iter = 0;
|
|
|
|
dive_trip_t *trip_ptr = 0;
|
2016-01-18 19:44:05 +00:00
|
|
|
unsigned int size, tsize;
|
2011-11-02 16:10:57 +00:00
|
|
|
|
|
|
|
*prev_dive = NULL;
|
2012-01-15 21:19:39 +00:00
|
|
|
memset(&stats, 0, sizeof(stats));
|
2012-01-15 23:21:56 +00:00
|
|
|
if (dive_table.nr > 0) {
|
2013-02-09 15:12:30 +00:00
|
|
|
stats.shortest_time.seconds = dive_table.dives[0]->duration.seconds;
|
2013-02-09 04:44:04 +00:00
|
|
|
stats.min_depth.mm = dive_table.dives[0]->maxdepth.mm;
|
2012-03-14 17:01:34 +00:00
|
|
|
stats.selection_size = dive_table.nr;
|
2012-01-15 23:21:56 +00:00
|
|
|
}
|
2012-09-10 19:17:28 +00:00
|
|
|
|
|
|
|
/* allocate sufficient space to hold the worst
|
|
|
|
* case (one dive per year or all dives during
|
|
|
|
* one month) for yearly and monthly statistics*/
|
|
|
|
|
2014-05-12 17:58:15 +00:00
|
|
|
free(stats_yearly);
|
|
|
|
free(stats_monthly);
|
|
|
|
free(stats_by_trip);
|
2016-01-17 19:18:36 +00:00
|
|
|
free(stats_by_type);
|
2014-05-12 17:58:15 +00:00
|
|
|
|
2012-09-10 19:17:28 +00:00
|
|
|
size = sizeof(stats_t) * (dive_table.nr + 1);
|
2016-01-18 19:44:05 +00:00
|
|
|
tsize = sizeof(stats_t) * (NUM_DC_TYPE + 1);
|
2012-09-10 19:17:28 +00:00
|
|
|
stats_yearly = malloc(size);
|
|
|
|
stats_monthly = malloc(size);
|
2013-11-24 01:09:34 +00:00
|
|
|
stats_by_trip = malloc(size);
|
2016-01-18 19:44:05 +00:00
|
|
|
stats_by_type = malloc(tsize);
|
2016-01-17 19:18:36 +00:00
|
|
|
if (!stats_yearly || !stats_monthly || !stats_by_trip || !stats_by_type)
|
2012-09-10 19:17:28 +00:00
|
|
|
return;
|
|
|
|
memset(stats_yearly, 0, size);
|
|
|
|
memset(stats_monthly, 0, size);
|
2013-11-24 01:09:34 +00:00
|
|
|
memset(stats_by_trip, 0, size);
|
2016-01-18 19:44:05 +00:00
|
|
|
memset(stats_by_type, 0, tsize);
|
2014-01-15 18:54:41 +00:00
|
|
|
stats_yearly[0].is_year = true;
|
2012-09-10 19:17:28 +00:00
|
|
|
|
2016-01-17 19:18:36 +00:00
|
|
|
/* Setting the is_trip to true to show the location as first
|
|
|
|
* field in the statistics window */
|
2017-10-29 19:00:50 +00:00
|
|
|
stats_by_type[0].location = strdup(translate("gettextFromC", "All (by type stats)"));
|
2016-01-17 19:18:36 +00:00
|
|
|
stats_by_type[0].is_trip = true;
|
2017-10-29 19:00:50 +00:00
|
|
|
stats_by_type[1].location = strdup(translate("gettextFromC","OC"));
|
2016-01-17 19:18:36 +00:00
|
|
|
stats_by_type[1].is_trip = true;
|
2017-10-29 19:00:50 +00:00
|
|
|
stats_by_type[2].location = strdup(translate("gettextFromC","CCR"));
|
2016-01-17 19:18:36 +00:00
|
|
|
stats_by_type[2].is_trip = true;
|
2017-10-29 19:00:50 +00:00
|
|
|
stats_by_type[3].location = strdup(translate("gettextFromC","pSCR"));
|
2016-01-17 19:18:36 +00:00
|
|
|
stats_by_type[3].is_trip = true;
|
2017-10-29 19:00:50 +00:00
|
|
|
stats_by_type[4].location = strdup(translate("gettextFromC","Freedive"));
|
2016-01-17 19:18:36 +00:00
|
|
|
stats_by_type[4].is_trip = true;
|
|
|
|
|
2011-11-02 16:10:57 +00:00
|
|
|
/* this relies on the fact that the dives in the dive_table
|
|
|
|
* are in chronological order */
|
2014-05-19 21:37:19 +00:00
|
|
|
for_each_dive (idx, dp) {
|
2013-02-19 00:56:28 +00:00
|
|
|
if (dive && dp->when == dive->when) {
|
2011-11-02 16:10:57 +00:00
|
|
|
/* that's the one we are showing */
|
|
|
|
if (idx > 0)
|
2014-02-28 04:09:57 +00:00
|
|
|
*prev_dive = dive_table.dives[idx - 1];
|
2011-11-02 16:10:57 +00:00
|
|
|
}
|
2012-03-14 17:01:34 +00:00
|
|
|
process_dive(dp, &stats);
|
2012-09-10 19:17:28 +00:00
|
|
|
|
|
|
|
/* yearly statistics */
|
2012-09-20 00:35:52 +00:00
|
|
|
utc_mkdate(dp->when, &tm);
|
2012-09-10 19:17:28 +00:00
|
|
|
if (current_year == 0)
|
2016-04-28 22:13:30 +00:00
|
|
|
current_year = tm.tm_year;
|
2012-09-10 19:17:28 +00:00
|
|
|
|
2016-04-28 22:13:30 +00:00
|
|
|
if (current_year != tm.tm_year) {
|
|
|
|
current_year = tm.tm_year;
|
2012-09-10 19:17:28 +00:00
|
|
|
process_dive(dp, &(stats_yearly[++year_iter]));
|
2014-01-15 18:54:41 +00:00
|
|
|
stats_yearly[year_iter].is_year = true;
|
2013-01-29 21:10:46 +00:00
|
|
|
} else {
|
2012-09-10 19:17:28 +00:00
|
|
|
process_dive(dp, &(stats_yearly[year_iter]));
|
2013-01-29 21:10:46 +00:00
|
|
|
}
|
2012-09-10 19:17:28 +00:00
|
|
|
stats_yearly[year_iter].selection_size++;
|
|
|
|
stats_yearly[year_iter].period = current_year;
|
|
|
|
|
2016-01-17 19:18:36 +00:00
|
|
|
/* stats_by_type[0] is all the dives combined */
|
|
|
|
stats_by_type[0].selection_size++;
|
|
|
|
process_dive(dp, &(stats_by_type[0]));
|
|
|
|
|
|
|
|
process_dive(dp, &(stats_by_type[dp->dc.divemode + 1]));
|
|
|
|
stats_by_type[dp->dc.divemode + 1].selection_size++;
|
|
|
|
|
2013-11-24 10:27:37 +00:00
|
|
|
if (dp->divetrip != NULL) {
|
|
|
|
if (trip_ptr != dp->divetrip) {
|
|
|
|
trip_ptr = dp->divetrip;
|
|
|
|
trip_iter++;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* stats_by_trip[0] is all the dives combined */
|
|
|
|
stats_by_trip[0].selection_size++;
|
|
|
|
process_dive(dp, &(stats_by_trip[0]));
|
2014-01-15 18:54:41 +00:00
|
|
|
stats_by_trip[0].is_trip = true;
|
2017-03-07 07:05:17 +00:00
|
|
|
stats_by_trip[0].location = strdup(translate("gettextFromC", "All (by trip stats)"));
|
2013-11-24 10:27:37 +00:00
|
|
|
|
|
|
|
process_dive(dp, &(stats_by_trip[trip_iter]));
|
|
|
|
stats_by_trip[trip_iter].selection_size++;
|
2014-01-15 18:54:41 +00:00
|
|
|
stats_by_trip[trip_iter].is_trip = true;
|
2013-11-24 10:27:37 +00:00
|
|
|
stats_by_trip[trip_iter].location = dp->divetrip->location;
|
2013-11-24 01:09:34 +00:00
|
|
|
}
|
|
|
|
|
2012-09-10 19:17:28 +00:00
|
|
|
/* monthly statistics */
|
|
|
|
if (current_month == 0) {
|
2012-09-20 00:35:52 +00:00
|
|
|
current_month = tm.tm_mon + 1;
|
2012-09-10 19:17:28 +00:00
|
|
|
} else {
|
2012-09-20 00:35:52 +00:00
|
|
|
if (current_month != tm.tm_mon + 1)
|
|
|
|
current_month = tm.tm_mon + 1;
|
2012-09-10 19:17:28 +00:00
|
|
|
if (prev_month != current_month || prev_year != current_year)
|
|
|
|
month_iter++;
|
|
|
|
}
|
|
|
|
process_dive(dp, &(stats_monthly[month_iter]));
|
|
|
|
stats_monthly[month_iter].selection_size++;
|
|
|
|
stats_monthly[month_iter].period = current_month;
|
|
|
|
prev_month = current_month;
|
|
|
|
prev_year = current_year;
|
2012-03-14 17:01:34 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-08-14 04:11:09 +00:00
|
|
|
/* make sure we skip the selected summary entries */
|
2012-08-20 12:48:07 +00:00
|
|
|
void process_selected_dives(void)
|
2012-03-14 17:01:34 +00:00
|
|
|
{
|
2012-08-20 12:48:07 +00:00
|
|
|
struct dive *dive;
|
|
|
|
unsigned int i, nr;
|
2012-03-14 17:01:34 +00:00
|
|
|
|
|
|
|
memset(&stats_selection, 0, sizeof(stats_selection));
|
|
|
|
|
2012-08-20 12:48:07 +00:00
|
|
|
nr = 0;
|
2012-08-21 22:51:34 +00:00
|
|
|
for_each_dive(i, dive) {
|
2012-08-20 12:48:07 +00:00
|
|
|
if (dive->selected) {
|
|
|
|
process_dive(dive, &stats_selection);
|
|
|
|
nr++;
|
2011-11-02 16:10:57 +00:00
|
|
|
}
|
|
|
|
}
|
2012-08-20 12:48:07 +00:00
|
|
|
stats_selection.selection_size = nr;
|
2011-11-02 16:10:57 +00:00
|
|
|
}
|
|
|
|
|
2012-12-20 23:46:47 +00:00
|
|
|
/* this gets called when at least two but not all dives are selected */
|
|
|
|
static void get_ranges(char *buffer, int size)
|
|
|
|
{
|
|
|
|
int i, len;
|
2013-12-11 20:21:50 +00:00
|
|
|
int first = -1, last = -1;
|
2014-05-19 21:37:19 +00:00
|
|
|
struct dive *dive;
|
2012-12-20 23:46:47 +00:00
|
|
|
|
2014-02-28 04:09:57 +00:00
|
|
|
snprintf(buffer, size, "%s", translate("gettextFromC", "for dives #"));
|
2014-05-19 21:37:19 +00:00
|
|
|
for_each_dive (i, dive) {
|
2014-02-28 04:09:57 +00:00
|
|
|
if (!dive->selected)
|
2012-12-20 23:46:47 +00:00
|
|
|
continue;
|
|
|
|
if (dive->number < 1) {
|
|
|
|
/* uhh - weird numbers - bail */
|
2014-02-28 04:09:57 +00:00
|
|
|
snprintf(buffer, size, "%s", translate("gettextFromC", "for selected dives"));
|
2012-12-20 23:46:47 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
len = strlen(buffer);
|
|
|
|
if (last == -1) {
|
|
|
|
snprintf(buffer + len, size - len, "%d", dive->number);
|
|
|
|
first = last = dive->number;
|
|
|
|
} else {
|
|
|
|
if (dive->number == last + 1) {
|
|
|
|
last++;
|
|
|
|
continue;
|
|
|
|
} else {
|
|
|
|
if (first == last)
|
|
|
|
snprintf(buffer + len, size - len, ", %d", dive->number);
|
|
|
|
else if (first + 1 == last)
|
|
|
|
snprintf(buffer + len, size - len, ", %d, %d", last, dive->number);
|
|
|
|
else
|
|
|
|
snprintf(buffer + len, size - len, "-%d, %d", last, dive->number);
|
|
|
|
first = last = dive->number;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2013-04-08 02:50:26 +00:00
|
|
|
len = strlen(buffer);
|
2012-12-20 23:46:47 +00:00
|
|
|
if (first != last) {
|
|
|
|
if (first + 1 == last)
|
|
|
|
snprintf(buffer + len, size - len, ", %d", last);
|
|
|
|
else
|
|
|
|
snprintf(buffer + len, size - len, "-%d", last);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-03-10 02:55:04 +00:00
|
|
|
void get_selected_dives_text(char *buffer, size_t size)
|
2012-12-20 23:46:47 +00:00
|
|
|
{
|
|
|
|
if (amount_selected == 1) {
|
|
|
|
if (current_dive)
|
2014-02-28 04:09:57 +00:00
|
|
|
snprintf(buffer, size, translate("gettextFromC", "for dive #%d"), current_dive->number);
|
2012-12-20 23:46:47 +00:00
|
|
|
else
|
2014-02-28 04:09:57 +00:00
|
|
|
snprintf(buffer, size, "%s", translate("gettextFromC", "for selected dive"));
|
2016-03-10 02:55:04 +00:00
|
|
|
} else if (amount_selected == (unsigned int)dive_table.nr) {
|
2014-02-28 04:09:57 +00:00
|
|
|
snprintf(buffer, size, "%s", translate("gettextFromC", "for all dives"));
|
2012-12-20 23:46:47 +00:00
|
|
|
} else if (amount_selected == 0) {
|
2014-02-28 04:09:57 +00:00
|
|
|
snprintf(buffer, size, "%s", translate("gettextFromC", "(no dives)"));
|
2012-12-20 23:46:47 +00:00
|
|
|
} else {
|
|
|
|
get_ranges(buffer, size);
|
2014-02-28 04:09:57 +00:00
|
|
|
if (strlen(buffer) == size - 1) {
|
2012-12-20 23:46:47 +00:00
|
|
|
/* add our own ellipse... the way Pango does this is ugly
|
|
|
|
* as it will leave partial numbers there which I don't like */
|
2016-03-10 02:55:04 +00:00
|
|
|
size_t offset = 4;
|
2012-12-20 23:46:47 +00:00
|
|
|
while (offset < size && isdigit(buffer[size - offset]))
|
|
|
|
offset++;
|
|
|
|
strcpy(buffer + size - offset, "...");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-01-28 14:01:07 +00:00
|
|
|
#define SOME_GAS 5000 // 5bar drop in cylinder pressure makes cylinder used
|
|
|
|
|
Start cleaning up sensor indexing for multiple sensors
This is a very timid start at making us actually use multiple sensors
without the magical special case for just CCR oxygen tracking.
It mainly does:
- turn the "sample->sensor" index into an array of two indexes, to
match the pressures themselves.
- get rid of dive->{oxygen_cylinder_index,diluent_cylinder_index},
since a CCR dive should now simply set the sample->sensor[] indices
correctly instead.
- in a couple of places, start actually looping over the sensors rather
than special-case the O2 case (although often the small "loops" are
just unrolled, since it's just two cases.
but in many cases we still end up only covering the zero sensor case,
because the CCR O2 sensor code coverage was fairly limited.
It's entirely possible (even likely) that this migth break some existing
case: it tries to be a fairly direct ("stupid") translation of the old
code, but unlike the preparatory patch this does actually does change
some semantics.
For example, right now the git loader code assumes that if the git save
data contains a o2pressure entry, it just hardcodes the O2 sensor index
to 1.
In fact, one issue is going to simply be that our file formats do not
have that multiple sensor format, but instead had very clearly encoded
things as being the CCR O2 pressure sensor.
But this is hopefully close to usable, and I will need feedback (and
maybe test cases) from people who have existing CCR dives with pressure
data.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-21 02:49:45 +00:00
|
|
|
bool has_gaschange_event(struct dive *dive, struct divecomputer *dc, int idx)
|
|
|
|
{
|
2017-02-03 10:14:51 +00:00
|
|
|
bool first_gas_explicit = false;
|
|
|
|
struct event *event = get_next_event(dc->events, "gaschange");
|
|
|
|
while (event) {
|
|
|
|
if (dc->sample && (event->time.seconds == 0 ||
|
|
|
|
(dc->samples && dc->sample[0].time.seconds == event->time.seconds)))
|
|
|
|
first_gas_explicit = true;
|
|
|
|
if (get_cylinder_index(dive, event) == idx)
|
|
|
|
return true;
|
|
|
|
event = get_next_event(event->next, "gaschange");
|
|
|
|
}
|
Start cleaning up sensor indexing for multiple sensors
This is a very timid start at making us actually use multiple sensors
without the magical special case for just CCR oxygen tracking.
It mainly does:
- turn the "sample->sensor" index into an array of two indexes, to
match the pressures themselves.
- get rid of dive->{oxygen_cylinder_index,diluent_cylinder_index},
since a CCR dive should now simply set the sample->sensor[] indices
correctly instead.
- in a couple of places, start actually looping over the sensors rather
than special-case the O2 case (although often the small "loops" are
just unrolled, since it's just two cases.
but in many cases we still end up only covering the zero sensor case,
because the CCR O2 sensor code coverage was fairly limited.
It's entirely possible (even likely) that this migth break some existing
case: it tries to be a fairly direct ("stupid") translation of the old
code, but unlike the preparatory patch this does actually does change
some semantics.
For example, right now the git loader code assumes that if the git save
data contains a o2pressure entry, it just hardcodes the O2 sensor index
to 1.
In fact, one issue is going to simply be that our file formats do not
have that multiple sensor format, but instead had very clearly encoded
things as being the CCR O2 pressure sensor.
But this is hopefully close to usable, and I will need feedback (and
maybe test cases) from people who have existing CCR dives with pressure
data.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-21 02:49:45 +00:00
|
|
|
if (dc->divemode == CCR) {
|
|
|
|
if (idx == get_cylinder_idx_by_use(dive, DILUENT))
|
|
|
|
return true;
|
|
|
|
if (idx == get_cylinder_idx_by_use(dive, OXYGEN))
|
|
|
|
return true;
|
|
|
|
}
|
2017-02-03 10:14:51 +00:00
|
|
|
return !first_gas_explicit && idx == 0;
|
|
|
|
}
|
|
|
|
|
2017-02-03 15:31:03 +00:00
|
|
|
bool is_cylinder_used(struct dive *dive, int idx)
|
2013-05-31 04:40:46 +00:00
|
|
|
{
|
2014-05-13 22:32:45 +00:00
|
|
|
struct divecomputer *dc;
|
2013-11-28 23:40:38 +00:00
|
|
|
if (cylinder_none(&dive->cylinder[idx]))
|
2014-01-15 18:54:41 +00:00
|
|
|
return false;
|
2013-05-31 04:40:46 +00:00
|
|
|
|
2017-02-03 15:31:03 +00:00
|
|
|
if ((dive->cylinder[idx].start.mbar - dive->cylinder[idx].end.mbar) > SOME_GAS)
|
2015-01-28 14:01:07 +00:00
|
|
|
return true;
|
2017-09-14 03:43:12 +00:00
|
|
|
|
|
|
|
if ((dive->cylinder[idx].sample_start.mbar - dive->cylinder[idx].sample_end.mbar) > SOME_GAS)
|
|
|
|
return true;
|
|
|
|
|
2014-05-13 22:32:45 +00:00
|
|
|
for_each_dc(dive, dc) {
|
2017-02-03 10:14:51 +00:00
|
|
|
if (has_gaschange_event(dive, dc, idx))
|
2014-11-17 00:09:19 +00:00
|
|
|
return true;
|
2013-05-31 04:40:46 +00:00
|
|
|
}
|
2014-01-15 18:54:41 +00:00
|
|
|
return false;
|
2013-05-31 04:40:46 +00:00
|
|
|
}
|
|
|
|
|
2013-11-27 22:05:51 +00:00
|
|
|
void get_gas_used(struct dive *dive, volume_t gases[MAX_CYLINDERS])
|
|
|
|
{
|
|
|
|
int idx;
|
2017-02-03 10:14:51 +00:00
|
|
|
|
2013-11-27 22:05:51 +00:00
|
|
|
for (idx = 0; idx < MAX_CYLINDERS; idx++) {
|
|
|
|
cylinder_t *cyl = &dive->cylinder[idx];
|
|
|
|
pressure_t start, end;
|
|
|
|
|
|
|
|
start = cyl->start.mbar ? cyl->start : cyl->sample_start;
|
|
|
|
end = cyl->end.mbar ? cyl->end : cyl->sample_end;
|
2014-04-26 17:55:17 +00:00
|
|
|
if (end.mbar && start.mbar > end.mbar)
|
2013-11-27 22:05:51 +00:00
|
|
|
gases[idx].mliter = gas_volume(cyl, start) - gas_volume(cyl, end);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-06-29 18:01:56 +00:00
|
|
|
/* Quite crude reverse-blender-function, but it produces a approx result */
|
|
|
|
static void get_gas_parts(struct gasmix mix, volume_t vol, int o2_in_topup, volume_t *o2, volume_t *he)
|
|
|
|
{
|
|
|
|
volume_t air = {};
|
|
|
|
|
|
|
|
if (gasmix_is_air(&mix)) {
|
|
|
|
o2->mliter = 0;
|
|
|
|
he->mliter = 0;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2017-03-08 06:41:41 +00:00
|
|
|
air.mliter = lrint(((double)vol.mliter * (1000 - get_he(&mix) - get_o2(&mix))) / (1000 - o2_in_topup));
|
|
|
|
he->mliter = lrint(((double)vol.mliter * get_he(&mix)) / 1000.0);
|
2014-06-29 18:01:56 +00:00
|
|
|
o2->mliter += vol.mliter - he->mliter - air.mliter;
|
|
|
|
}
|
|
|
|
|
|
|
|
void selected_dives_gas_parts(volume_t *o2_tot, volume_t *he_tot)
|
|
|
|
{
|
|
|
|
int i, j;
|
|
|
|
struct dive *d;
|
|
|
|
for_each_dive (i, d) {
|
|
|
|
if (!d->selected)
|
|
|
|
continue;
|
|
|
|
volume_t diveGases[MAX_CYLINDERS] = {};
|
|
|
|
get_gas_used(d, diveGases);
|
|
|
|
for (j = 0; j < MAX_CYLINDERS; j++) {
|
|
|
|
if (diveGases[j].mliter) {
|
|
|
|
volume_t o2 = {}, he = {};
|
|
|
|
get_gas_parts(d->cylinder[j].gasmix, diveGases[j], O2_IN_AIR, &o2, &he);
|
|
|
|
o2_tot->mliter += o2.mliter;
|
|
|
|
he_tot->mliter += he.mliter;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|