summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--desktop-widgets/downloadfromdivecomputer.cpp29
-rw-r--r--desktop-widgets/downloadfromdivecomputer.h3
-rw-r--r--mobile-widgets/qml/DownloadFromDiveComputer.qml21
-rw-r--r--qt-models/diveimportedmodel.cpp12
-rw-r--r--qt-models/diveimportedmodel.h13
5 files changed, 45 insertions, 33 deletions
diff --git a/desktop-widgets/downloadfromdivecomputer.cpp b/desktop-widgets/downloadfromdivecomputer.cpp
index 65c4c5236..129870727 100644
--- a/desktop-widgets/downloadfromdivecomputer.cpp
+++ b/desktop-widgets/downloadfromdivecomputer.cpp
@@ -7,6 +7,7 @@
#include "core/settings/qPrefDiveComputer.h"
#include "core/subsurface-string.h"
#include "core/uemis.h"
+#include "core/downloadfromdcthread.h"
#include "desktop-widgets/divelistview.h"
#include "desktop-widgets/mainwindow.h"
#include "qt-models/diveimportedmodel.h"
@@ -67,8 +68,7 @@ DownloadFromDCWidget::DownloadFromDCWidget(QWidget *parent, Qt::WindowFlags f) :
connect(close, SIGNAL(activated()), this, SLOT(close()));
connect(quit, SIGNAL(activated()), parent, SLOT(close()));
- connect(&thread, SIGNAL(finished()),
- this, SLOT(onDownloadThreadFinished()), Qt::QueuedConnection);
+ connect(diveImportedModel, &DiveImportedModel::downloadFinished, this, &DownloadFromDCWidget::onDownloadThreadFinished);
if (!qPrefDiveComputer::vendor().isEmpty()) {
ui.vendor->setCurrentIndex(ui.vendor->findText(qPrefDiveComputer::vendor()));
@@ -272,7 +272,7 @@ void DownloadFromDCWidget::updateState(states state)
markChildrenAsEnabled();
progress_bar_text = "";
} else {
- if (thread.table()->nr != 0)
+ if (diveImportedModel->thread.table()->nr != 0)
progress_bar_text = "";
ui.progressBar->setValue(100);
markChildrenAsEnabled();
@@ -297,7 +297,7 @@ void DownloadFromDCWidget::updateState(states state)
else if (state == ERRORED) {
timer->stop();
- QMessageBox::critical(this, TITLE_OR_TEXT(tr("Error"), thread.error), QMessageBox::Ok);
+ QMessageBox::critical(this, TITLE_OR_TEXT(tr("Error"), diveImportedModel->thread.error), QMessageBox::Ok);
markChildrenAsEnabled();
progress_bar_text = "";
ui.progressBar->hide();
@@ -367,7 +367,7 @@ void DownloadFromDCWidget::on_downloadCancelRetryButton_clicked()
// this means we are retrying - so we better clean out the partial
// list of downloaded dives from the last attempt
diveImportedModel->clearTable();
- clear_dive_table(thread.table());
+ clear_dive_table(diveImportedModel->thread.table());
}
updateState(DOWNLOADING);
@@ -375,7 +375,7 @@ void DownloadFromDCWidget::on_downloadCancelRetryButton_clicked()
ui.cancel->setEnabled(false);
ui.downloadCancelRetryButton->setText(tr("Cancel download"));
- auto data = thread.data();
+ auto data = diveImportedModel->thread.data();
data->setVendor(ui.vendor->currentText());
data->setProduct(ui.product->currentText());
#if defined(BT_SUPPORT)
@@ -417,7 +417,7 @@ void DownloadFromDCWidget::on_downloadCancelRetryButton_clicked()
// before we start, remember where the dive_table ended
previousLast = dive_table.nr;
- thread.start();
+ diveImportedModel->startDownload();
// FIXME: We should get the _actual_ device info instead of whatever
// the user entered in the dropdown.
@@ -500,7 +500,7 @@ void DownloadFromDCWidget::onDownloadThreadFinished()
showRememberedDCs();
if (currentState == DOWNLOADING) {
- if (thread.error.isEmpty())
+ if (diveImportedModel->thread.error.isEmpty())
updateState(DONE);
else
updateState(ERRORED);
@@ -509,7 +509,6 @@ void DownloadFromDCWidget::onDownloadThreadFinished()
}
ui.downloadCancelRetryButton->setText(tr("Retry download"));
ui.downloadCancelRetryButton->setEnabled(true);
- diveImportedModel->repopulate(thread.table(), thread.sites());
}
void DownloadFromDCWidget::on_cancel_clicked()
@@ -518,7 +517,7 @@ void DownloadFromDCWidget::on_cancel_clicked()
return;
// now discard all the dives
- clear_dive_table(thread.table());
+ clear_dive_table(diveImportedModel->thread.table());
done(-1);
}
@@ -526,8 +525,8 @@ void DownloadFromDCWidget::on_ok_clicked()
{
if (currentState != DONE && currentState != ERRORED)
return;
- struct dive_table *table = thread.table();
- struct dive_site_table *sites = thread.sites();
+ struct dive_table *table = diveImportedModel->thread.table();
+ struct dive_site_table *sites = diveImportedModel->thread.sites();
// delete non-selected dives
int total = table->nr;
@@ -536,11 +535,11 @@ void DownloadFromDCWidget::on_ok_clicked()
if (diveImportedModel->data(diveImportedModel->index(i, 0), Qt::CheckStateRole) == Qt::Checked)
j++;
else
- delete_dive_from_table(thread.table(), j);
+ delete_dive_from_table(diveImportedModel->thread.table(), j);
}
if (table->nr > 0) {
- auto data = thread.data();
+ auto data = diveImportedModel->thread.data();
int flags = IMPORT_IS_DOWNLOADED;
if (preferDownloaded())
flags |= IMPORT_PREFER_IMPORTED;
@@ -550,7 +549,7 @@ void DownloadFromDCWidget::on_ok_clicked()
}
if (ostcFirmwareCheck && currentState == DONE)
- ostcFirmwareCheck->checkLatest(this, thread.data()->internalData());
+ ostcFirmwareCheck->checkLatest(this, diveImportedModel->thread.data()->internalData());
accept();
}
diff --git a/desktop-widgets/downloadfromdivecomputer.h b/desktop-widgets/downloadfromdivecomputer.h
index 5b5b18e66..f49a45f45 100644
--- a/desktop-widgets/downloadfromdivecomputer.h
+++ b/desktop-widgets/downloadfromdivecomputer.h
@@ -11,7 +11,6 @@
#include "core/libdivecomputer.h"
#include "desktop-widgets/configuredivecomputerdialog.h"
-#include "core/downloadfromdcthread.h"
#include "ui_downloadfromdivecomputer.h"
@@ -21,6 +20,7 @@
class QStringListModel;
class DiveImportedModel;
+class BTDiscovery;
class DownloadFromDCWidget : public QDialog {
Q_OBJECT
@@ -72,7 +72,6 @@ private:
QStringListModel vendorModel;
QStringListModel productModel;
Ui::DownloadFromDiveComputer ui;
- DownloadThread thread;
bool downloading;
int previousLast;
diff --git a/mobile-widgets/qml/DownloadFromDiveComputer.qml b/mobile-widgets/qml/DownloadFromDiveComputer.qml
index 51c96c044..541b7263c 100644
--- a/mobile-widgets/qml/DownloadFromDiveComputer.qml
+++ b/mobile-widgets/qml/DownloadFromDiveComputer.qml
@@ -24,18 +24,13 @@ Kirigami.Page {
property alias product: comboProduct.currentIndex
property alias connection: comboConnection.currentIndex
- DCDownloadThread {
- id: downloadThread
+ DCImportModel {
+ id: importModel
- onFinished : {
- if (!table || !sites) {
- console.warn("DCDownloadThread::onFinished(): table or sites is null!")
- return
- }
- importModel.repopulate(table, sites)
+ onDownloadFinished : {
progressBar.visible = false
- if (dcImportModel.rowCount() > 0) {
- console.log(dcImportModel.rowCount() + " dive downloaded")
+ if (rowCount() > 0) {
+ console.log(rowCount() + " dive downloaded")
divesDownloaded = true
} else {
console.log("no new dives downloaded")
@@ -45,10 +40,6 @@ Kirigami.Page {
}
}
- DCImportModel {
- id: importModel
- }
-
ColumnLayout {
anchors.top: parent.top
height: parent.height
@@ -295,7 +286,7 @@ Kirigami.Page {
message += " downloading " + (manager.DC_forceDownload ? "all" : "only new" ) + " dives";
manager.appendTextToLog(message)
progressBar.visible = true
- downloadThread.start()
+ importModel.startDownload()
}
}
SsrfButton {
diff --git a/qt-models/diveimportedmodel.cpp b/qt-models/diveimportedmodel.cpp
index c5180dda8..504931b85 100644
--- a/qt-models/diveimportedmodel.cpp
+++ b/qt-models/diveimportedmodel.cpp
@@ -8,6 +8,7 @@ DiveImportedModel::DiveImportedModel(QObject *o) : QAbstractTableModel(o),
diveTable(nullptr),
sitesTable(nullptr)
{
+ connect(&thread, &QThread::finished, this, &DiveImportedModel::downloadThreadFinished);
}
int DiveImportedModel::columnCount(const QModelIndex&) const
@@ -129,6 +130,17 @@ void DiveImportedModel::clearTable()
endRemoveRows();
}
+void DiveImportedModel::downloadThreadFinished()
+{
+ repopulate(thread.table(), thread.sites());
+ emit downloadFinished();
+}
+
+void DiveImportedModel::startDownload()
+{
+ thread.start();
+}
+
void DiveImportedModel::repopulate(dive_table_t *table, struct dive_site_table *sites)
{
beginResetModel();
diff --git a/qt-models/diveimportedmodel.h b/qt-models/diveimportedmodel.h
index 532f5b899..49cbdf10c 100644
--- a/qt-models/diveimportedmodel.h
+++ b/qt-models/diveimportedmodel.h
@@ -4,6 +4,7 @@
#include <QAbstractTableModel>
#include <vector>
#include "core/divesite.h"
+#include "core/downloadfromdcthread.h"
class DiveImportedModel : public QAbstractTableModel
{
@@ -20,8 +21,10 @@ public:
Qt::ItemFlags flags(const QModelIndex &index) const;
Q_INVOKABLE void clearTable();
QHash<int, QByteArray> roleNames() const;
- Q_INVOKABLE void repopulate(dive_table_t *table, dive_site_table_t *sites);
Q_INVOKABLE void recordDives();
+ Q_INVOKABLE void startDownload();
+
+ DownloadThread thread;
public
slots:
void changeSelected(QModelIndex clickedIndex);
@@ -29,7 +32,15 @@ slots:
void selectAll();
void selectNone();
+private
+slots:
+ void downloadThreadFinished();
+
+signals:
+ void downloadFinished();
+
private:
+ void repopulate(dive_table_t *table, dive_site_table_t *sites);
int firstIndex;
int lastIndex;
std::vector<char> checkStates; // char instead of bool to avoid silly pessimization of std::vector.
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-28 15:51:16 +0000