mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Connect the progress events to the progress bar

Browse source 
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Anton Lundin 2015-01-20 22:40:52 +01:00 committed by Dirk Hohndel
parent 1d67bae745
commit 724170f4b6
3 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
configuredivecomputer.cpp
View file

@ -30,6 +30,7 @@ void ConfigureDiveComputer::readSettings(device_data_t *data)
connect(readThread, SIGNAL(error(QString)), this, SLOT(setError(QString)));
connect(readThread, SIGNAL(devicedetails(DeviceDetails *)), this,
SIGNAL(deviceDetailsChanged(DeviceDetails *)));
connect(readThread, SIGNAL(progress(int)), this, SLOT(progressEvent(int)));
readThread->start();
}
@ -45,6 +46,7 @@ void ConfigureDiveComputer::saveDeviceDetails(DeviceDetails *details, device_dat
connect(writeThread, SIGNAL(finished()),
this, SLOT(writeThreadFinished()), Qt::QueuedConnection);
connect(writeThread, SIGNAL(error(QString)), this, SLOT(setError(QString)));
connect(writeThread, SIGNAL(progress(int)), this, SLOT(progressEvent(int)));
writeThread->setDeviceDetails(details);
writeThread->start();
@ -504,6 +506,8 @@ void ConfigureDiveComputer::startFirmwareUpdate(QString fileName, device_data_t
connect(firmwareThread, SIGNAL(finished()),
this, SLOT(firmwareThreadFinished()), Qt::QueuedConnection);
connect(firmwareThread, SIGNAL(error(QString)), this, SLOT(setError(QString)));
connect(firmwareThread, SIGNAL(progress(int)), this, SLOT(progressEvent(int)));
firmwareThread->start();
}
@ -518,10 +522,16 @@ void ConfigureDiveComputer::resetSettings(device_data_t *data)
connect(resetThread, SIGNAL(finished()),
this, SLOT(resetThreadFinished()), Qt::QueuedConnection);
connect(resetThread, SIGNAL(error(QString)), this, SLOT(setError(QString)));
connect(resetThread, SIGNAL(progress(int)), this, SLOT(progressEvent(int)));
resetThread->start();
}
void ConfigureDiveComputer::progressEvent(int percent)
{
emit progress(percent);
}
void ConfigureDiveComputer::setState(ConfigureDiveComputer::states newState)
{
currentState = newState;

2
configuredivecomputer.h
View file

@ -38,6 +38,7 @@ public:
void startFirmwareUpdate(QString fileName, device_data_t *data);
void resetSettings(device_data_t *data);
signals:
void progress(int percent);
void message(QString msg);
void error(QString err);
void stateChanged(states newState);
@ -51,6 +52,7 @@ private:
void setState(states newState);
private
slots:
void progressEvent(int percent);
void readThreadFinished();
void writeThreadFinished();
void resetThreadFinished();

4
qt-ui/configuredivecomputerdialog.cpp
View file

@ -114,6 +114,7 @@ ConfigureDiveComputerDialog::ConfigureDiveComputerDialog(QWidget *parent) : QDia
deviceDetails = new DeviceDetails(this);
config = new ConfigureDiveComputer();
connect(config, SIGNAL(progress(int)), ui.progressBar, SLOT(setValue(int)));
connect(config, SIGNAL(error(QString)), this, SLOT(configError(QString)));
connect(config, SIGNAL(message(QString)), this, SLOT(configMessage(QString)));
connect(config, SIGNAL(deviceDetailsChanged(DeviceDetails *)),
@ -676,6 +677,7 @@ void ConfigureDiveComputerDialog::readSettings()
ui.progressBar->setTextVisible(true);
getDeviceData();
ui.progressBar->reset();
config->readSettings(&device_data);
}
@ -686,6 +688,7 @@ void ConfigureDiveComputerDialog::resetSettings()
ui.progressBar->setTextVisible(true);
getDeviceData();
ui.progressBar->reset();
config->resetSettings(&device_data);
}
@ -1069,6 +1072,7 @@ void ConfigureDiveComputerDialog::on_updateFirmwareButton_clicked()
ui.progressBar->setTextVisible(true);
getDeviceData();
ui.progressBar->reset();
config->startFirmwareUpdate(firmwarePath, &device_data);
}
}