mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 13:10:19 +00:00
71d74f9e3c
I couldn't figure out how to break this down into small, useful commits. Part of the problem is that I kept going while working on this and as you can see from looking at the commit, diff tries so hard to find small code fragments that moved around, that the diff overall becomes quite unreadable and it seemed impossible to recreate the sequence of steps after the fact. It all started with adding the parsing for the GPS coordinates. But while testing that code I found several issues with the rest of the function. Most importantly it seemed ridiculous that we carefully tried to match the texts that the DiveObjectHelper would create for the various fields, instead of just using the DiveObjectHelper to do just that. And once I had converted that I once again realized just how long and hard to understand that function was getting and decided to break out some of the more complex parts into their own helper functions. But of course all this didn't happen in this logical, structured, ordered way. Instead I did all of these things at the same time, testing, rearranging, etc. So in the end I went with one BIG commit that does all of this in one fell swoop. This adds four helper functions to deal with start time/date, duration, location and gps coordinates, and depth of the dive. To avoid mistakes when dealing with the GPS coordinates, there's another helper to encapsulate the creation of the dive site and we switched to a current GPS location. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
186 lines
6.3 KiB
C++
186 lines
6.3 KiB
C++
#ifndef QMLMANAGER_H
|
|
#define QMLMANAGER_H
|
|
|
|
#include <QObject>
|
|
#include <QString>
|
|
#include <QNetworkAccessManager>
|
|
#include <QScreen>
|
|
#include <QElapsedTimer>
|
|
|
|
#include "core/gpslocation.h"
|
|
#include "qt-models/divelistmodel.h"
|
|
|
|
class QMLManager : public QObject {
|
|
Q_OBJECT
|
|
Q_ENUMS(credentialStatus_t)
|
|
Q_PROPERTY(QString cloudUserName READ cloudUserName WRITE setCloudUserName NOTIFY cloudUserNameChanged)
|
|
Q_PROPERTY(QString cloudPassword READ cloudPassword WRITE setCloudPassword NOTIFY cloudPasswordChanged)
|
|
Q_PROPERTY(QString logText READ logText WRITE setLogText NOTIFY logTextChanged)
|
|
Q_PROPERTY(bool locationServiceEnabled READ locationServiceEnabled WRITE setLocationServiceEnabled NOTIFY locationServiceEnabledChanged)
|
|
Q_PROPERTY(int distanceThreshold READ distanceThreshold WRITE setDistanceThreshold NOTIFY distanceThresholdChanged)
|
|
Q_PROPERTY(int timeThreshold READ timeThreshold WRITE setTimeThreshold NOTIFY timeThresholdChanged)
|
|
Q_PROPERTY(bool loadFromCloud READ loadFromCloud WRITE setLoadFromCloud NOTIFY loadFromCloudChanged)
|
|
Q_PROPERTY(QString startPageText READ startPageText WRITE setStartPageText NOTIFY startPageTextChanged)
|
|
Q_PROPERTY(bool verboseEnabled READ verboseEnabled WRITE setVerboseEnabled NOTIFY verboseEnabledChanged)
|
|
Q_PROPERTY(credentialStatus_t credentialStatus READ credentialStatus WRITE setCredentialStatus NOTIFY credentialStatusChanged)
|
|
Q_PROPERTY(credentialStatus_t oldStatus READ oldStatus WRITE setOldStatus NOTIFY oldStatusChanged)
|
|
Q_PROPERTY(int accessingCloud READ accessingCloud WRITE setAccessingCloud NOTIFY accessingCloudChanged)
|
|
Q_PROPERTY(bool syncToCloud READ syncToCloud WRITE setSyncToCloud NOTIFY syncToCloudChanged)
|
|
Q_PROPERTY(int updateSelectedDive READ updateSelectedDive WRITE setUpdateSelectedDive NOTIFY updateSelectedDiveChanged)
|
|
Q_PROPERTY(int selectedDiveTimestamp READ selectedDiveTimestamp WRITE setSelectedDiveTimestamp NOTIFY selectedDiveTimestampChanged)
|
|
|
|
public:
|
|
QMLManager();
|
|
~QMLManager();
|
|
|
|
enum credentialStatus_t {
|
|
INCOMPLETE,
|
|
UNKNOWN,
|
|
INVALID,
|
|
VALID_EMAIL,
|
|
VALID
|
|
};
|
|
|
|
static QMLManager *instance();
|
|
|
|
QString cloudUserName() const;
|
|
void setCloudUserName(const QString &cloudUserName);
|
|
|
|
QString cloudPassword() const;
|
|
void setCloudPassword(const QString &cloudPassword);
|
|
|
|
bool locationServiceEnabled() const;
|
|
void setLocationServiceEnabled(bool locationServiceEnable);
|
|
|
|
bool verboseEnabled() const;
|
|
void setVerboseEnabled(bool verboseMode);
|
|
|
|
int distanceThreshold() const;
|
|
void setDistanceThreshold(int distance);
|
|
|
|
int timeThreshold() const;
|
|
void setTimeThreshold(int time);
|
|
|
|
bool loadFromCloud() const;
|
|
void setLoadFromCloud(bool done);
|
|
void syncLoadFromCloud();
|
|
|
|
QString startPageText() const;
|
|
void setStartPageText(const QString& text);
|
|
|
|
credentialStatus_t credentialStatus() const;
|
|
void setCredentialStatus(const credentialStatus_t value);
|
|
|
|
credentialStatus_t oldStatus() const;
|
|
void setOldStatus(const credentialStatus_t value);
|
|
|
|
QString logText() const;
|
|
void setLogText(const QString &logText);
|
|
|
|
int accessingCloud() const;
|
|
void setAccessingCloud(int status);
|
|
|
|
bool syncToCloud() const;
|
|
void setSyncToCloud(bool status);
|
|
|
|
int updateSelectedDive() const;
|
|
void setUpdateSelectedDive(int idx);
|
|
|
|
int selectedDiveTimestamp() const;
|
|
void setSelectedDiveTimestamp(int when);
|
|
|
|
typedef void (QMLManager::*execute_function_type)();
|
|
DiveListSortModel *dlSortModel;
|
|
|
|
public slots:
|
|
void applicationStateChanged(Qt::ApplicationState state);
|
|
void savePreferences();
|
|
void saveCloudCredentials();
|
|
void checkCredentialsAndExecute(execute_function_type execute);
|
|
void tryRetrieveDataFromBackend();
|
|
void handleError(QNetworkReply::NetworkError nError);
|
|
void handleSslErrors(const QList<QSslError> &errors);
|
|
void retrieveUserid();
|
|
void loadDivesWithValidCredentials();
|
|
void loadDiveProgress(int percent);
|
|
void provideAuth(QNetworkReply *reply, QAuthenticator *auth);
|
|
void commitChanges(QString diveId, QString date, QString location,
|
|
QString gps, QString duration, QString depth,
|
|
QString airtemp, QString watertemp, QString suit,
|
|
QString buddy, QString diveMaster, QString weight, QString notes,
|
|
QString startpressure, QString endpressure, QString gasmix);
|
|
void changesNeedSaving();
|
|
void saveChangesLocal();
|
|
void saveChangesCloud(bool forceRemoteSync);
|
|
void deleteDive(int id);
|
|
bool undoDelete(int id);
|
|
QString addDive();
|
|
void addDiveAborted(int id);
|
|
void applyGpsData();
|
|
void sendGpsData();
|
|
void downloadGpsData();
|
|
void populateGpsData();
|
|
void clearGpsData();
|
|
void finishSetup();
|
|
void openLocalThenRemote(QString url);
|
|
QString getNumber(const QString& diveId);
|
|
QString getDate(const QString& diveId);
|
|
QString getCurrentPosition();
|
|
QString getVersion() const;
|
|
void deleteGpsFix(quint64 when);
|
|
void refreshDiveList();
|
|
void screenChanged(QScreen *screen);
|
|
qreal lastDevicePixelRatio();
|
|
void appendTextToLog(const QString &newText);
|
|
|
|
private:
|
|
QString m_cloudUserName;
|
|
QString m_cloudPassword;
|
|
QString m_ssrfGpsWebUserid;
|
|
QString m_startPageText;
|
|
QString m_logText;
|
|
bool m_locationServiceEnabled;
|
|
bool m_verboseEnabled;
|
|
int m_distanceThreshold;
|
|
int m_timeThreshold;
|
|
GpsLocation *locationProvider;
|
|
bool m_loadFromCloud;
|
|
static QMLManager *m_instance;
|
|
QNetworkReply *reply;
|
|
QNetworkRequest request;
|
|
struct dive *deletedDive;
|
|
struct dive_trip *deletedTrip;
|
|
int m_accessingCloud;
|
|
bool m_syncToCloud;
|
|
int m_updateSelectedDive;
|
|
int m_selectedDiveTimestamp;
|
|
credentialStatus_t m_credentialStatus;
|
|
credentialStatus_t m_oldStatus;
|
|
qreal m_lastDevicePixelRatio;
|
|
QElapsedTimer timer;
|
|
bool alreadySaving;
|
|
bool checkDate(DiveObjectHelper *myDive, struct dive * d, QString date);
|
|
bool checkLocation(DiveObjectHelper *myDive, struct dive *d, QString location, QString gps);
|
|
bool checkDuration(DiveObjectHelper *myDive, struct dive *d, QString duration);
|
|
bool checkDepth(DiveObjectHelper *myDive, struct dive *d, QString depth);
|
|
|
|
signals:
|
|
void cloudUserNameChanged();
|
|
void cloudPasswordChanged();
|
|
void locationServiceEnabledChanged();
|
|
void verboseEnabledChanged();
|
|
void logTextChanged();
|
|
void timeThresholdChanged();
|
|
void distanceThresholdChanged();
|
|
void loadFromCloudChanged();
|
|
void startPageTextChanged();
|
|
void credentialStatusChanged();
|
|
void oldStatusChanged();
|
|
void accessingCloudChanged();
|
|
void syncToCloudChanged();
|
|
void updateSelectedDiveChanged();
|
|
void selectedDiveTimestampChanged();
|
|
void sendScreenChanged(QScreen *screen);
|
|
};
|
|
|
|
#endif
|