mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 05:00:20 +00:00
8733828380
The memory managements for DeviceDetails was very sketchy. First of all, sharing a pointer to a structure between threads seems like a recipe for disaster. Secondly, the structure was a QObject and when first generated included in the (silly) Qt object tree, but when generated in the threads it was not. Clearly, this leaks. Instead, use value semantics and use local copies of the structure. I didn't go full length and use std::move to move the data, because this doesn't work through signals (which are the wrong abstraction here, but OK) and secondly I didn't have time to analyze whether the caller still needs the data after passing it down to the worker thread. To be able to pass an object through signals, the class has to be registered in the Qt MetaType system. Super ugly, but fine for now. Ultimately, this whole thing should probably be replaced by futures, co-routines, or whatever. Moreover, this removes the prefix from number of "m_*" function parameters. By convention, "m_" marks member variables, which function parameters are not. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at> make DeviceDetails a metatype So that we can pass it as value through the signal/slot system. (squash with original commit) Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
234 lines
7.8 KiB
C++
234 lines
7.8 KiB
C++
// SPDX-License-Identifier: GPL-2.0
|
|
#include <QQmlEngine>
|
|
#include <QQuickItem>
|
|
|
|
#ifdef MAP_SUPPORT
|
|
#include "map-widget/qmlmapwidgethelper.h"
|
|
#include "qt-models/maplocationmodel.h"
|
|
#endif
|
|
|
|
#include "stats/statsview.h"
|
|
#include "core/devicedetails.h"
|
|
#include "core/globals.h"
|
|
#include "core/qt-gui.h"
|
|
#include "core/settings/qPref.h"
|
|
#include "core/ssrf.h"
|
|
|
|
#ifdef SUBSURFACE_MOBILE
|
|
#include <QApplication>
|
|
#include <QQmlApplicationEngine>
|
|
#include <QQmlContext>
|
|
#include "mobile-widgets/themeinterface.h"
|
|
#include "mobile-widgets/qmlmanager.h"
|
|
#include "mobile-widgets/qmlinterface.h"
|
|
#include "mobile-widgets/statsmanager.h"
|
|
#include "stats/chartlistmodel.h"
|
|
#include "qt-models/divesummarymodel.h"
|
|
#include "qt-models/messagehandlermodel.h"
|
|
#include "qt-models/mobilelistmodel.h"
|
|
#include "profile-widget/qmlprofile.h"
|
|
#include "core/downloadfromdcthread.h"
|
|
#include "core/subsurfacestartup.h" // for testqml
|
|
#include "core/metrics.h"
|
|
#include "qt-models/diveimportedmodel.h"
|
|
#else
|
|
#include "desktop-widgets/mainwindow.h"
|
|
#endif
|
|
|
|
#if defined(Q_OS_ANDROID)
|
|
QString getAndroidHWInfo(); // from android.cpp
|
|
#include <QApplication>
|
|
#include <QFontDatabase>
|
|
#endif /* Q_OS_ANDROID */
|
|
|
|
QObject *qqWindowObject = NULL;
|
|
|
|
// Forward declaration
|
|
static void register_qml_types(QQmlEngine *);
|
|
static void register_meta_types();
|
|
|
|
#ifdef SUBSURFACE_MOBILE
|
|
#include <QtPlugin>
|
|
Q_IMPORT_PLUGIN(KirigamiPlugin)
|
|
#endif
|
|
|
|
void init_ui()
|
|
{
|
|
init_qt_late();
|
|
register_meta_types();
|
|
#ifndef SUBSURFACE_MOBILE
|
|
register_qml_types(NULL);
|
|
|
|
MainWindow *window = make_global<MainWindow>();
|
|
window->setTitle();
|
|
#endif // SUBSURFACE_MOBILE
|
|
}
|
|
|
|
void exit_ui()
|
|
{
|
|
free_globals();
|
|
free((void *)existing_filename);
|
|
}
|
|
|
|
#ifdef SUBSURFACE_MOBILE
|
|
void run_mobile_ui(double initial_font_size)
|
|
{
|
|
#if defined(Q_OS_ANDROID)
|
|
// work around an odd interaction between the OnePlus flavor of Android and Qt font handling
|
|
if (getAndroidHWInfo().contains("/OnePlus/")) {
|
|
QFontInfo qfi(defaultModelFont());
|
|
double basePointSize = qfi.pointSize();
|
|
QFontDatabase db;
|
|
int id = QFontDatabase::addApplicationFont(":/fonts/Roboto-Regular.ttf");
|
|
QStringList fontFamilies = QFontDatabase::applicationFontFamilies(id);
|
|
if (fontFamilies.count() > 0) {
|
|
QString family = fontFamilies.at(0);
|
|
QFont newDefaultFont;
|
|
newDefaultFont.setFamily(family);
|
|
newDefaultFont.setPointSize(basePointSize);
|
|
(static_cast<QApplication *>(QCoreApplication::instance()))->setFont(newDefaultFont);
|
|
qDebug() << "Detected OnePlus device, trying to force bundled font" << family;
|
|
QFont defaultFont = (static_cast<QApplication *>(QCoreApplication::instance()))->font();
|
|
qDebug() << "Qt reports default font is set as" << defaultFont.family();
|
|
} else {
|
|
qDebug() << "Detected OnePlus device, but can't determine font family used";
|
|
}
|
|
}
|
|
#endif
|
|
QScreen *appScreen = QApplication::screens().at(0);
|
|
int availableScreenWidth = appScreen->availableSize().width();
|
|
QQmlApplicationEngine engine;
|
|
QQmlContext *ctxt = engine.rootContext();
|
|
|
|
// Register qml interface classes
|
|
QMLInterface::setup(ctxt);
|
|
register_qml_types(&engine);
|
|
#if defined(__APPLE__) && !defined(Q_OS_IOS)
|
|
// when running the QML UI on a Mac the deployment of the QML Components seems
|
|
// to fail and the search path for the components is rather odd - simply the
|
|
// same directory the executable was started from <bundle>/Contents/MacOS/
|
|
// To work around this we need to manually copy the components at install time
|
|
// to Contents/Frameworks/qml and make sure that we add the correct import path
|
|
const QStringList importPathList = engine.importPathList();
|
|
for (QString importPath: importPathList) {
|
|
if (importPath.contains("MacOS"))
|
|
engine.addImportPath(importPath.replace("MacOS", "Frameworks"));
|
|
}
|
|
#endif // __APPLE__ not Q_OS_IOS
|
|
// this is frustrating, but we appear to need different import paths on different OSs
|
|
engine.addImportPath(":");
|
|
engine.addImportPath("qrc://imports");
|
|
ctxt->setContextProperty("vendorList", vendorList);
|
|
ctxt->setContextProperty("swipeModel", MobileModels::instance()->swipeModel());
|
|
ctxt->setContextProperty("diveModel", MobileModels::instance()->listModel());
|
|
set_non_bt_addresses();
|
|
|
|
// we need to setup the initial font size before the QML UI is instantiated
|
|
ThemeInterface *themeInterface = ThemeInterface::instance();
|
|
themeInterface->setInitialFontSize(initial_font_size);
|
|
|
|
ctxt->setContextProperty("connectionListModel", &connectionListModel);
|
|
ctxt->setContextProperty("logModel", MessageHandlerModel::self());
|
|
ctxt->setContextProperty("subsurfaceTheme", themeInterface);
|
|
|
|
qmlRegisterUncreatableType<QMLManager>("org.subsurfacedivelog.mobile",1,0,"ExportType","Enum is not a type");
|
|
|
|
#ifdef SUBSURFACE_MOBILE_DESKTOP
|
|
if (!testqml.empty()) {
|
|
QString fileLoad(testqml.c_str());
|
|
fileLoad += "/main.qml";
|
|
engine.load(QUrl(fileLoad));
|
|
} else {
|
|
engine.load(QUrl(QStringLiteral("qrc:///qml/main.qml")));
|
|
}
|
|
#else
|
|
engine.load(QUrl(QStringLiteral("qrc:///qml/main.qml")));
|
|
#endif
|
|
qDebug() << "loaded main.qml";
|
|
qqWindowObject = engine.rootObjects().value(0);
|
|
if (!qqWindowObject) {
|
|
fprintf(stderr, "can't create window object\n");
|
|
exit(1);
|
|
}
|
|
QQuickWindow *qml_window = qobject_cast<QQuickWindow *>(qqWindowObject);
|
|
qml_window->setIcon(QIcon(":subsurface-mobile-icon"));
|
|
qDebug() << "qqwindow devicePixelRatio" << qml_window->devicePixelRatio() << qml_window->screen()->devicePixelRatio();
|
|
QScreen *screen = qml_window->screen();
|
|
int qmlWW = qml_window->width();
|
|
int qmlSW = screen->size().width();
|
|
qDebug() << "qml_window reports width as" << qmlWW << "associated screen width" << qmlSW << "Qt screen reports width as" << availableScreenWidth;
|
|
QObject::connect(qml_window, &QQuickWindow::screenChanged, QMLManager::instance(), &QMLManager::screenChanged);
|
|
QMLManager *manager = QMLManager::instance();
|
|
|
|
manager->setDevicePixelRatio(qml_window->devicePixelRatio(), qml_window->screen());
|
|
manager->qmlWindow = qqWindowObject;
|
|
manager->screenChanged(screen);
|
|
qDebug() << "qqwindow screen has ldpi/pdpi" << screen->logicalDotsPerInch() << screen->physicalDotsPerInch();
|
|
#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
|
|
int width = 800;
|
|
int height = 1200;
|
|
if (qEnvironmentVariableIsSet("SUBSURFACE_MOBILE_WIDTH")) {
|
|
bool ok;
|
|
int width_override = qEnvironmentVariableIntValue("SUBSURFACE_MOBILE_WIDTH", &ok);
|
|
if (ok) {
|
|
width = width_override;
|
|
qDebug() << "overriding window width:" << width;
|
|
}
|
|
}
|
|
if (qEnvironmentVariableIsSet("SUBSURFACE_MOBILE_HEIGHT")) {
|
|
bool ok;
|
|
int height_override = qEnvironmentVariableIntValue("SUBSURFACE_MOBILE_HEIGHT", &ok);
|
|
if (ok) {
|
|
height = height_override;
|
|
qDebug() << "overriding window height:" << height;
|
|
}
|
|
}
|
|
qml_window->setHeight(height);
|
|
qml_window->setWidth(width);
|
|
#endif // not Q_OS_ANDROID and not Q_OS_IOS
|
|
qml_window->show();
|
|
qApp->exec();
|
|
}
|
|
#else // SUBSURFACE_MOBILE
|
|
// just run the desktop UI
|
|
void run_ui()
|
|
{
|
|
MainWindow::instance()->show();
|
|
qApp->exec();
|
|
}
|
|
#endif // SUBSURFACE_MOBILE
|
|
|
|
Q_DECLARE_METATYPE(duration_t)
|
|
static void register_meta_types()
|
|
{
|
|
qRegisterMetaType<duration_t>();
|
|
qRegisterMetaType<DeviceDetails>();
|
|
}
|
|
|
|
template <typename T>
|
|
static void register_qml_type(const char *name)
|
|
{
|
|
if(qmlRegisterType<T>("org.subsurfacedivelog.mobile", 1, 0, name) < 0)
|
|
qWarning("ERROR: Cannot register %s, QML will not work!!", name);
|
|
}
|
|
|
|
static void register_qml_types(QQmlEngine *engine)
|
|
{
|
|
// register qPref*
|
|
qPref::registerQML(engine);
|
|
|
|
#ifdef SUBSURFACE_MOBILE
|
|
register_qml_type<QMLManager>("QMLManager");
|
|
register_qml_type<StatsManager>("StatsManager");
|
|
register_qml_type<QMLProfile>("QMLProfile");
|
|
register_qml_type<DiveImportedModel>("DCImportModel");
|
|
register_qml_type<DiveSummaryModel>("DiveSummaryModel");
|
|
register_qml_type<ChartListModel>("ChartListModel");
|
|
#endif // not SUBSURFACE_MOBILE
|
|
|
|
#ifdef MAP_SUPPORT
|
|
register_qml_type<MapWidgetHelper>("MapWidgetHelper");
|
|
register_qml_type<MapLocationModel>("MapLocationModel");
|
|
#endif
|
|
register_qml_type<StatsView>("StatsView");
|
|
}
|