diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 15653c620541bc4b60dec060ff32411dab3e2d2e..340489cf446a4e823dd623a1c2a93e45eb2d1e0d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -29,8 +29,8 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Xml_EXECUTABLE_COMPILE_FLAGS} ${Qt5 #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_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}/cbuild/src/libpappsomspp-qt4.so") diff --git a/src/gui/main.ui b/src/gui/main.ui index 8f5382511b49cc770adc56615dd3b7423a983091..84131d4bf90332765ebea21fa4922438d14a5747 100644 --- a/src/gui/main.ui +++ b/src/gui/main.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>286</width> - <height>372</height> + <width>463</width> + <height>383</height> </rect> </property> <property name="windowTitle"> @@ -17,19 +17,21 @@ <iconset resource="../xtpcpp.qrc"> <normaloff>:/xtpcpp_icon/resources/xtandempipeline_icon.svg</normaloff>:/xtpcpp_icon/resources/xtandempipeline_icon.svg</iconset> </property> - <widget class="QWidget" name="centralwidget"/> + <widget class="QWidget" name="centralwidget"> + <layout class="QGridLayout" name="gridLayout"/> + </widget> <widget class="QMenuBar" name="menubar"> <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>286</width> - <height>33</height> + <width>463</width> + <height>25</height> </rect> </property> <widget class="QMenu" name="menuFile"> <property name="title"> - <string>File</string> + <string>F&ile</string> </property> <addaction name="actionLoad"/> </widget> @@ -38,7 +40,7 @@ <widget class="QStatusBar" name="statusbar"/> <action name="actionLoad"> <property name="text"> - <string>Load</string> + <string>&Load</string> </property> </action> </widget> diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 139f0377cb561cf6f959d5cd42220cb3a962f0f5..89c4f58530d09383e87f631338cb35c3a655eaf4 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -66,7 +66,11 @@ MainWindow::MainWindow(QWidget *parent): workerThread.start(); - _protein_list_window = new ProteinListWindow(this); + _project_window = new ProjectWindow(this); + + ui->centralwidget->layout()->addWidget(_project_window); + _project_window->show(); + //_protein_list_window = new ProteinListWindow(this); //QDockWidget *dock = new QDockWidget(tr("Protein List"), this); //dock->setWidget(_protein_list_window); //addDockWidget(Qt::RightDockWidgetArea, dock); @@ -99,6 +103,7 @@ MainWindow::~MainWindow() workerThread.wait(); //if (_p_ms_data_file != nullptr) delete _p_ms_data_file; delete ui; + delete _project_window; } diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h index 70fdc312f88a574f5dffb17c39069f7dfae7dd04..964a4339aa23e2ecd8eed2140ed4acc91a9586b6 100644 --- a/src/gui/mainwindow.h +++ b/src/gui/mainwindow.h @@ -37,6 +37,7 @@ #include "protein_list_view/proteinlistwindow.h" #include "core/project.h" #include "files/xpipfile.h" +#include "project_view/projectwindow.h" @@ -99,6 +100,7 @@ private : ProjectSp _project_sp=nullptr; ProteinListWindow * _protein_list_window=nullptr; + ProjectWindow * _project_window=nullptr; }; diff --git a/src/gui/project_view/projectwindow.cpp b/src/gui/project_view/projectwindow.cpp index 0820bf5125e2261665c73d52d7431f75d80659fb..833411bf3359781cbe69982231927a3543990552 100644 --- a/src/gui/project_view/projectwindow.cpp +++ b/src/gui/project_view/projectwindow.cpp @@ -23,6 +23,7 @@ #include "projectwindow.h" #include "ui_project_view.h" +#include "../mainwindow.h" ProjectWindow::ProjectWindow(MainWindow *parent): diff --git a/src/gui/project_view/projectwindow.h b/src/gui/project_view/projectwindow.h index 1ec6a9eee2123cd264af5f238af937541050cb2f..ad6766c6d367f204b93bac23dc8d963c1d38b564 100644 --- a/src/gui/project_view/projectwindow.h +++ b/src/gui/project_view/projectwindow.h @@ -26,7 +26,8 @@ #include <QMainWindow> #include "../../core/project.h" -#include "../mainwindow.h" + +class MainWindow; //http://doc.qt.io/qt-4.8/qt-itemviews-chart-mainwindow-cpp.html namespace Ui {