mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

divesummary: correct SAC calculation

Browse source 
Do not count dives where SAC == 0.

Signed-off-by: jan Iversen <jan@casacondor.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
jan Iversen 2020-01-28 16:50:21 +01:00 • committed by Dirk Hohndel
parent 303b5865cd
commit eec1511218
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
backend-shared/divesummary.cpp
View file

@ -11,6 +11,7 @@ timestamp_t diveSummary::firstDive, diveSummary::lastDive;
int diveSummary::dives[2], diveSummary::divesEAN[2], diveSummary::divesDeep[2], diveSummary::diveplans[2]; int diveSummary::dives[2], diveSummary::divesEAN[2], diveSummary::divesDeep[2], diveSummary::diveplans[2];
long diveSummary::divetime[2], diveSummary::depth[2], diveSummary::sac[2]; long diveSummary::divetime[2], diveSummary::depth[2], diveSummary::sac[2];
long diveSummary::divetimeMax[2], diveSummary::depthMax[2], diveSummary::sacMin[2]; long diveSummary::divetimeMax[2], diveSummary::depthMax[2], diveSummary::sacMin[2];
int diveSummary::divesSAC[2];
void diveSummary::summaryCalculation(int primaryPeriod, int secondaryPeriod) void diveSummary::summaryCalculation(int primaryPeriod, int secondaryPeriod)
{ {
@ -64,6 +65,7 @@ void diveSummary::loopDives(timestamp_t primaryStart, timestamp_t secondaryStart
sac[0] = sac[1] = 0; sac[0] = sac[1] = 0;
divetimeMax[0] = divetimeMax[1] = depthMax[0] = depthMax[1] = 0; divetimeMax[0] = divetimeMax[1] = depthMax[0] = depthMax[1] = 0;
sacMin[0] = sacMin[1] = 99999; sacMin[0] = sacMin[1] = 99999;
divesSAC[0] = divesSAC[1] = 0;
for_each_dive (i, dive) { for_each_dive (i, dive) {
// remember time of oldest and newest dive // remember time of oldest and newest dive
@ -113,9 +115,12 @@ void diveSummary::calculateDive(int inx, struct dive *dive)
// sum SAC in liters, check for new max. // sum SAC in liters, check for new max.
temp = dive->sac / 1000; temp = dive->sac / 1000;
sac[inx] += temp; if (temp) {
if (temp < sacMin[inx]) divesSAC[inx]++;
sacMin[inx] = temp; sac[inx] += temp;
if (temp < sacMin[inx])
sacMin[inx] = temp;
}
// EAN dive ? // EAN dive ?
for (int j = 0; j < dive->cylinders.nr; ++j) { for (int j = 0; j < dive->cylinders.nr; ++j) {
@ -161,8 +166,10 @@ void diveSummary::buildStringList(int inx)
// SAC // SAC
tempStr = (qPrefUnits::volume() == units::LITER) ? "l/min" : "cuft/min"; tempStr = (qPrefUnits::volume() == units::LITER) ? "l/min" : "cuft/min";
diveSummaryText[18+inx] = QStringLiteral("%1 %2").arg(sacMin[inx]).arg(tempStr); diveSummaryText[18+inx] = QStringLiteral("%1 %2").arg(sacMin[inx]).arg(tempStr);
temp1 = depth[inx] / dives[inx]; if (divesSAC[inx]) {
diveSummaryText[20+inx] = QStringLiteral("%1%2").arg(temp1).arg(tempStr); temp1 = depth[inx] / divesSAC[inx];
diveSummaryText[20+inx] = QStringLiteral("%1%2").arg(temp1).arg(tempStr);
}
// Diveplan(s) // Diveplan(s)
diveSummaryText[22+inx] = QStringLiteral("%1").arg(diveplans[inx]); diveSummaryText[22+inx] = QStringLiteral("%1").arg(diveplans[inx]);

1
backend-shared/divesummary.h
View file

@ -24,5 +24,6 @@ private:
static long divetime[2], depth[2], sac[2]; static long divetime[2], depth[2], sac[2];
static long divetimeMax[2], depthMax[2], sacMin[2]; static long divetimeMax[2], depthMax[2], sacMin[2];
static long divetimeAvg[2], depthAvg[2], sacAvg[2]; static long divetimeAvg[2], depthAvg[2], sacAvg[2];
static int divesSAC[2];
}; };
#endif // DIVESUMMARY_H #endif // DIVESUMMARY_H