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

mobile: remove DiveObjectHelper code

Browse source 
When editing a dive, a DiveObjectHelper of the unmodified dive
was created to compare the edited with the old values. Since
the DiveObjectHelper is used here only as a pointless wrapper
around the formatting functions, call these functions directly.

However, note that the code is in principle wrong since the
change to the mobile-models, which do not use the DiveObjectHelper.
The real fix would be to reload the data from the model to prevent
going out-of-sync with respect to the formatting routines!

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-12-15 16:10:08 +01:00 • committed by Dirk Hohndel
parent cc5ebd7414
commit 1037c15b98
6 changed files with 42 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/string-format.cpp
View file

@ -250,3 +250,10 @@ QString formatDiveTime(const dive *d)
QDateTime localTime = timestampToDateTime(d->when); QDateTime localTime = timestampToDateTime(d->when);
return localTime.time().toString(prefs.time_format); return localTime.time().toString(prefs.time_format);
} }
QString formatDiveDateTime(const dive *d)
{
QDateTime localTime = timestampToDateTime(d->when);
return QStringLiteral("%1 %2").arg(localTime.date().toString(prefs.date_format_short),
localTime.time().toString(prefs.time_format));
}

1
core/string-format.h
View file

@ -24,5 +24,6 @@ QString formatDiveDuration(const dive *d);
QString formatDiveGPS(const dive *d); QString formatDiveGPS(const dive *d);
QString formatDiveDate(const dive *d); QString formatDiveDate(const dive *d);
QString formatDiveTime(const dive *d); QString formatDiveTime(const dive *d);
QString formatDiveDateTime(const dive *d);
#endif #endif

2
core/subsurface-qt/diveobjecthelper.h
View file

@ -96,6 +96,4 @@ public:
QString waterType; QString waterType;
}; };
Q_DECLARE_METATYPE(DiveObjectHelper)
#endif #endif

57
mobile-widgets/qmlmanager.cpp
View file

