mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 05:00:20 +00:00
de81effb25
Currently, on Linux, after selecting a Bluetooth device the name of the device is shown. On reopening the download dialog, on the other hand, the address is shown. In the device selection dialog both are shown. This patch changes the download dialog such that both, name and address, are shown. The bulk of the patch introduces the name of the device in the preferences and DCDeviceData. It has to be noted that DCDeviceData is an encapsulation of the libdivecomputer device_data_t. Nevertheless, the new Bluetooth-name field is, at the moment, not passed through to libdivecomputer. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
110 lines
3.3 KiB
C++
110 lines
3.3 KiB
C++
#ifndef DOWNLOADFROMDCTHREAD_H
|
|
#define DOWNLOADFROMDCTHREAD_H
|
|
|
|
#include <QThread>
|
|
#include <QMap>
|
|
#include <QHash>
|
|
#include <QLoggingCategory>
|
|
|
|
#include "dive.h"
|
|
#include "libdivecomputer.h"
|
|
#include "connectionlistmodel.h"
|
|
#if BT_SUPPORT
|
|
#include "core/btdiscovery.h"
|
|
#endif
|
|
/* Helper object for access of Device Data in QML */
|
|
class DCDeviceData : public QObject {
|
|
Q_OBJECT
|
|
Q_PROPERTY(QString vendor READ vendor WRITE setVendor)
|
|
Q_PROPERTY(QString product READ product WRITE setProduct)
|
|
Q_PROPERTY(bool bluetoothMode READ bluetoothMode WRITE setBluetoothMode)
|
|
Q_PROPERTY(QString devName READ devName WRITE setDevName)
|
|
Q_PROPERTY(QString devBluetoothName READ devBluetoothName WRITE setDevBluetoothName)
|
|
Q_PROPERTY(QString descriptor READ descriptor)
|
|
Q_PROPERTY(bool forceDownload READ forceDownload WRITE setForceDownload)
|
|
Q_PROPERTY(bool createNewTrip READ createNewTrip WRITE setCreateNewTrip)
|
|
Q_PROPERTY(int deviceId READ deviceId WRITE setDeviceId)
|
|
Q_PROPERTY(int diveId READ diveId WRITE setDiveId)
|
|
Q_PROPERTY(bool saveDump READ saveDump WRITE setSaveDump)
|
|
Q_PROPERTY(bool saveLog READ saveLog WRITE setSaveLog)
|
|
|
|
public:
|
|
DCDeviceData(QObject *parent = nullptr);
|
|
static DCDeviceData *instance();
|
|
|
|
QString vendor() const;
|
|
QString product() const;
|
|
QString devName() const;
|
|
QString devBluetoothName() const;
|
|
QString descriptor() const;
|
|
bool bluetoothMode() const;
|
|
bool forceDownload() const;
|
|
bool createNewTrip() const;
|
|
bool saveDump() const;
|
|
bool saveLog() const;
|
|
int deviceId() const;
|
|
int diveId() const;
|
|
|
|
/* this needs to be a pointer to make the C-API happy */
|
|
device_data_t* internalData();
|
|
|
|
Q_INVOKABLE QStringList getProductListFromVendor(const QString& vendor);
|
|
Q_INVOKABLE int getMatchingAddress(const QString &vendor, const QString &product);
|
|
|
|
Q_INVOKABLE int getDetectedVendorIndex();
|
|
Q_INVOKABLE int getDetectedProductIndex(const QString ¤tVendorText);
|
|
Q_INVOKABLE QString getDetectedDeviceAddress(const QString ¤tProductText);
|
|
|
|
public slots:
|
|
void setVendor(const QString& vendor);
|
|
void setProduct(const QString& product);
|
|
void setDevName(const QString& devName);
|
|
void setDevBluetoothName(const QString& devBluetoothName);
|
|
void setBluetoothMode(bool mode);
|
|
void setForceDownload(bool force);
|
|
void setCreateNewTrip(bool create);
|
|
void setDeviceId(int deviceId);
|
|
void setDiveId(int diveId);
|
|
void setSaveDump(bool dumpMode);
|
|
void setSaveLog(bool saveLog);
|
|
private:
|
|
static DCDeviceData *m_instance;
|
|
device_data_t data;
|
|
|
|
// Bluetooth name is managed outside of libdivecomputer
|
|
QString m_devBluetoothName;
|
|
};
|
|
|
|
class DownloadThread : public QThread {
|
|
Q_OBJECT
|
|
Q_PROPERTY(DCDeviceData* deviceData MEMBER m_data)
|
|
|
|
public:
|
|
DownloadThread();
|
|
void run() override;
|
|
|
|
Q_INVOKABLE DCDeviceData *data();
|
|
QString error;
|
|
|
|
private:
|
|
DCDeviceData *m_data;
|
|
};
|
|
|
|
//TODO: C++ify descriptor?
|
|
struct mydescriptor {
|
|
const char *vendor;
|
|
const char *product;
|
|
dc_family_t type;
|
|
unsigned int model;
|
|
};
|
|
|
|
/* This fills the vendor list QStringList and related members.
|
|
* this code needs to be reworked to be less ugly, but it will
|
|
* stay like this for now.
|
|
*/
|
|
void fill_computer_list();
|
|
extern QStringList vendorList;
|
|
extern QHash<QString, QStringList> productList;
|
|
extern QMap<QString, dc_descriptor_t *> descriptorLookup;
|
|
extern ConnectionListModel connectionListModel;
|
|
#endif
|