ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2025-01-19 10:58:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reorder starting AnalTask and showing Dialog

Browse Source
This commit is contained in:
Florian Märkl 2018-07-07 12:32:51 +02:00
parent df61dcdc55
commit 9ecca8fe38
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/dialogs/AsyncTaskDialog.cpp
View File

@ -43,7 +43,7 @@ void AsyncTaskDialog::updateLog(const QString &log)
void AsyncTaskDialog::updateProgressTimer()
{
int secondsElapsed = (task->getTimer().elapsed() + 500) / 1000;
int secondsElapsed = (task->getElapsedTime() + 500) / 1000;
int minutesElapsed = secondsElapsed / 60;
int hoursElapsed = minutesElapsed / 60;
@ -57,6 +57,7 @@ void AsyncTaskDialog::updateProgressTimer()
label += " ";
}
label += tr("%n seconds", "%n second", secondsElapsed % 60);
printf("setText %s\n", label.toLocal8Bit().constData());
ui->timeLabel->setText(label);
}

4
src/dialogs/OptionsDialog.cpp
View File

@ -242,13 +242,13 @@ void OptionsDialog::setupAndStartAnalysis(int level, QList<QString> advanced)
AsyncTask::Ptr analTaskPtr(analTask);
Core()->getAsyncTaskManager()->start(analTaskPtr);
AsyncTaskDialog *taskDialog = new AsyncTaskDialog(analTaskPtr);
taskDialog->setInterruptOnClose(true);
taskDialog->setAttribute(Qt::WA_DeleteOnClose);
taskDialog->show();
Core()->getAsyncTaskManager()->start(analTaskPtr);
done(0);
}

1
src/utils/AsyncTask.h
View File

@ -33,6 +33,7 @@ public:
const QString &getLog() { return logBuffer; }
const QElapsedTimer &getTimer() { return timer; }
qint64 getElapsedTime() { return timer.isValid() ? timer.elapsed() : 0; }
virtual QString getTitle() { return QString(); }