mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 13:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add dive type to statistics window

Browse source 
This adds dive type based division to the "yearly statistics" window.
Thus people can see the stats from individually from OC, CCR, PSCR and
freedive.

See #949

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Miika Turkia 2016-01-17 21:18:36 +02:00 committed by Dirk Hohndel
parent b9000208fe
commit 37c10c8fd6
3 changed files with 40 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
qt-models/yearlystatisticsmodel.cpp
View file

@ -202,4 +202,18 @@ void YearlyStatisticsModel::update_yearly_stats()
rootItem->children.append(item);
item->parent = rootItem;
}
/* Show the statistic sorted by dive type */
if (stats_by_type != NULL && stats_by_type[0].selection_size) {
YearStatisticsItem *item = new YearStatisticsItem(stats_by_type[0]);
for (i = 1; i <= sizeof(dive_comp_type) + 1; ++i) {
if (stats_by_type[i].selection_size == 0)
continue;
YearStatisticsItem *iChild = new YearStatisticsItem(stats_by_type[i]);
item->children.append(iChild);
iChild->parent = item;
}
rootItem->children.append(item);
item->parent = rootItem;
}
}

26
subsurface-core/statistics.c
View file

@ -20,6 +20,7 @@ stats_t stats_selection;
stats_t *stats_monthly = NULL;
stats_t *stats_yearly = NULL;
stats_t *stats_by_trip = NULL;
stats_t *stats_by_type = NULL;
static void process_temperatures(struct dive *dp, stats_t *stats)
{
@ -117,18 +118,34 @@ void process_all_dives(struct dive *dive, struct dive **prev_dive)
free(stats_yearly);
free(stats_monthly);
free(stats_by_trip);
free(stats_by_type);
size = sizeof(stats_t) * (dive_table.nr + 1);
stats_yearly = malloc(size);
stats_monthly = malloc(size);
stats_by_trip = malloc(size);
if (!stats_yearly || !stats_monthly || !stats_by_trip)
stats_by_type = malloc(size);
if (!stats_yearly || !stats_monthly || !stats_by_trip || !stats_by_type)
return;
memset(stats_yearly, 0, size);
memset(stats_monthly, 0, size);
memset(stats_by_trip, 0, size);
memset(stats_by_type, 0, size);
stats_yearly[0].is_year = true;
/* Setting the is_trip to true to show the location as first
* field in the statistics window */
stats_by_type[0].location = strdup("All (by type stats)");
stats_by_type[0].is_trip = true;
stats_by_type[1].location = strdup("OC");
stats_by_type[1].is_trip = true;
stats_by_type[2].location = strdup("CCR");
stats_by_type[2].is_trip = true;
stats_by_type[3].location = strdup("pSCR");
stats_by_type[3].is_trip = true;
stats_by_type[4].location = strdup("Freedive");
stats_by_type[4].is_trip = true;
/* this relies on the fact that the dives in the dive_table
* are in chronological order */
for_each_dive (idx, dp) {
@ -154,6 +171,13 @@ void process_all_dives(struct dive *dive, struct dive **prev_dive)
stats_yearly[year_iter].selection_size++;
stats_yearly[year_iter].period = current_year;
/* 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++;
if (dp->divetrip != NULL) {
if (trip_ptr != dp->divetrip) {
trip_ptr = dp->divetrip;

1
subsurface-core/statistics.h
View file

@ -39,6 +39,7 @@ extern stats_t stats_selection;
extern stats_t *stats_yearly;
extern stats_t *stats_monthly;
extern stats_t *stats_by_trip;
extern stats_t *stats_by_type;
extern char *get_time_string_s(int seconds, int maxdays, bool freediving);
extern char *get_minutes(int seconds);