diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index e89d99beea6a4f6a873a9c8dbbf8e5a4770d29ef..2a7ba7ed2bd5b411540ff43c4d1be022cb1a1c43 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 0141c55363df9f70f509ba86d5ea1327762a97de..eeb5495ca31ed1aa59006b4658cd31c707857fb1 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; };