mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Skeleton code for a non-blocking UI thread for downloading dives from the DC
This is the skeleton code for a non-blocking ui-thread It already creates the first-thread ( 'do not block the ui' ) and the second thread ('download from the dive computer') We can in the future merge both in the same place - I didn't want to do that now because the download function is written in the libdivecomputer.c code, and I cant just transform that to a QThread and use signals, so I used two threads for that. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
This commit is contained in:
parent
15bb4fccbb
commit
c7a5d0490f
8 changed files with 249 additions and 89 deletions
73
qt-ui/downloadfromdivecomputer.cpp
Normal file
73
qt-ui/downloadfromdivecomputer.cpp
Normal file
|
@ -0,0 +1,73 @@
|
|||
#include "downloadfromdivecomputer.h"
|
||||
#include "ui_downloadfromdivecomputer.h"
|
||||
|
||||
#include "../libdivecomputer.h"
|
||||
|
||||
#include <QThread>
|
||||
#include <QDebug>
|
||||
|
||||
namespace DownloadFromDcGlobal{
|
||||
const char *err_string;
|
||||
};
|
||||
|
||||
extern const char *progress_bar_text;
|
||||
extern double progress_bar_fraction;
|
||||
|
||||
DownloadFromDCWidget::DownloadFromDCWidget(QWidget* parent, Qt::WindowFlags f) :
|
||||
QDialog(parent, f), ui(new Ui::DownloadFromDiveComputer), thread(0)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
ui->progressBar->hide();
|
||||
ui->progressBar->setMinimum(0);
|
||||
ui->progressBar->setMaximum(100);
|
||||
}
|
||||
|
||||
void DownloadFromDCWidget::on_cancel_clicked()
|
||||
{
|
||||
close();
|
||||
}
|
||||
|
||||
void DownloadFromDCWidget::on_ok_clicked()
|
||||
{
|
||||
|
||||
ui->progressBar->setValue(0);
|
||||
ui->progressBar->show();
|
||||
|
||||
if(thread){
|
||||
thread->deleteLater();
|
||||
}
|
||||
|
||||
device_data_t data;
|
||||
// still need to fill the data info here.
|
||||
thread = new InterfaceThread(this, &data);
|
||||
connect(thread, SIGNAL(updateInterface(int)), ui->progressBar, SLOT(setValue(int)), Qt::QueuedConnection); // Qt::QueuedConnection == threadsafe.
|
||||
connect(thread, SIGNAL(updateInterface(int)), this, SLOT(setValue(int)), Qt::QueuedConnection); // Qt::QueuedConnection == threadsafe.
|
||||
thread->start();
|
||||
}
|
||||
|
||||
DownloadThread::DownloadThread(device_data_t* data): data(data)
|
||||
{
|
||||
}
|
||||
|
||||
void DownloadThread::run()
|
||||
{
|
||||
do_libdivecomputer_import(data);
|
||||
qDebug() << "Download thread started";
|
||||
}
|
||||
|
||||
InterfaceThread::InterfaceThread(QObject* parent, device_data_t* data): QThread(parent), data(data)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void InterfaceThread::run()
|
||||
{
|
||||
DownloadThread *download = new DownloadThread(data);
|
||||
|
||||
download->start();
|
||||
while(download->isRunning()){
|
||||
msleep(200);
|
||||
updateInterface(progress_bar_fraction *100);
|
||||
}
|
||||
updateInterface(100);
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue