diff options
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | core/statistics.c | 1 | ||||
| -rw-r--r-- | core/statistics.h | 1 | ||||
| -rw-r--r-- | qt-models/yearlystatisticsmodel.cpp | 8 | ||||
| -rw-r--r-- | qt-models/yearlystatisticsmodel.h | 1 |
5 files changed, 12 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 1235bc033..4eca23ee8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +- Include average max depth in statistics - Fix bug in cloud save after removing dives from a trip - Dive: Perform more accurate OTU calculations, and include OTU calculations for rebreather dives [#1851 & #1865]. diff --git a/core/statistics.c b/core/statistics.c index 6f5efe64f..d6d9418d7 100644 --- a/core/statistics.c +++ b/core/statistics.c @@ -53,6 +53,7 @@ static void process_dive(struct dive *dive, stats_t *stats) stats->max_depth.mm = dive->maxdepth.mm; if (stats->min_depth.mm == 0 || dive->maxdepth.mm < stats->min_depth.mm) stats->min_depth.mm = dive->maxdepth.mm; + stats->combined_max_depth.mm += dive->maxdepth.mm; process_temperatures(dive, stats); diff --git a/core/statistics.h b/core/statistics.h index d3707b9cb..6072f93b2 100644 --- a/core/statistics.h +++ b/core/statistics.h @@ -24,6 +24,7 @@ typedef struct depth_t max_depth; depth_t min_depth; depth_t avg_depth; + depth_t combined_max_depth; volume_t max_sac; volume_t min_sac; volume_t avg_sac; diff --git a/qt-models/yearlystatisticsmodel.cpp b/qt-models/yearlystatisticsmodel.cpp index c8aa2639b..fa86cffbe 100644 --- a/qt-models/yearlystatisticsmodel.cpp +++ b/qt-models/yearlystatisticsmodel.cpp @@ -15,6 +15,7 @@ public: SHORTEST_TIME, LONGEST_TIME, AVG_DEPTH, + AVG_MAX_DEPTH, MIN_DEPTH, MAX_DEPTH, AVG_SAC, @@ -74,6 +75,10 @@ QVariant YearStatisticsItem::data(int column, int role) const case AVG_DEPTH: ret = get_depth_string(stats_interval.avg_depth); break; + case AVG_MAX_DEPTH: + if (stats_interval.selection_size) + ret = get_depth_string(stats_interval.combined_max_depth.mm / stats_interval.selection_size); + break; case MIN_DEPTH: ret = get_depth_string(stats_interval.min_depth); break; @@ -143,6 +148,9 @@ QVariant YearlyStatisticsModel::headerData(int section, Qt::Orientation orientat case AVG_DEPTH: val = QString(tr("Depth (%1)\n Average")).arg(get_depth_unit()); break; + case AVG_MAX_DEPTH: + val = tr("\nAverage maximum"); + break; case MIN_DEPTH: val = tr("\nMinimum"); break; diff --git a/qt-models/yearlystatisticsmodel.h b/qt-models/yearlystatisticsmodel.h index 77a5ae074..99e646388 100644 --- a/qt-models/yearlystatisticsmodel.h +++ b/qt-models/yearlystatisticsmodel.h @@ -15,6 +15,7 @@ public: SHORTEST_TIME, LONGEST_TIME, AVG_DEPTH, + AVG_MAX_DEPTH, MIN_DEPTH, MAX_DEPTH, AVG_SAC, |