diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 699641e9cc32b446f48f5cd50e322a583a5f46d1..7e44e03e24c7a44ca9e2fa9a6c90356c94ed2e48 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -901,7 +901,8 @@ MainWindow::doAcceptedMcqrParamAllQuantiDialog() settings.setValue("mcqr/rdata_path", mcqr_experiment.get()->getRdataFilePath()); - emit operateWritingMcqrRData(mcqr_experiment, _project_sp); + emit operateWritingMcqrSpectralCountRdata(mcqr_experiment, + _project_sp); } } catch(pappso::PappsoException &error) @@ -912,7 +913,8 @@ MainWindow::doAcceptedMcqrParamAllQuantiDialog() } void -MainWindow::doWritingRdataFileFinished(McqrExperimentSp p_mcqr_experiment) +MainWindow::doWritingMcqrSpectralCountRdataFinished( + McqrExperimentSp p_mcqr_experiment) { qDebug() << "RData file created"; hideWaitingMessage(); diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h index 3bf2dab2739326a9339e20d256c151843b776991..95422d3ad4613a938bdd0fe9288ecacb971dafae 100644 --- a/src/gui/mainwindow.h +++ b/src/gui/mainwindow.h @@ -116,7 +116,7 @@ class MainWindow : public QMainWindow void doWritingMassChroQmlFileFinished( QString masschroqml_file, std::vector<MsRunAlignmentGroupSp> quantified_groups); - void doWritingRdataFileFinished(McqrExperimentSp p_mcqr_experiment); + void doWritingMcqrSpectralCountRdataFinished(McqrExperimentSp p_mcqr_experiment); void doOperationFailed(QString); void doOperationFinished(); void doGroupingFinished(); @@ -139,7 +139,7 @@ class MainWindow : public QMainWindow void operateWritingMassChroqFile(QString filename, ProjectSp project_sp, MasschroqFileParameters params); - void operateWritingMcqrRData(McqrExperimentSp mcqr_experiment_sp, + void operateWritingMcqrSpectralCountRdata(McqrExperimentSp mcqr_experiment_sp, ProjectSp project); void operateWritingMassChroqPrmFile(QString filename, ProjectSp project_sp); void operateWritingProticFile(QString filename, ProjectSp project_sp); diff --git a/src/gui/workerthread.cpp b/src/gui/workerthread.cpp index 05b2de386515348eddadd25ceed5f5b1a67849be..ff0e3226db9848e15f692092f39ae554bb6fb505 100644 --- a/src/gui/workerthread.cpp +++ b/src/gui/workerthread.cpp @@ -157,13 +157,13 @@ WorkerThread::WorkerThread(MainWindow *p_main_window) &WorkerThread::doRunningMassChroQ); // Mcqr write connect(p_main_window, - &MainWindow::operateWritingMcqrRData, + &MainWindow::operateWritingMcqrSpectralCountRdata, this, - &WorkerThread::doWritingMcqrRDataFile); + &WorkerThread::doWritingMcqrSpectralCountRdata); connect(this, - &WorkerThread::operateWritingRDataFileFinished, + &WorkerThread::operateWritingMcqrSpectralCountRdataFinished, p_main_window, - &MainWindow::doWritingRdataFileFinished); + &MainWindow::doWritingMcqrSpectralCountRdataFinished); // protic write connect(p_main_window, @@ -500,13 +500,14 @@ WorkerThread::doWritingMassChroqFile(QString filename, } void -WorkerThread::doWritingMcqrRDataFile(McqrExperimentSp mcqr_experiment_sp, - ProjectSp project_sp) +WorkerThread::doWritingMcqrSpectralCountRdata( + McqrExperimentSp mcqr_experiment_sp, ProjectSp project_sp) { // emit operationFinished(); McqrRdata sc_rdata_writer(mcqr_experiment_sp, project_sp); sc_rdata_writer.writeSpectralCountData(*_p_work_monitor); - emit operateWritingRDataFileFinished(project_sp->getMcqrExperimentSp()); + emit operateWritingMcqrSpectralCountRdataFinished( + project_sp->getMcqrExperimentSp()); } void diff --git a/src/gui/workerthread.h b/src/gui/workerthread.h index 81a6239e04010fa96416ea6bb11970a261ee4d80..524073e4864b2eb691a4a4dd7bfb93a31af45fd7 100644 --- a/src/gui/workerthread.h +++ b/src/gui/workerthread.h @@ -71,8 +71,8 @@ class WorkerThread : public QObject void doWritingMassChroqFile(QString filename, ProjectSp project_sp, MasschroqFileParameters params); - void doWritingMcqrRDataFile(McqrExperimentSp mcqr_experiment_sp, - ProjectSp project_sp); + void doWritingMcqrSpectralCountRdata(McqrExperimentSp mcqr_experiment_sp, + ProjectSp project_sp); void doWritingMassChroqPrmFile(QString filename, ProjectSp project_sp); void doWritingProticFile(QString filename, ProjectSp project_sp); void doWritingMcqrSpectralCountFile(QString filename, ProjectSp project_sp); @@ -110,7 +110,8 @@ class WorkerThread : public QObject void operateWritingMassChroqFileFinished( QString masschroqml_file, std::vector<MsRunAlignmentGroupSp> quantified_groups); - void operateWritingRDataFileFinished(McqrExperimentSp p_mcqr_experiment); + void operateWritingMcqrSpectralCountRdataFinished( + McqrExperimentSp p_mcqr_experiment); void operationFailed(QString error); void findingBestMsrunForAlignmentFinished(MsRunSp msrun_sp); void bestMsrunForAlignmentGroupFinished(MsRunSp msrun_sp);