diff --git a/src/gui/workerthread.cpp b/src/gui/workerthread.cpp index 49758847ba3028e535870ce3c01e41221c6491fa..3b2b73203158f3d015305f9354c5f289c417feb0 100644 --- a/src/gui/workerthread.cpp +++ b/src/gui/workerthread.cpp @@ -51,11 +51,28 @@ WorkerThread::WorkerThread(MainWindow * p_main_window) connect(_p_work_monitor, static_cast<void (WorkMonitor::*)(QString)>(&WorkMonitor::workerMessage), p_main_window,static_cast<void (MainWindow::*)(QString)>(&MainWindow::doDisplayLoadingMessage)); connect(_p_work_monitor, static_cast<void (WorkMonitor::*)(QString,int)>(&WorkMonitor::workerMessage), p_main_window,static_cast<void (MainWindow::*)(QString,int)>(&MainWindow::doDisplayLoadingMessage)); connect(_p_work_monitor, &WorkMonitor::workerAppendText, p_main_window,&MainWindow::doWorkerAppendText); - /* - connect(&workerThread, &QThread::finished, worker, &QObject::deleteLater); - connect(this, &PtSpectrumViewer::operateMsDataFile, worker, &PwizLoaderThread::doMsDataFileLoad); - connect(worker, &PwizLoaderThread::msDataReady, this, &PtSpectrumViewer::handleMsDataFile); - */ + + connect(p_main_window, &MainWindow::operateXpipFile, this,&WorkerThread::doXpipFileLoad); + connect(this, &WorkerThread::projectReady, p_main_window,&MainWindow::doProjectReady); + + connect(p_main_window, &MainWindow::operateLoadingResults, this,&WorkerThread::doLoadingResults); + + connect(p_main_window, &MainWindow::operateRunningXtandem, this,&WorkerThread::doRunningXtandem); + connect(this, static_cast<void (WorkerThread::*)(QString)>(&WorkerThread::loadingMessage), p_main_window,static_cast<void (MainWindow::*)(QString)>(&MainWindow::doDisplayLoadingMessage)); + connect(this, &WorkerThread::projectNotReady, p_main_window,&MainWindow::doProjectNotReady); + + //grouping + connect(p_main_window, &MainWindow::operateGrouping, this,&WorkerThread::doGrouping); + connect(this, &WorkerThread::groupingFinished, p_main_window,&MainWindow::doGroupingFinished); + //masschroq write + connect(p_main_window, &MainWindow::operateWritingMassChroqFile, this,&WorkerThread::doWritingMassChroqFile); + //protic write + connect(p_main_window, &MainWindow::operateWritingProticFile, this,&WorkerThread::doWritingProticFile); + //writing ODS file : + connect(p_main_window, &MainWindow::operateWritingOdsFile, this,&WorkerThread::doWritingOdsFile); + connect(this, &WorkerThread::operationFailed, p_main_window,&MainWindow::doOperationFailed); + connect(this, &WorkerThread::operationFinished, p_main_window,&MainWindow::doOperationFinished); + #else // Qt4 code //worker message