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

QML UI: add supported dive computers to log file

Browse source 
In a more compact format than before.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2018-04-19 06:37:13 -07:00
parent 36749b28d9
commit ea7a7c6b24
3 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/downloadfromdcthread.cpp
View file

@ -148,7 +148,6 @@ void fill_computer_list()
productList[vendor].append(product); productList[vendor].append(product);
descriptorLookup[QString(vendor) + QString(product)] = descriptor; descriptorLookup[QString(vendor) + QString(product)] = descriptor;
qDebug() << "added supported DC: " << vendor << " " << product;
} }
dc_iterator_free(iterator); dc_iterator_free(iterator);
Q_FOREACH (QString vendor, vendorList) Q_FOREACH (QString vendor, vendorList)
@ -181,6 +180,18 @@ void fill_computer_list()
qSort(vendorList); qSort(vendorList);
} }
void show_computer_list()
{
qDebug() << "Supported dive computers:";
Q_FOREACH (QString vendor, vendorList) {
QString msg = vendor + ": ";
Q_FOREACH (QString product, productList[vendor]) {
msg += product + ", ";
}
msg.chop(2);
qDebug() << msg;
}
}
DCDeviceData *DCDeviceData::m_instance = NULL; DCDeviceData *DCDeviceData::m_instance = NULL;
DCDeviceData::DCDeviceData(QObject *parent) : QObject(parent) DCDeviceData::DCDeviceData(QObject *parent) : QObject(parent)

1
core/downloadfromdcthread.h
View file

@ -103,6 +103,7 @@ struct mydescriptor {
* stay like this for now. * stay like this for now.
*/ */
void fill_computer_list(); void fill_computer_list();
void show_computer_list();
extern QStringList vendorList; extern QStringList vendorList;
extern QHash<QString, QStringList> productList; extern QHash<QString, QStringList> productList;
extern QMap<QString, dc_descriptor_t *> descriptorLookup; extern QMap<QString, dc_descriptor_t *> descriptorLookup;

7
subsurface-mobile-helper.cpp
View file

@ -100,10 +100,6 @@ void run_ui()
ctxt->setContextProperty("connectionListModel", &connectionListModel); ctxt->setContextProperty("connectionListModel", &connectionListModel);
ctxt->setContextProperty("logModel", MessageHandlerModel::self()); ctxt->setContextProperty("logModel", MessageHandlerModel::self());
// call again to be able to log
// FIXME - this is redundant - but otherwise they don't end up in the AppLog
fill_computer_list();
engine.load(QUrl(QStringLiteral("qrc:///qml/main.qml"))); engine.load(QUrl(QStringLiteral("qrc:///qml/main.qml")));
qqWindowObject = engine.rootObjects().value(0); qqWindowObject = engine.rootObjects().value(0);
if (!qqWindowObject) { if (!qqWindowObject) {
@ -117,6 +113,9 @@ void run_ui()
QScreen *screen = qml_window->screen(); QScreen *screen = qml_window->screen();
QObject::connect(qml_window, &QQuickWindow::screenChanged, QMLManager::instance(), &QMLManager::screenChanged); QObject::connect(qml_window, &QQuickWindow::screenChanged, QMLManager::instance(), &QMLManager::screenChanged);
QMLManager *manager = QMLManager::instance(); QMLManager *manager = QMLManager::instance();
// now that the log file is initialized...
show_computer_list();
manager->setDevicePixelRatio(qml_window->devicePixelRatio(), qml_window->screen()); manager->setDevicePixelRatio(qml_window->devicePixelRatio(), qml_window->screen());
manager->dlSortModel = sortModel; manager->dlSortModel = sortModel;
manager->screenChanged(screen); manager->screenChanged(screen);