Mike-Solar
bb40b4923e
Automated with clang-tidy readability-identifier-naming (config added to .clang-tidy) plus scripted passes, per the updated rules now documented in CONTRIBUTING.md: - types (class/struct/enum/alias/template params): PascalCase - functions, variables, members: snake_case (incl. rational -> Rational) - private/protected members: trailing underscore; static member variables likewise (instance_, available_themes_) - constants and enum values: snake_case (kLinear -> k_linear, F32P -> f32p); ALL_CAPS reserved for macros - macros: OAK_ prefix (OLIVE_ADD_TEST/OLIVE_ASSERT/OLIVE_CONFIG -> OAK_ADD_TEST/OAK_ASSERT/OAK_CONFIG, GL_PREAMBLE -> OAK_GL_PREAMBLE, include guards -> OAK_*) - file names: all lowercase (Current/Plugin/OliveHost/OliveClip/ OlivePluginInstance -> current/plugin/olivehost/oliveclip/ oliveplugininstance) - getters share the member name sans underscore, setters set_foo() - Qt and third-party (OpenFX) virtual overrides and framework callbacks keep their original names (exempt in .clang-tidy) Manual follow-ups required where automation could not reach: - string-based QMetaObject/SIGNAL/SLOT references updated to renamed methods (AddTask, CreatedFile, DeleteSpecificFile, moveSelectionUp, ...) - macro bodies referencing renamed methods (OLIVE_CONFIG, NODE_DEFAULT_DESTRUCTOR, MANAGEDDISPLAYWIDGET_*) - self-shadowing locals renamed where signals/methods became same-named (size_changed, worker_count, selected_items, import param, filters) - third_party OFX member/namespace usages restored (OFX::Host::*, _created, _clipPrefsDirty, createInstance, clearPersistentMessage) - STL protocol aliases restored (const_iterator) with .clang-tidy ignore rules; qHash overloads restored Full build and test suite pass: ctest 4/4, ~1960 gtest cases green.
117 lines
3.0 KiB
C++
117 lines
3.0 KiB
C++
/***
|
|
|
|
Olive - Non-Linear Video Editor
|
|
Copyright (C) 2022 Olive Team
|
|
Modifications Copyright (C) 2025 mikesolar
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
***/
|
|
|
|
#include "task.h"
|
|
|
|
#include <QFutureWatcher>
|
|
#include <QtConcurrent>
|
|
|
|
namespace olive
|
|
{
|
|
|
|
#define super ProgressDialog
|
|
|
|
TaskDialog::TaskDialog(Task *task, const QString &title, QWidget *parent)
|
|
: super(task->get_title(), title, parent)
|
|
, task_(task)
|
|
, destroy_on_close_(true)
|
|
, already_shown_(false)
|
|
, task_finished_(false)
|
|
{
|
|
// Clear task when this dialog is destroyed
|
|
task_->setParent(this);
|
|
|
|
// Connect the save manager progress signal to the progress bar update on the dialog
|
|
connect(task_, &Task::progress_changed, this, &TaskDialog::set_progress,
|
|
Qt::QueuedConnection);
|
|
|
|
// Connect cancel signal (must be a direct connection or it'll be queued after the task has
|
|
// already finished)
|
|
connect(this, &TaskDialog::cancelled, task_, &Task::Cancel,
|
|
Qt::DirectConnection);
|
|
}
|
|
|
|
void TaskDialog::showEvent(QShowEvent *e)
|
|
{
|
|
super::showEvent(e);
|
|
|
|
if (!already_shown_) {
|
|
// Create watcher for when the task finishes
|
|
QFutureWatcher<bool> *task_watcher = new QFutureWatcher<bool>();
|
|
|
|
// Listen for when the task finishes
|
|
connect(task_watcher, &QFutureWatcher<bool>::finished, this,
|
|
&TaskDialog::task_finished, Qt::QueuedConnection);
|
|
|
|
// Run task in another thread with QtConcurrent
|
|
task_watcher->setFuture(
|
|
#if QT_VERSION_MAJOR >= 6
|
|
QtConcurrent::run(&Task::start, task_)
|
|
#else
|
|
QtConcurrent::run(task_, &Task::Start)
|
|
#endif
|
|
);
|
|
|
|
already_shown_ = true;
|
|
}
|
|
}
|
|
|
|
void TaskDialog::closeEvent(QCloseEvent *e)
|
|
{
|
|
// Cancel task if it is running
|
|
task_->Cancel();
|
|
|
|
// Standard close function
|
|
super::closeEvent(e);
|
|
|
|
// Reset shown
|
|
already_shown_ = false;
|
|
|
|
// Clean up this task and dialog, but only if the task has actually finished.
|
|
// If the user closes the window while the task is still running, deleting now
|
|
// would destroy the Task object out from under the worker thread and crash
|
|
// when the task later touches its own members (e.g. ExportTask::encoder_).
|
|
if (destroy_on_close_ && task_finished_) {
|
|
deleteLater();
|
|
}
|
|
}
|
|
|
|
void TaskDialog::task_finished()
|
|
{
|
|
QFutureWatcher<bool> *task_watcher =
|
|
static_cast<QFutureWatcher<bool> *>(sender());
|
|
|
|
task_finished_ = true;
|
|
|
|
if (task_watcher->result()) {
|
|
emit task_succeeded(task_);
|
|
} else {
|
|
show_error_message(tr("Task Failed"), task_->get_error());
|
|
emit task_failed(task_);
|
|
}
|
|
|
|
task_watcher->deleteLater();
|
|
|
|
close();
|
|
}
|
|
|
|
}
|