Skip to content
Snippets Groups Projects
Commit 8affb002 authored by Olivier Langella's avatar Olivier Langella
Browse files

worker start

parent f4950402
No related branches found
No related tags found
No related merge requests found
......@@ -44,8 +44,6 @@ MainWindow::MainWindow(QWidget *parent):
WorkerThread *worker = new WorkerThread(this);
worker->moveToThread(&workerThread);
/*
*/
workerThread.start();
_p_load_results_dialog = new LoadResultsDialog(this);
......
......@@ -44,6 +44,9 @@ ProjectWindow::ProjectWindow(MainWindow *parent):
main_window = parent;
ui->setupUi(this);
WorkerThread * p_worker = new WorkerThread(this);
p_worker->moveToThread(&worker_thread);
worker_thread.start();
_p_fasta_str_li = new QStandardItemModel();
ui->decoy_database_listview->setModel(_p_fasta_str_li);
......@@ -57,6 +60,8 @@ ProjectWindow::ProjectWindow(MainWindow *parent):
_p_edit_label_methods = new EditLabelMethods(this);
_p_waiting_message_dialog = new WaitingMessageDialog(this);
#if QT_VERSION >= 0x050000
// Qt5 code
/*
......@@ -69,15 +74,13 @@ ProjectWindow::ProjectWindow(MainWindow *parent):
//connect (_protein_list_window, SIGNAL(proteinMatchClicked(ProteinMatch *)), this //,SLOT(doProteinMatchClicked(ProteinMatch *)));
connect (_p_automatic_filter_widget, SIGNAL(automaticFilterParametersChanged(AutomaticFilterParameters)), this,SLOT(doAutomaticFilterParametersChanged(AutomaticFilterParameters)));
//connect(this, SIGNAL(operateGrouping(ProjectSp)), p_worker,SLOT(doGrouping(ProjectSp)));
#endif
/*
*/
this->setDisabled(true);
WorkerThread * p_worker = new WorkerThread(this);
p_worker->moveToThread(&worker_thread);
}
......@@ -133,6 +136,7 @@ void ProjectWindow::connectNewPeptideListWindow() {
}
void ProjectWindow::refreshGroup(IdentificationGroup * p_ident_group) {
qDebug() << "ProjectWindow::refreshGroup begin";
hideWaitingMessage();
if (p_ident_group == nullptr) {
qDebug() << "ProjectWindow::refreshGroup p_ident_group == nullptr";
}
......@@ -467,6 +471,10 @@ void ProjectWindow::showWaitingMessage(const QString title) {
}
void ProjectWindow::doIdentificationGroupEdited(IdentificationGroup* p_identification_group) {
showWaitingMessage(tr("Updating identification group"));
qDebug() << "ProjectWindow::doAutomaticFilterParametersChanged emit operateGrouping(_project_sp) ";
emit operateGroupingOnIdentification(p_identification_group);
}
void ProjectWindow::viewError(QString error) {
......
......@@ -69,12 +69,14 @@ public slots:
void doOperationFinished();
void doGroupingFinished();
void doDisplayLoadingMessage(QString message);
void refreshGroup(IdentificationGroup * p_ident_group);
// void setColor(const QColor &color);
// void setShape(Shape shape);
signals:
void identificationGroupGrouped(IdentificationGroup * p_identification_group);
void peptideMatchSelected(PeptideMatch * peptide_match);
void operateGrouping(ProjectSp project_sp);
void operateGroupingOnIdentification(IdentificationGroup * p_identification_group);
//void peptideChanged(pappso::PeptideSp peptide);
protected :
......@@ -90,7 +92,6 @@ private :
void connectNewPeptideListWindow();
void connectNewProteinDetailWindow();
void connectNewPeptideDetailWindow();
void refreshGroup(IdentificationGroup * p_ident_group);
void refresh();
void showWaitingMessage(const QString title);
void hideWaitingMessage();
......
......@@ -34,6 +34,8 @@
#include "../output/masschroqml.h"
#include "../output/ods/odsexport.h"
#include "files/xpipfile.h"
#include "mainwindow.h"
#include "project_view/projectwindow.h"
WorkerThread::WorkerThread(MainWindow * p_main_window)
{
......@@ -119,6 +121,7 @@ void WorkerThread::doXpipFileLoad(QString filename) {
void WorkerThread::doGrouping(ProjectSp project_sp) {
qDebug() << "WorkerThread::doGrouping begin ";
try {
emit loadingMessage(tr("grouping proteins"));
try {
......@@ -137,6 +140,7 @@ void WorkerThread::doGrouping(ProjectSp project_sp) {
catch (pappso::PappsoException & error) {
emit operationFailed(tr("Error while grouping :\n%1").arg(error.qwhat()));
}
qDebug() << "WorkerThread::doGrouping end ";
}
void WorkerThread::doWritingOdsFile(QString filename, ProjectSp project_sp) {
......
......@@ -34,7 +34,9 @@
#include <QCloseEvent>
#include "../core/automaticfilterparameters.h"
#include "../core/project.h"
#include "mainwindow.h"
class MainWindow;
class ProjectWindow;
class WorkerThread : public QObject
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment