diff --git a/GUI/View/FitControl/FitWorker.cpp b/GUI/View/FitControl/FitWorker.cpp index 805637e15d984564ddd1fc6e3df723a0a966607b..7a911a1cb2d08c7b37bad0af1a66249232cad5bb 100644 --- a/GUI/View/FitControl/FitWorker.cpp +++ b/GUI/View/FitControl/FitWorker.cpp @@ -17,13 +17,13 @@ void FitWorker::startFit() { - emit started(); + emit fit_started(); try { m_fit_objective->runFit(); } catch (const std::exception& ex) { - emit error(QString::fromStdString(ex.what())); + emit fit_error(QString::fromStdString(ex.what())); } - emit finished(); + emit fit_finished(); } void FitWorker::interruptFitting() diff --git a/GUI/View/FitControl/FitWorker.h b/GUI/View/FitControl/FitWorker.h index 6cea249073c2e9ed16d88ea95509d031393602d5..9a14ac5da21bbd18bc45d479b469bf33903ab00c 100644 --- a/GUI/View/FitControl/FitWorker.h +++ b/GUI/View/FitControl/FitWorker.h @@ -26,18 +26,13 @@ public: FitWorker(std::shared_ptr<FitObjectiveBuilder> suite) { m_fit_objective = suite; } public slots: - void startFit(); - void interruptFitting(); signals: - - void started(); - - void finished(); - - void error(const QString& message); + void fit_started(); + void fit_finished(); + void fit_error(const QString& message); private: std::shared_ptr<FitObjectiveBuilder> m_fit_objective; diff --git a/GUI/View/FitControl/FitWorkerLauncher.cpp b/GUI/View/FitControl/FitWorkerLauncher.cpp index 5fc6269c97bd65cc5d3f371728c11f891d749a31..d40033d357badb6e7f42be6c9d73311e5f33231c 100644 --- a/GUI/View/FitControl/FitWorkerLauncher.cpp +++ b/GUI/View/FitControl/FitWorkerLauncher.cpp @@ -33,16 +33,16 @@ void FitWorkerLauncher::runFitting(std::shared_ptr<FitObjectiveBuilder> suite) // start fitting when thread starts connect(thread, &QThread::started, fw, &FitWorker::startFit); - connect(fw, &FitWorker::started, this, &FitWorkerLauncher::intern_workerStarted); + connect(fw, &FitWorker::fit_started, this, &FitWorkerLauncher::intern_workerStarted); connect(this, &FitWorkerLauncher::intern_interruptFittingWorker, fw, &FitWorker::interruptFitting, Qt::DirectConnection); - connect(fw, &FitWorker::error, this, &FitWorkerLauncher::intern_error); - connect(fw, &FitWorker::finished, this, &FitWorkerLauncher::intern_workerFinished); + connect(fw, &FitWorker::fit_error, this, &FitWorkerLauncher::intern_error); + connect(fw, &FitWorker::fit_finished, this, &FitWorkerLauncher::intern_workerFinished); // delete fitting worker and thread when done - connect(fw, &FitWorker::finished, fw, &FitWorker::deleteLater); + connect(fw, &FitWorker::fit_finished, fw, &FitWorker::deleteLater); connect(thread, &QThread::finished, thread, &QThread::deleteLater); m_is_fit_running = true;