doryan/BloomPatched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Using std::atomic for insight worker task state and progress percentage.

Browse Source 
Tidying TaskProgressIndicator widget
This commit is contained in:
Nav
2023-03-18 19:02:15 +00:00
parent 20751b3fb9
commit 3d3d5ab7c1
6 changed files with 48 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/Insight/UserInterfaces/InsightWindow/Widgets/TaskProgressIndicator/TaskProgressIndicator.cpp
View File

@@ -20,16 +20,23 @@ namespace Bloom::Widgets
QObject::connect(
this->task.get(),
&InsightWorkerTask::progressUpdate,
&InsightWorkerTask::started,
this,
&TaskProgressIndicator::onTaskProgressUpdate
&TaskProgressIndicator::onTaskStateChanged
);
QObject::connect(
this->task.get(),
&InsightWorkerTask::finished,
this,
&TaskProgressIndicator::onTaskStateChanged
);
QObject::connect(
this->task.get(),
&InsightWorkerTask::failed,
this,
&TaskProgressIndicator::onTaskFailed
&TaskProgressIndicator::onTaskStateChanged
);
QObject::connect(
@@ -38,6 +45,13 @@ namespace Bloom::Widgets
this,
&TaskProgressIndicator::onTaskFinished
);
QObject::connect(
this->task.get(),
&InsightWorkerTask::progressUpdate,
this,
&TaskProgressIndicator::onTaskProgressUpdate
);
}
void TaskProgressIndicator::paintEvent(QPaintEvent* event) {
@@ -56,12 +70,20 @@ namespace Bloom::Widgets
static constexpr auto barHeight = 3;
const auto barYPosition = size.height() - barHeight - 3;
const auto percentage = std::max(this->taskProgressPercentage, 2);
const auto percentage = std::max(static_cast<int>(this->task->progressPercentage), 2);
const auto status = QString(
this->task->state == InsightWorkerTaskState::FAILED
? " - Failed"
: this->task->state == InsightWorkerTaskState::COMPLETED
? " - Completed"
: ""
);
painter.drawText(
0,
barYPosition - 5,
this->task->brief() + QString(this->taskFailed ? " - Failed" : (percentage == 100 ? " - Completed" : ""))
this->task->brief() + status
);
painter.setPen(Qt::PenStyle::NoPen);
@@ -84,20 +106,15 @@ namespace Bloom::Widgets
);
}
void TaskProgressIndicator::onTaskProgressUpdate(int taskProgressPercentage) {
this->taskProgressPercentage = taskProgressPercentage;
void TaskProgressIndicator::onTaskProgressUpdate() {
this->update();
}
void TaskProgressIndicator::onTaskFailed() {
this->taskFailed = true;
void TaskProgressIndicator::onTaskStateChanged() {
this->update();
}
void TaskProgressIndicator::onTaskFinished() {
this->taskProgressPercentage = 100;
this->update();
auto* finishedSignalTimer = new QTimer();
finishedSignalTimer->setSingleShot(true);
finishedSignalTimer->setInterval(2500);

6
src/Insight/UserInterfaces/InsightWindow/Widgets/TaskProgressIndicator/TaskProgressIndicator.hpp
View File

@@ -25,11 +25,9 @@ namespace Bloom::Widgets
private:
QSharedPointer<InsightWorkerTask> task;
int taskProgressPercentage = 0;
bool taskFailed = false;
void onTaskProgressUpdate(int progressPercentage);
void onTaskFailed();
void onTaskProgressUpdate();
void onTaskStateChanged();
void onTaskFinished();
};
}