wip : designing project view

src/CMakeLists.txt

@@ -83,6 +83,7 @@ SET(XTPCPP_SRCS
   ./gui/mainwindow.cpp
   ./gui/peptide_list_view/peptidelistwindow.cpp
   ./gui/peptide_list_view/peptidetablemodel.cpp
+  ./gui/project_view/projectwindow.cpp
   ./gui/protein_list_view/proteinlistwindow.cpp
   ./gui/protein_list_view/proteintablemodel.cpp
 )
@@ -90,6 +91,7 @@ SET(XTPCPP_SRCS
 SET (GUI_UIS
   ./gui/main.ui
   ./gui/peptide_list_view/peptide_view.ui
+  ./gui/project_view/project_view.ui
   ./gui/protein_list_view/protein_view.ui
 )
 
@@ -98,6 +100,7 @@ SET(XTPCPP_MOC_HDRS
   ./gui/mainwindow.h
   ./gui/peptide_list_view/peptidelistwindow.h
   ./gui/peptide_list_view/peptidetablemodel.h
+  ./gui/project_view/projectwindow.h
   ./gui/protein_list_view/proteinlistwindow.h
   ./gui/protein_list_view/proteintablemodel.h
 )

src/gui/project_view/project_view.ui

 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>MainWindow</class>
- <widget class="QMainWindow" name="MainWindow">
+ <class>ProjectView</class>
+ <widget class="QMainWindow" name="ProjectView">
   <property name="geometry">
    <rect>
     <x>0</x>

src/gui/project_view/projectwindow.cpp

+
+/*******************************************************************************
+* Copyright (c) 2017 Olivier Langella <olivier.langella@u-psud.fr>.
+*
+* This file is part of XTPcpp.
+*
+*     XTPcpp is free software: you can redistribute it and/or modify
+*     it under the terms of the GNU General Public License as published by
+*     the Free Software Foundation, either version 3 of the License, or
+*     (at your option) any later version.
+*
+*     XTPcpp is distributed in the hope that it will be useful,
+*     but WITHOUT ANY WARRANTY; without even the implied warranty of
+*     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*     GNU General Public License for more details.
+*
+*     You should have received a copy of the GNU General Public License
+*     along with XTPcpp.  If not, see <http://www.gnu.org/licenses/>.
+*
+* Contributors:
+*     Olivier Langella <olivier.langella@u-psud.fr> - initial API and implementation
+******************************************************************************/
+
+#include "projectwindow.h"
+#include "ui_project_view.h"
+
+
+ProjectWindow::ProjectWindow(MainWindow *parent):
+    QMainWindow(parent),
+    ui(new Ui::ProjectView)
+{
+    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);
+    */
+#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 *)));
+        */
+#endif
+    /*
+    */
+
+}
+
+ProjectWindow::~ProjectWindow()
+{
+    //if (_p_ms_data_file != nullptr) delete _p_ms_data_file;
+    delete ui;
+
+}

src/gui/project_view/projectwindow.h

+
+/*******************************************************************************
+* Copyright (c) 2017 Olivier Langella <olivier.langella@u-psud.fr>.
+*
+* This file is part of XTPcpp.
+*
+*     XTPcpp is free software: you can redistribute it and/or modify
+*     it under the terms of the GNU General Public License as published by
+*     the Free Software Foundation, either version 3 of the License, or
+*     (at your option) any later version.
+*
+*     XTPcpp is distributed in the hope that it will be useful,
+*     but WITHOUT ANY WARRANTY; without even the implied warranty of
+*     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*     GNU General Public License for more details.
+*
+*     You should have received a copy of the GNU General Public License
+*     along with XTPcpp.  If not, see <http://www.gnu.org/licenses/>.
+*
+* Contributors:
+*     Olivier Langella <olivier.langella@u-psud.fr> - initial API and implementation
+******************************************************************************/
+
+#ifndef PROJECTWINDOW_H
+#define PROJECTWINDOW_H
+
+#include <QMainWindow>
+#include "../../core/project.h"
+#include "../mainwindow.h"
+
+//http://doc.qt.io/qt-4.8/qt-itemviews-chart-mainwindow-cpp.html
+namespace Ui {
+class ProjectView;
+}
+
+class ProjectWindow: public QMainWindow {
+    Q_OBJECT
+
+public:
+
+    explicit ProjectWindow(MainWindow * parent = 0);
+    ~ProjectWindow();
+
+public slots:
+    //void peptideEdited(QString peptideStr);
+    // void setColor(const QColor &color);
+    // void setShape(Shape shape);
+signals:
+    //void peptideChanged(pappso::PeptideSp peptide);
+
+private:
+    Ui::ProjectView *ui;
+
+};
+
+
+#endif // PROJECTWINDOW_H