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

Hook up the Download dialog

Browse source 
The download already worked, but we didn't display the new dives. This
introduces a new slot for MainWindow that updates what is displayed in
Subsurface after files were imported.

With this change we can successfully download ONCE - but when trying to
download a second dive the dialog doesn't appear to get refreshed the
right way - the OK button doesn't appear to work anymore (Cancel however
does).

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-05-30 17:58:59 +09:00
parent ae2c132a26
commit f32e86eb32
4 changed files with 38 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

24
qt-ui/downloadfromdivecomputer.cpp
View file

@ -4,6 +4,8 @@
#include "../libdivecomputer.h"
#include "../helpers.h"
#include "../display.h"
#include "../divelist.h"
#include "mainwindow.h"
#include <cstdlib>
#include <QThread>
#include <QDebug>
@ -32,6 +34,12 @@ namespace DownloadFromDcGlobal{
const char *err_string;
};
DownloadFromDCWidget *DownloadFromDCWidget::instance()
{
static DownloadFromDCWidget *dialog = new DownloadFromDCWidget();
return dialog;
}
DownloadFromDCWidget::DownloadFromDCWidget(QWidget* parent, Qt::WindowFlags f) :
QDialog(parent, f), ui(new Ui::DownloadFromDiveComputer), thread(0), downloading(false)
{
@ -54,6 +62,12 @@ DownloadFromDCWidget::DownloadFromDCWidget(QWidget* parent, Qt::WindowFlags f) :
ui->device->setText(default_dive_computer_device);
}
void DownloadFromDCWidget::runDialog()
{
ui->progressBar->hide();
show();
}
void DownloadFromDCWidget::on_vendor_currentIndexChanged(const QString& vendor)
{
QAbstractItemModel *currentModel = ui->product->model();
@ -151,13 +165,20 @@ void DownloadFromDCWidget::on_ok_clicked()
downloading = true;
}
bool DownloadFromDCWidget::preferDownloaded()
{
return ui->preferDownloaded->isChecked();
}
DownloadThread::DownloadThread(device_data_t* data): data(data)
{
}
void DownloadThread::run()
{
DownloadFromDCWidget *dfdcw = DownloadFromDCWidget::instance();
do_libdivecomputer_import(data);
process_dives(TRUE, dfdcw->preferDownloaded());
}
InterfaceThread::InterfaceThread(QObject* parent, device_data_t* data): QThread(parent), data(data)
@ -167,7 +188,8 @@ InterfaceThread::InterfaceThread(QObject* parent, device_data_t* data): QThread(
void InterfaceThread::run()
{
DownloadThread *download = new DownloadThread(data);
MainWindow *w = mainWindow();
connect(download, SIGNAL(finished()), w, SLOT(refreshDisplay()));
download->start();
while (download->isRunning()) {
msleep(200);