diff --git a/src/gui/peptide_list_view/peptidelistwindow.cpp b/src/gui/peptide_list_view/peptidelistwindow.cpp index 3834b0d41fa9d1dd694868003a31c5dd16d697b9..8d3630e524c56c91a3d9df306a0f5907c793b065 100644 --- a/src/gui/peptide_list_view/peptidelistwindow.cpp +++ b/src/gui/peptide_list_view/peptidelistwindow.cpp @@ -68,11 +68,12 @@ PeptideListWindow::PeptideListWindow(ProjectWindow *parent): #if QT_VERSION >= 0x050000 // Qt5 code - /* - connect(&workerThread, &QThread::finished, worker, &QObject::deleteLater); - connect(this, &PtSpectrumViewer::operateMsDataFile, worker, &PwizLoaderThread::doMsDataFileLoad); - connect(worker, &PwizLoaderThread::msDataReady, this, &PtSpectrumViewer::handleMsDataFile); - */ + connect (_project_window, &ProjectWindow::identificationGroupGrouped, this,&PeptideListWindow::doIdentificationGroupGrouped); + + connect (this, &PeptideListWindow::peptideDataChanged, _peptide_table_model_p, &PeptideTableModel::onPeptideDataChanged); + + connect(ui->tableView, &QTableView::clicked, _p_proxy_model, &PeptideTableProxyModel::onTableClicked); + connect(_peptide_table_model_p, &PeptideTableModel::layoutChanged, this, &PeptideListWindow::updateStatusBar); #else // Qt4 code connect (_project_window, SIGNAL(identificationGroupGrouped(IdentificationGroup *)), this,SLOT(doIdentificationGroupGrouped(IdentificationGroup *))); diff --git a/src/gui/project_view/identification_group_widget/identificationgroupwidget.cpp b/src/gui/project_view/identification_group_widget/identificationgroupwidget.cpp index 423e2a1cb31fe3f3a1079b7ace3f5bd16d48fa96..14f2c9e500c145aaa94359747d5783792a3dfa18 100644 --- a/src/gui/project_view/identification_group_widget/identificationgroupwidget.cpp +++ b/src/gui/project_view/identification_group_widget/identificationgroupwidget.cpp @@ -35,11 +35,7 @@ IdentificationGroupWidget::IdentificationGroupWidget(ProjectWindow * parent, Ide ui->setupUi(this); #if QT_VERSION >= 0x050000 // Qt5 code - /* - connect(&workerThread, &QThread::finished, worker, &QObject::deleteLater); - connect(this, &PtSpectrumViewer::operateMsDataFile, worker, &PwizLoaderThread::doMsDataFileLoad); - connect(worker, &PwizLoaderThread::msDataReady, this, &PtSpectrumViewer::handleMsDataFile); - */ + connect (_p_project_window, &ProjectWindow::identificationGroupGrouped, this,&IdentificationGroupWidget::doIdentificationGroupGrouped); #else // Qt4 code diff --git a/src/gui/project_view/projectwindow.cpp b/src/gui/project_view/projectwindow.cpp index 2d434f0f184cd710867e6ad708247889f1e0739e..2dc7ad558d67a5d00149c1aaec1316c1de792418 100644 --- a/src/gui/project_view/projectwindow.cpp +++ b/src/gui/project_view/projectwindow.cpp @@ -71,11 +71,6 @@ ProjectWindow::ProjectWindow(MainWindow *parent): connect(_p_edit_label_methods, &EditLabelMethods::accepted, this,&ProjectWindow::doAcceptedLabelingMethod); - /* - connect(&workerThread, &QThread::finished, worker, &QObject::deleteLater); - connect(this, &PtSpectrumViewer::operateMsDataFile, worker, &PwizLoaderThread::doMsDataFileLoad); - connect(worker, &PwizLoaderThread::msDataReady, this, &PtSpectrumViewer::handleMsDataFile); - */ #else // Qt4 code //connect (_protein_list_window, SIGNAL(proteinMatchClicked(ProteinMatch *)), this //,SLOT(doProteinMatchClicked(ProteinMatch *))); diff --git a/src/gui/protein_list_view/proteinlistwindow.cpp b/src/gui/protein_list_view/proteinlistwindow.cpp index 1b8f837d2bc9f51bec0f1a0906bc54ae5c67f9a4..8fc52a5e123461ae6af93e269e95367ec56584b6 100644 --- a/src/gui/protein_list_view/proteinlistwindow.cpp +++ b/src/gui/protein_list_view/proteinlistwindow.cpp @@ -99,11 +99,13 @@ ProteinListWindow::ProteinListWindow(ProjectWindow *parent): #if QT_VERSION >= 0x050000 // Qt5 code - /* - connect(&workerThread, &QThread::finished, worker, &QObject::deleteLater); - connect(this, &PtSpectrumViewer::operateMsDataFile, worker, &PwizLoaderThread::doMsDataFileLoad); - connect(worker, &PwizLoaderThread::msDataReady, this, &PtSpectrumViewer::handleMsDataFile); - */ + connect (_project_window, &ProjectWindow::identificationGroupGrouped, this,&ProteinListWindow::doIdentificationGroupGrouped); + + connect (this, &ProteinListWindow::proteinDataChanged, _protein_table_model_p, &ProteinTableModel::onProteinDataChanged); + connect(ui->tableView, &QTableView::clicked, _p_proxy_model, &ProteinTableProxyModel::onTableClicked); + connect(ui->centralwidget, &QWidget::customContextMenuRequested, + this, &ProteinListWindow::showContextMenu); + connect(_protein_table_model_p, &ProteinTableModel::layoutChanged, this, &ProteinListWindow::updateStatusBar); #else // Qt4 code connect (_project_window, SIGNAL(identificationGroupGrouped(IdentificationGroup *)), this,SLOT(doIdentificationGroupGrouped(IdentificationGroup *)));