From 3d60e12aca24b6db8e8340e12e75716993e1d210 Mon Sep 17 00:00:00 2001
From: Olivier Langella <olivier.langella@u-psud.fr>
Date: Sat, 9 Sep 2017 21:35:18 +0200
Subject: [PATCH] qt5 migration
---
src/gui/protein_view/proteinwindow.cpp | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/src/gui/protein_view/proteinwindow.cpp b/src/gui/protein_view/proteinwindow.cpp
index f66a3898a..21c066466 100644
--- a/src/gui/protein_view/proteinwindow.cpp
+++ b/src/gui/protein_view/proteinwindow.cpp
@@ -33,16 +33,12 @@ DbXrefButton::DbXrefButton(QWidget * parent, DbXref dbxref): QPushButton(parent)
_dbxref = dbxref;
#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);
- */
+ QObject::connect(this, &DbXrefButton::clicked,this, &DbXrefButton::clickedSlot);
#else
// Qt4 code
QObject::connect(this, SIGNAL(clicked()),this, SLOT(clickedSlot()));
#endif
-
+
setText(_dbxref.accession);
}
@@ -63,11 +59,8 @@ ProteinWindow::ProteinWindow(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 (_p_project_window, &ProjectWindow::identificationGroupGrouped, this,&ProteinWindow::doIdentificationGroupGrouped);
+ connect (_p_project_window, &ProjectWindow::peptideMatchSelected, this,&ProteinWindow::doPeptideMatchSelected);
#else
// Qt4 code
connect (_p_project_window, SIGNAL(identificationGroupGrouped(IdentificationGroup *)), this,SLOT(doIdentificationGroupGrouped(IdentificationGroup *)));
--
GitLab