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

Move divecomputer configuration code to different files

Browse source 
This splits the code in configuredivecomputer.cpp into multiple files.
The read and write threads are moved to configuredivecomputerthreads.h/cpp,
and the device details class is moved to devicedetails.h/.cpp

Signed-off-by: Joseph W. Joshua <joejoshw@gmail.com>
Signed-off-by: Thiago Macieira <thiago@macieira.org>
This commit is contained in:
Joseph W. Joshua 2014-06-10 15:03:26 +03:00 • committed by Thiago Macieira
parent 2432350064
commit 4fc16b1674
10 changed files with 403 additions and 225 deletions
Download patch file Download diff file Expand all files Collapse all files

40
qt-ui/configuredivecomputer.h
View file

@ -5,41 +5,15 @@
#include <QThread>
#include <QVariant>
#include "libdivecomputer.h"
#include "configuredivecomputerthreads.h"
#include <QDateTime>
class ReadSettingsThread : public QThread {
Q_OBJECT
public:
ReadSettingsThread(QObject *parent, device_data_t *data);
virtual void run();
QString result;
QString lastError;
signals:
void error(QString err);
private:
device_data_t *data;
};
class WriteSettingsThread : public QThread {
Q_OBJECT
public:
WriteSettingsThread(QObject *parent, device_data_t *data, QString settingName, QVariant settingValue);
virtual void run();
QString result;
QString lastError;
signals:
void error(QString err);
private:
device_data_t *data;
QString m_settingName;
QVariant m_settingValue;
};
class ConfigureDiveComputer : public QObject
{
Q_OBJECT
public:
explicit ConfigureDiveComputer(QObject *parent = 0);
void readSettings(device_data_t *data);
void readSettings(DeviceDetails *deviceDetails, device_data_t *data);
enum states {
INITIAL,
@ -53,23 +27,23 @@ public:
QString lastError;
states currentState;
DeviceDetails *m_deviceDetails;
device_data_t *m_data;
void saveDeviceDetails();
void fetchDeviceDetails();
void setDeviceName(device_data_t *data, QString newName);
void setDeviceDateAndTime(device_data_t *data, QDateTime dateAndTime);
void setDeviceBrightness(device_data_t *data, int brighnessLevel);
signals:
void deviceSettings(QString settings);
void message(QString msg);
void error(QString err);
void readFinished();
void writeFinished();
void stateChanged(states newState);
private:
ReadSettingsThread *readThread;
WriteSettingsThread *writeThread;
void setState(states newState);
void writeSettingToDevice(device_data_t *data, QString settingName, QVariant settingValue);
private slots:
void readThreadFinished();
void writeThreadFinished();