From ba073631cc7b06e2515193e66741f3793f501f1e Mon Sep 17 00:00:00 2001
From: Olivier Langella <Olivier.Langella@moulon.inra.fr>
Date: Fri, 23 Oct 2015 16:21:13 +0200
Subject: [PATCH] protein list view is generated
---
src/gui/mainwindow.cpp | 17 +++++++++--------
src/gui/mainwindow.h | 6 +++++-
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index e89d99bee..2a7ba7ed2 100644
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -40,20 +40,21 @@ MainWindow::MainWindow(QWidget *parent):
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(&workerThread, SIGNAL(finished()), worker, SLOT(deleteLater()));
- connect(this, SIGNAL(operateMsDataFile(QString)), worker,SLOT(doMsDataFileLoad(QString)));
- connect(worker, SIGNAL(msDataReady(pwiz::msdata::MSDataFile *)), this, SLOT(handleMsDataFile(pwiz::msdata::MSDataFile *)));
- */
+ /*
+ connect(&workerThread, SIGNAL(finished()), worker, SLOT(deleteLater()));
+ connect(this, SIGNAL(operateMsDataFile(QString)), worker,SLOT(doMsDataFileLoad(QString)));
+ connect(worker, SIGNAL(msDataReady(pwiz::msdata::MSDataFile *)), this, SLOT(handleMsDataFile(pwiz::msdata::MSDataFile *)));
+ */
#endif
/*
*/
workerThread.start();
-
+ _protein_list_window = new ProteinListWindow(this);
+ _protein_list_window->show();
}
MainWindow::~MainWindow()
@@ -63,4 +64,4 @@ MainWindow::~MainWindow()
//if (_p_ms_data_file != nullptr) delete _p_ms_data_file;
delete ui;
-}
\ No newline at end of file
+}
diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h
index 0141c5536..eeb5495ca 100644
--- a/src/gui/mainwindow.h
+++ b/src/gui/mainwindow.h
@@ -33,6 +33,7 @@
#include <pappsomspp/spectrum/spectrum.h>
#include <pwiz/data/msdata/MSDataFile.hpp>
#include "../utils/readspectrum.h"
+#include "protein_list_view/proteinlistwindow.h"
@@ -57,7 +58,7 @@ signals:
void msDataReady(pwiz::msdata::MSDataFile * p_ms_data_file);
};
-class MainWindow: public QMainWindow {
+class MainWindow: public QMainWindow {
Q_OBJECT
QThread workerThread;
@@ -75,6 +76,9 @@ signals:
private:
Ui::Main *ui;
+
+
+ ProteinListWindow * _protein_list_window=nullptr;
};
--
GitLab