mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

mobile/summary: remove backend-share/divesummary.[h|cpp]

Browse source 
These were replaced by a model.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-02-08 10:21:30 +01:00 committed by Dirk Hohndel
parent 6c7411c776
commit 641ca47fd5
4 changed files with 0 additions and 221 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
backend-shared/CMakeLists.txt
View file

@ -1,7 +1,6 @@
# backend functionality shared between Desktop (UI) and Mobile (QML) # backend functionality shared between Desktop (UI) and Mobile (QML)
set(BACKEND_SRCS set(BACKEND_SRCS
divesummary.cpp
exportfuncs.cpp exportfuncs.cpp
exportfuncs.h exportfuncs.h
plannershared.cpp plannershared.cpp

189
backend-shared/divesummary.cpp
View file

@ -1,189 +0,0 @@
// SPDX-License-Identifier: GPL-2.0
#include "divesummary.h"
#include "core/qthelper.h"
#include "core/settings/qPrefUnit.h"
#include <QDateTime>
QStringList diveSummary::diveSummaryText;
timestamp_t diveSummary::firstDive, diveSummary::lastDive;
int diveSummary::dives[2], diveSummary::divesEAN[2], diveSummary::divesDeep[2], diveSummary::diveplans[2];
long diveSummary::divetime[2], diveSummary::depth[2];
long diveSummary::divetimeMax[2], diveSummary::depthMax[2], diveSummary::sacMin[2], diveSummary::sacMax[2];
long diveSummary::totalSACTime[2], diveSummary::totalSacVolume[2];
void diveSummary::summaryCalculation(int primaryPeriod, int secondaryPeriod)
{
QDateTime localTime;
// Calculate Start of the 2 periods.
timestamp_t now, primaryStart, secondaryStart;
now = QDateTime::currentMSecsSinceEpoch() / 1000L + gettimezoneoffset();
primaryStart = (primaryPeriod == 0) ? 0 : now - primaryPeriod * 30 * 24 * 60 * 60;
secondaryStart = (secondaryPeriod == 0) ? 0 : now - secondaryPeriod * 30 * 24 * 60 * 60;
// Loop over all dives and sum up data
loopDives(primaryStart, secondaryStart);
// prepare stringlist
diveSummaryText.clear();
diveSummaryText << "??" << "??" << QObject::tr("no dives in period") << QObject::tr("no divies in period") << "??" <<
"??" << "??" << "??" <<
"?:??" << "?:??" << "?:??" <<
"?:??" << "?:??" << "?:??" <<
"??" << "??" << "??" << "??" << "??" <<
"??" << "??" << "??" << "??" << "??" << "??" << "??";
// set oldest/newest date
if (firstDive) {
localTime = QDateTime::fromMSecsSinceEpoch(1000 * firstDive, Qt::UTC);
localTime.setTimeSpec(Qt::UTC);
diveSummaryText[0] = QStringLiteral("%1").arg(localTime.date().toString(prefs.date_format_short));
}
if (lastDive) {
localTime = QDateTime::fromMSecsSinceEpoch(1000 * lastDive, Qt::UTC);
localTime.setTimeSpec(Qt::UTC);
diveSummaryText[1] = QStringLiteral("%1").arg(localTime.date().toString(prefs.date_format_short));
}
// and add data
buildStringList(0);
buildStringList(1);
}
void diveSummary::loopDives(timestamp_t primaryStart, timestamp_t secondaryStart)
{
struct dive *dive;
int i;
// Clear summary data
firstDive = lastDive = 0;
dives[0] = dives[1] = divesEAN[0] = divesEAN[1] = 0;
divesDeep[0] = divesDeep[1] = diveplans[0] = diveplans[1] = 0;
divetime[0] = divetime[1] = depth[0] = depth[1] = 0;
divetimeMax[0] = divetimeMax[1] = depthMax[0] = depthMax[1] = 0;
sacMin[0] = sacMin[1] = 99999;
sacMax[0] = sacMax[1] = 0;
totalSACTime[0] = totalSACTime[1] = 0;
totalSacVolume[0] = totalSacVolume[1] = 0;
for_each_dive (i, dive) {
// remember time of oldest and newest dive
if (i == 0)
firstDive = dive->when;
if (dive->when > lastDive)
lastDive = dive->when;
// check if dive is newer than primaryStart (add to first column)
if (dive->when > primaryStart) {
if (is_dc_planner(&dive->dc))
diveplans[0]++;
else
calculateDive(0, dive);
}
// check if dive is newer than secondaryStart (add to second column)
if (dive->when > secondaryStart) {
if (is_dc_planner(&dive->dc))
diveplans[1]++;
else
calculateDive(1, dive);
}
}
}
void diveSummary::calculateDive(int inx, struct dive *dive)
{
// one more real dive
dives[inx]++;
// sum dive in minutes and check for new max.
divetime[inx] += dive->duration.seconds;
if (dive->duration.seconds > divetimeMax[inx])
divetimeMax[inx] = dive->duration.seconds;
// sum depth in meters, check for new max. and if dive is a deep dive
depth[inx] += dive->maxdepth.mm;
if (dive->maxdepth.mm > depthMax[inx])
depthMax[inx] = dive->maxdepth.mm;
if (dive->maxdepth.mm > 39000)
divesDeep[inx]++;
// sum SAC, check for new min/max.
if (dive->sac) {
totalSACTime[inx] += dive->duration.seconds;
totalSacVolume[inx] += dive->sac * dive->duration.seconds;
if (dive->sac < sacMin[inx])
sacMin[inx] = dive->sac;
if (dive->sac > sacMax[inx])
sacMax[inx] = dive->sac;
}
// EAN dive ?
for (int j = 0; j < dive->cylinders.nr; ++j) {
if (dive->cylinders.cylinders[j].gasmix.o2.permille > 210) {
divesEAN[inx]++;
break;
}
}
}
static QString timeString(long duration)
{
long hours = duration / 3600;
long minutes = (duration - hours * 3600) / 60;
if (hours >= 100)
return QStringLiteral("%1h").arg(hours);
else
return QStringLiteral("%1:%2").arg(hours).arg(minutes, 2, 10, QChar('0'));
}
static QString depthString(long depth)
{
return QString("%1").arg((qPrefUnits::length() == units::METERS) ? depth / 1000 : lrint(mm_to_feet(depth)));
}
static QString volumeString(long volume)
{
return QString("%1").arg((qPrefUnits::volume() == units::LITER) ? volume / 1000 : round(100.0 * ml_to_cuft(volume)) / 100.0);
}
void diveSummary::buildStringList(int inx)
{
if (!dives[inx]) {
diveSummaryText[2+inx] = QObject::tr("no dives in period");
return;
}
// dives
diveSummaryText[2+inx] = QStringLiteral("%1").arg(dives[inx]);
diveSummaryText[4+inx] = QStringLiteral("%1").arg(divesEAN[inx]);
diveSummaryText[6+inx] = QStringLiteral("%1").arg(divesDeep[inx]);
// time
diveSummaryText[8+inx] = timeString(divetime[inx]);
diveSummaryText[10+inx] = timeString(divetimeMax[inx]);
diveSummaryText[12+inx] = timeString(divetime[inx] / dives[inx]);
// depth
QString unitText = (qPrefUnits::length() == units::METERS) ? " m" : " ft";
diveSummaryText[14+inx] = depthString(depthMax[inx]) + unitText;
diveSummaryText[16+inx] = depthString(depth[inx] / dives[inx]) + unitText;
// SAC
unitText = (qPrefUnits::volume() == units::LITER) ? " l/min" : " cuft/min";
diveSummaryText[18+inx] = volumeString(sacMin[inx]) + unitText;
diveSummaryText[20+inx] = volumeString(sacMax[inx]) + unitText;
// finally the weighted average
if (totalSACTime[inx]) {
long avgSac = totalSacVolume[inx] / totalSACTime[inx];
diveSummaryText[22+inx] = volumeString(avgSac) + unitText;
} else {
diveSummaryText[22+inx] = QObject::tr("no dives");
}
// Diveplan(s)
diveSummaryText[24+inx] = QStringLiteral("%1").arg(diveplans[inx]);
}

29
backend-shared/divesummary.h
View file

@ -1,29 +0,0 @@
// SPDX-License-Identifier: GPL-2.0
#ifndef DIVESUMMARY_H
#define DIVESUMMARY_H
#include <QStringList>
#include "core/dive.h"
class diveSummary {
public:
static void summaryCalculation(int primaryPeriod, int secondaryPeriod);
static QStringList diveSummaryText;
private:
diveSummary() {}
static void loopDives(timestamp_t primaryStart, timestamp_t secondaryStart);
static void calculateDive(int inx, struct dive *dive);
static void buildStringList(int inx);
static timestamp_t firstDive, lastDive;
static int dives[2], divesEAN[2], divesDeep[2], diveplans[2];
static long divetime[2], depth[2];
static long divetimeMax[2], depthMax[2], sacMin[2], sacMax[2];
static long divetimeAvg[2], depthAvg[2], sacAvg[2];
static long totalSACTime[2], totalSacVolume[2];
};
#endif // DIVESUMMARY_H

2
packaging/ios/Subsurface-mobile.pro
View file

@ -108,7 +108,6 @@ SOURCES += ../../subsurface-mobile-main.cpp \
../../core/subsurface-qt/cylinderobjecthelper.cpp \ ../../core/subsurface-qt/cylinderobjecthelper.cpp \
../../core/subsurface-qt/diveobjecthelper.cpp \ ../../core/subsurface-qt/diveobjecthelper.cpp \
../../core/subsurface-qt/DiveListNotifier.cpp \ ../../core/subsurface-qt/DiveListNotifier.cpp \
../../backend-shared/divesummary.cpp \
../../backend-shared/exportfuncs.cpp \ ../../backend-shared/exportfuncs.cpp \
../../backend-shared/plannershared.cpp \ ../../backend-shared/plannershared.cpp \
../../mobile-widgets/qmlinterface.cpp \ ../../mobile-widgets/qmlinterface.cpp \
@ -244,7 +243,6 @@ HEADERS += \
../../core/subsurface-qt/cylinderobjecthelper.h \ ../../core/subsurface-qt/cylinderobjecthelper.h \
../../core/subsurface-qt/diveobjecthelper.h \ ../../core/subsurface-qt/diveobjecthelper.h \
../../core/subsurface-qt/divelistnotifier.h \ ../../core/subsurface-qt/divelistnotifier.h \
../../backend-shared/divesummary.h \
../../backend-shared/exportfuncs.h \ ../../backend-shared/exportfuncs.h \
../../backend-shared/plannershared.h \ ../../backend-shared/plannershared.h \
../../mobile-widgets/qmlinterface.h \ ../../mobile-widgets/qmlinterface.h \