@ -38,6 +38,7 @@
#include "core/downloadfromdcthread.h" #include "core/downloadfromdcthread.h"
#include "core/subsurfacestartup.h" // for ignore_bt flag #include "core/subsurfacestartup.h" // for ignore_bt flag
#include "core/subsurface-string.h" #include "core/subsurface-string.h"
#include "core/string-format.h"
#include "core/pref.h" #include "core/pref.h"
#include "core/selection.h" #include "core/selection.h"
#include "core/ssrf.h" #include "core/ssrf.h"
@ -851,9 +852,9 @@ static void setupDivesite(DiveSiteChange &res, struct dive *d, struct dive_site
res.changed = true; res.changed = true;
} }
bool QMLManager::checkDate(const DiveObjectHelper &myDive, struct dive *d, QString date) bool QMLManager::checkDate(struct dive *d, QString date)
{ {
QString oldDate = myDive.date() + " " + myDive.time(); QString oldDate = formatDiveDateTime(d);
if (date != oldDate) { if (date != oldDate) {
QDateTime newDate; QDateTime newDate;
// what a pain - Qt will not parse dates if the day of the week is incorrect // what a pain - Qt will not parse dates if the day of the week is incorrect
@ -956,12 +957,13 @@ parsed:
return false; return false;
} }
bool QMLManager::checkLocation(DiveSiteChange &res, const DiveObjectHelper &myDive, struct dive *d, QString location, QString gps) bool QMLManager::checkLocation(DiveSiteChange &res, struct dive *d, QString location, QString gps)
{ {
struct dive_site *ds = get_dive_site_for_dive(d); struct dive_site *ds = get_dive_site_for_dive(d);
bool changed = false; bool changed = false;
qDebug() << "checkLocation" << location << "gps" << gps << "dive had" << myDive.location << "gps" << myDive.gas; QString oldLocation = get_dive_location(d);
if (myDive.location != location) { qDebug() << "checkLocation" << location << "gps" << gps << "dive had" << oldLocation << "gps" << formatDiveGPS(d);
if (oldLocation != location) {
ds = get_dive_site_by_name(qPrintable(location), &dive_site_table); ds = get_dive_site_by_name(qPrintable(location), &dive_site_table);
if (!ds && !location.isEmpty()) { if (!ds && !location.isEmpty()) {
res.createdDs.reset(alloc_dive_site_with_name(qPrintable(location))); res.createdDs.reset(alloc_dive_site_with_name(qPrintable(location)));
@ -974,7 +976,7 @@ bool QMLManager::checkLocation(DiveSiteChange &res, const DiveObjectHelper &myDi
// now make sure that the GPS coordinates match - if the user changed the name but not // now make sure that the GPS coordinates match - if the user changed the name but not
// the GPS coordinates, this still does the right thing as the now new dive site will // the GPS coordinates, this still does the right thing as the now new dive site will
// have no coordinates, so the coordinates from the edit screen will get added // have no coordinates, so the coordinates from the edit screen will get added
if (myDive.gps != gps) { if (formatDiveGPS(d) != gps) {
double lat, lon; double lat, lon;
if (parseGpsText(gps, &lat, &lon)) { if (parseGpsText(gps, &lat, &lon)) {
qDebug() << "parsed GPS, using it"; qDebug() << "parsed GPS, using it";
@ -999,9 +1001,9 @@ bool QMLManager::checkLocation(DiveSiteChange &res, const DiveObjectHelper &myDi
return changed | res.changed; return changed | res.changed;
} }
bool QMLManager::checkDuration(const DiveObjectHelper &myDive, struct dive *d, QString duration) bool QMLManager::checkDuration(struct dive *d, QString duration)
{ {
if (myDive.duration != duration) { if (formatDiveDuration(d) != duration) {
int h = 0, m = 0, s = 0; int h = 0, m = 0, s = 0;
QRegExp r1(QStringLiteral("(\\d*)\\s*%1[\\s,:]*(\\d*)\\s*%2[\\s,:]*(\\d*)\\s*%3").arg(tr("h")).arg(tr("min")).arg(tr("sec")), Qt::CaseInsensitive); QRegExp r1(QStringLiteral("(\\d*)\\s*%1[\\s,:]*(\\d*)\\s*%2[\\s,:]*(\\d*)\\s*%3").arg(tr("h")).arg(tr("min")).arg(tr("sec")), Qt::CaseInsensitive);
QRegExp r2(QStringLiteral("(\\d*)\\s*%1[\\s,:]*(\\d*)\\s*%2").arg(tr("h")).arg(tr("min")), Qt::CaseInsensitive); QRegExp r2(QStringLiteral("(\\d*)\\s*%1[\\s,:]*(\\d*)\\s*%2").arg(tr("h")).arg(tr("min")), Qt::CaseInsensitive);
@ -1038,9 +1040,9 @@ bool QMLManager::checkDuration(const DiveObjectHelper &myDive, struct dive *d, Q
return false; return false;
} }
bool QMLManager::checkDepth(const DiveObjectHelper &myDive, dive *d, QString depth) bool QMLManager::checkDepth(dive *d, QString depth)
{ {
if (myDive.depth != depth) { if (get_depth_string(d->dc.maxdepth.mm, true, true) != depth) {
int depthValue = parseLengthToMm(depth); int depthValue = parseLengthToMm(depth);
// the QML code should stop negative depth, but massively huge depth can make // the QML code should stop negative depth, but massively huge depth can make
// the profile extremely slow or even run out of memory and crash, so keep // the profile extremely slow or even run out of memory and crash, so keep
@ -1072,7 +1074,6 @@ void QMLManager::commitChanges(QString diveId, QString number, QString date, QSt
Command::OwningDivePtr d_ptr(alloc_dive()); // Automatically delete dive if we exit early! Command::OwningDivePtr d_ptr(alloc_dive()); // Automatically delete dive if we exit early!
dive *d = d_ptr.get(); dive *d = d_ptr.get();
copy_dive(orig, d); copy_dive(orig, d);
DiveObjectHelper myDive(d);
// notes comes back as rich text - let's convert this into plain text // notes comes back as rich text - let's convert this into plain text
QTextDocument doc; QTextDocument doc;
@ -1081,28 +1082,28 @@ void QMLManager::commitChanges(QString diveId, QString number, QString date, QSt
bool diveChanged = false; bool diveChanged = false;
diveChanged = checkDate(myDive, d, date); diveChanged = checkDate(d, date);
DiveSiteChange dsChange; DiveSiteChange dsChange;
diveChanged |= checkLocation(dsChange, myDive, d, location, gps); diveChanged |= checkLocation(dsChange, d, location, gps);
diveChanged |= checkDuration(myDive, d, duration); diveChanged |= checkDuration(d, duration);
diveChanged |= checkDepth(myDive, d, depth); diveChanged |= checkDepth(d, depth);
if (QString::number(myDive.number) != number) { if (QString::number(d->number) != number) {
diveChanged = true; diveChanged = true;
d->number = number.toInt(); d->number = number.toInt();
} }
if (myDive.airTemp != airtemp) { if (get_temperature_string(d->airtemp, true) != airtemp) {
diveChanged = true; diveChanged = true;
d->airtemp.mkelvin = parseTemperatureToMkelvin(airtemp); d->airtemp.mkelvin = parseTemperatureToMkelvin(airtemp);
} }
if (myDive.waterTemp != watertemp) { if (get_temperature_string(d->watertemp, true) != watertemp) {
diveChanged = true; diveChanged = true;
d->watertemp.mkelvin = parseTemperatureToMkelvin(watertemp); d->watertemp.mkelvin = parseTemperatureToMkelvin(watertemp);
} }
if (myDive.sumWeight != weight) { if (formatSumWeight(d) != weight) {
diveChanged = true; diveChanged = true;
// not sure what we'd do if there was more than one weight system // not sure what we'd do if there was more than one weight system
// defined - for now just ignore that case // defined - for now just ignore that case
@ -1119,7 +1120,7 @@ void QMLManager::commitChanges(QString diveId, QString number, QString date, QSt
startpressure = QStringList(); startpressure = QStringList();
if (endpressure == QStringList(QString())) if (endpressure == QStringList(QString()))
endpressure = QStringList(); endpressure = QStringList();
if (myDive.startPressure != startpressure || myDive.endPressure != endpressure) { if (formatStartPressure(d) != startpressure || formatEndPressure(d) != endpressure) {
diveChanged = true; diveChanged = true;
for ( int i = 0, j = 0 ; j < startpressure.length() && j < endpressure.length() ; i++ ) { for ( int i = 0, j = 0 ; j < startpressure.length() && j < endpressure.length() ; i++ ) {
if (state != "add" && !is_cylinder_used(d, i)) if (state != "add" && !is_cylinder_used(d, i))
@ -1135,7 +1136,7 @@ void QMLManager::commitChanges(QString diveId, QString number, QString date, QSt
} }
} }
// gasmix for first cylinder // gasmix for first cylinder
if (myDive.firstGas != gasmix) { if (formatFirstGas(d) != gasmix) {
for ( int i = 0, j = 0 ; j < gasmix.length() ; i++ ) { for ( int i = 0, j = 0 ; j < gasmix.length() ; i++ ) {
if (state != "add" && !is_cylinder_used(d, i)) if (state != "add" && !is_cylinder_used(d, i))
continue; continue;
@ -1154,7 +1155,7 @@ void QMLManager::commitChanges(QString diveId, QString number, QString date, QSt
} }
} }
// info for first cylinder // info for first cylinder
if (myDive.getCylinder != usedCylinder) { if (formatGetCylinder(d) != usedCylinder) {
diveChanged = true; diveChanged = true;
int size = 0, wp = 0, j = 0, k = 0; int size = 0, wp = 0, j = 0, k = 0;
for (j = 0; k < usedCylinder.length(); j++) { for (j = 0; k < usedCylinder.length(); j++) {
@ -1180,12 +1181,12 @@ void QMLManager::commitChanges(QString diveId, QString number, QString date, QSt
k++; k++;
} }
} }
if (myDive.suit != suit) { if (d->suit != suit) {
diveChanged = true; diveChanged = true;
free(d->suit); free(d->suit);
d->suit = copy_qstring(suit); d->suit = copy_qstring(suit);
} }
if (myDive.buddy != buddy) { if (d->buddy != buddy) {
if (buddy.contains(",")){ if (buddy.contains(",")){
buddy = buddy.replace(QRegExp("\\s*,\\s*"), ", "); buddy = buddy.replace(QRegExp("\\s*,\\s*"), ", ");
} }
@ -1193,7 +1194,7 @@ void QMLManager::commitChanges(QString diveId, QString number, QString date, QSt
free(d->buddy); free(d->buddy);
d->buddy = copy_qstring(buddy); d->buddy = copy_qstring(buddy);
} }
if (myDive.divemaster != diveMaster) { if (d->divemaster != diveMaster) {
if (diveMaster.contains(",")){ if (diveMaster.contains(",")){
diveMaster = diveMaster.replace(QRegExp("\\s*,\\s*"), ", "); diveMaster = diveMaster.replace(QRegExp("\\s*,\\s*"), ", ");
} }
@ -1201,15 +1202,15 @@ void QMLManager::commitChanges(QString diveId, QString number, QString date, QSt
free(d->divemaster); free(d->divemaster);
d->divemaster = copy_qstring(diveMaster); d->divemaster = copy_qstring(diveMaster);
} }
if (myDive.rating != rating) { if (d->rating != rating) {
diveChanged = true; diveChanged = true;
d->rating = rating; d->rating = rating;
} }
if (myDive.visibility != visibility) { if (d->visibility != visibility) {
diveChanged = true; diveChanged = true;
d->visibility = visibility; d->visibility = visibility;
} }
if (myDive.notes != notes) { if (formatNotes(d) != notes) {
diveChanged = true; diveChanged = true;
free(d->notes); free(d->notes);
d->notes = copy_qstring(notes); d->notes = copy_qstring(notes);

8
mobile-widgets/qmlmanager.h
View file

@ -261,10 +261,10 @@ private:
QString m_notificationText; QString m_notificationText;
qreal m_lastDevicePixelRatio; qreal m_lastDevicePixelRatio;
QElapsedTimer timer; QElapsedTimer timer;
bool checkDate(const DiveObjectHelper &myDive, struct dive *d, QString date); bool checkDate(struct dive *d, QString date);
bool checkLocation(DiveSiteChange &change, const DiveObjectHelper &myDive, struct dive *d, QString location, QString gps); bool checkLocation(DiveSiteChange &change, struct dive *d, QString location, QString gps);
bool checkDuration(const DiveObjectHelper &myDive, struct dive *d, QString duration); bool checkDuration(struct dive *d, QString duration);
bool checkDepth(const DiveObjectHelper &myDive, struct dive *d, QString depth); bool checkDepth(struct dive *d, QString depth);
bool currentGitLocalOnly; bool currentGitLocalOnly;
bool localChanges; bool localChanges;
QString m_progressMessage; QString m_progressMessage;

6
qt-models/divetripmodel.cpp
View file

@ -197,11 +197,7 @@ QVariant DiveTripModelBase::diveData(const struct dive *d, int column, int role)
// We have to return a QString as trip-id, because that will be used as section // We have to return a QString as trip-id, because that will be used as section
// variable in the QtQuick list view. That has to be a string because it will try // variable in the QtQuick list view. That has to be a string because it will try
// to do locale-aware sorting. And amazingly this can't be changed. // to do locale-aware sorting. And amazingly this can't be changed.
case MobileListModel::DateTimeRole: { case MobileListModel::DateTimeRole: return formatDiveDateTime(d);
QDateTime localTime = timestampToDateTime(d->when);
return QStringLiteral("%1 %2").arg(localTime.date().toString(prefs.date_format_short),
localTime.time().toString(prefs.time_format));
}
case MobileListModel::IdRole: return d->id; case MobileListModel::IdRole: return d->id;
case MobileListModel::NumberRole: return d->number; case MobileListModel::NumberRole: return d->number;
case MobileListModel::LocationRole: return get_dive_location(d); case MobileListModel::LocationRole: return get_dive_location(d);