first step to protein list

src/CMakeLists.txt

@@ -24,11 +24,13 @@ INCLUDE_DIRECTORIES(${ODSSTREAM_INCLUDE_DIR})
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Xml_EXECUTABLE_COMPILE_FLAGS} ${Qt5Gui_EXECUTABLE_COMPILE_FLAGS} ${Qt5Svg_EXECUTABLE_COMPILE_FLAGS}")
 
 
-#FIND_PACKAGE( Pappsomspp REQUIRED )
+
+#sudo apt-get install libpappsomspp-dev
+FIND_PACKAGE( Pappsomspp REQUIRED )
 #SET (PAPPSOMSPP_DIR  "/home/olivier/eclipse/git/pappsomspp")
-SET (PAPPSOMSPP_DIR  "/home/langella/developpement/git/pappsomspp")
-SET (PAPPSOMSPP_INCLUDE_DIR "${PAPPSOMSPP_DIR}/src")
-SET (PAPPSOMSPP_QT4_LIBRARY "${PAPPSOMSPP_DIR}/build/src/libpappsomspp-qt4.so")
+# SET (PAPPSOMSPP_DIR  "/home/langella/developpement/git/pappsomspp")
+# SET (PAPPSOMSPP_INCLUDE_DIR "${PAPPSOMSPP_DIR}/src")
+# SET (PAPPSOMSPP_QT4_LIBRARY "${PAPPSOMSPP_DIR}/build/src/libpappsomspp-qt4.so")
 
 INCLUDE_DIRECTORIES( ${PAPPSOMSPP_INCLUDE_DIR} )
 
@@ -61,15 +63,18 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} )
 
 SET(XTPCPP_SRCS
   ./gui/mainwindow.cpp
+  ./gui/protein_list_view/proteinlistwindow.cpp
 )
 
 SET (GUI_UIS
   ./gui/main.ui
+  ./gui/protein_list_view/protein_view.ui
 )
 
 SET(XTPCPP_MOC_HDRS
 
   ./gui/mainwindow.h
+  ./gui/protein_list_view/proteinlistwindow.h
 )
 
 
@@ -96,4 +101,3 @@ INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/xtpcpp DESTINATION bin)
 
 #configure_file (${CMAKE_SOURCE_DIR}/templates/share/applications/pt-peptideviewer.desktop.cmake ${CMAKE_BINARY_DIR}/templates/share/applications/pt-peptideviewer.desktop)
 
-

src/gui/protein_view.ui → src/gui/protein_list_view/protein_view.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>746</width>
-    <height>360</height>
+    <width>826</width>
+    <height>404</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -46,7 +46,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>746</width>
+     <width>826</width>
      <height>22</height>
     </rect>
    </property>

src/gui/protein_list_view/proteinlistwindow.cpp

+
+/*******************************************************************************
+* Copyright (c) 2015 Olivier Langella <Olivier.Langella@moulon.inra.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@moulon.inra.fr> - initial API and implementation
+******************************************************************************/
+
+#include "proteinlistwindow.h"
+
+#include "ui_protein_view.h"
+
+
+ProteinListWindow::ProteinListWindow(QWidget *parent):
+    QMainWindow(parent),
+    ui(new Ui::ProteinView)
+{
+    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
+    /*
+    */
+
+
+}
+
+ProteinListWindow::~ProteinListWindow()
+{
+    //if (_p_ms_data_file != nullptr) delete _p_ms_data_file;
+    delete ui;
+
+}
\ No newline at end of file

src/gui/protein_list_view/proteinlistwindow.h

+
+/*******************************************************************************
+* Copyright (c) 2015 Olivier Langella <Olivier.Langella@moulon.inra.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@moulon.inra.fr> - initial API and implementation
+******************************************************************************/
+
+#ifndef PROTEINLISTWINDOW_H
+#define PROTEINLISTWINDOW_H
+
+
+#include <QMainWindow>
+
+
+namespace Ui {
+class ProteinView;
+}
+
+class ProteinListWindow: public QMainWindow {
+    Q_OBJECT
+
+public:
+
+    explicit ProteinListWindow(QWidget * parent = 0);
+    ~ProteinListWindow();
+
+public slots:
+    //void peptideEdited(QString peptideStr);
+    // void setColor(const QColor &color);
+    // void setShape(Shape shape);
+signals:
+    //void peptideChanged(pappso::PeptideSp peptide);
+
+private:
+    Ui::ProteinView *ui;
+
+};
+
+#endif // PROTEINLISTWINDOW_H