##// END OF EJS Templates
GIT_REPOSITORIES » LPP » Users » mperrinel » SCIQLOP-Initialisation
RSS

Fork of HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop

Refactoring of app module to avoir vera++ warning and to dispatch sources files in the corrects paths
perrinel -
r54:7bf435c144fc
parent child
Show More
Show file before | Show file after | Hide comments
@@ -3,10 +3,13
3 SET(EXECUTABLE_NAME "sciqlop")
3 SET(EXECUTABLE_NAME "sciqlop")
4 SCIQLOP_SET_TO_PARENT_SCOPE(EXECUTABLE_NAME)
4 SCIQLOP_SET_TO_PARENT_SCOPE(EXECUTABLE_NAME)
5 SET(SOURCES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/)
5 SET(SOURCES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/)
6 SET(INCLUDE_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/include)
6 SET(INCLUDES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include")
7 SET(UI_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/src)
7 SET(UI_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/ui)
8 SET(RES_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/resources)
8 SET(RES_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/resources)
9
9
10 # Include gui directory
11 include_directories("${INCLUDES_DIR}")
12
10 #
13 #
11 # Find Qt modules
14 # Find Qt modules
12 #
15 #
@@ -35,24 +38,19 list(APPEND SHARED_LIBRARIES ${SQPCORE_SHARED_LIBRARIES})
35 #get_property(sqpcoreLocation TARGET ${SQPCORE_LIBRARY_NAME} PROPERTY LOCATION)
38 #get_property(sqpcoreLocation TARGET ${SQPCORE_LIBRARY_NAME} PROPERTY LOCATION)
36 list(APPEND SHARED_LIBRARIES_FROM_TARGETS ${sqpcoreLocation})
39 list(APPEND SHARED_LIBRARIES_FROM_TARGETS ${sqpcoreLocation})
37
40
41 # Ui files
42 FILE (GLOB_RECURSE PROJECT_FORMS ${UI_FOLDER}/*.ui)
43
38 #
44 #
39 # Compile the application
45 # Compile the application
40 #
46 #
41 FILE (GLOB_RECURSE APPLICATION_SOURCES
47 FILE (GLOB_RECURSE APPLICATION_SOURCES
42 ${SOURCES_DIR}/*.c
48 ${INCLUDES_DIR}/*.h
43 ${SOURCES_DIR}/*.cpp
49 ${SOURCES_DIR}/*.c
44 ${SOURCES_DIR}/*.h)
50 ${SOURCES_DIR}/*.cpp
45
51 ${SOURCES_DIR}/*.h
46 # Headers files (.h)
52 ${PROJECT_FORMS})
47 FILE (GLOB_RECURSE PROJECT_HEADERS ${INCLUDE_FOLDER}/*.h)
48
53
49 # Ui files
50 FILE (GLOB_RECURSE PROJECT_FORMS ${UI_FOLDER}/*.ui)
51
52 # Resources files
53 FILE (GLOB_RECURSE PROJECT_RESOURCES ${RES_FOLDER}/*.qrc)
54
55 # Retrieve resources files
56 FILE (GLOB_RECURSE APPLICATION_RESOURCES ${RES_FOLDER}/*.qrc)
54 FILE (GLOB_RECURSE APPLICATION_RESOURCES ${RES_FOLDER}/*.qrc)
57
55
58 QT5_ADD_RESOURCES(RCC_HDRS ${APPLICATION_RESOURCES} )
56 QT5_ADD_RESOURCES(RCC_HDRS ${APPLICATION_RESOURCES} )
Show file before | Show file after | Hide comments
@@ -1,6 +1,6
1 /*------------------------------------------------------------------------------
1 /*------------------------------------------------------------------------------
2 -- This file is a part of the QLop Software
2 -- This file is a part of the SciQLop Software
3 -- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
3 -- Copyright (C) 2017, Plasma Physics Laboratory - CNRS
4 --
4 --
5 -- This program is free software; you can redistribute it and/or modify
5 -- This program is free software; you can redistribute it and/or modify
6 -- it under the terms of the GNU General Public License as published by
6 -- it under the terms of the GNU General Public License as published by
@@ -19,8 +19,8
19 /*-- Author : Alexis Jeandet
19 /*-- Author : Alexis Jeandet
20 -- Mail : alexis.jeandet@member.fsf.org
20 -- Mail : alexis.jeandet@member.fsf.org
21 ----------------------------------------------------------------------------*/
21 ----------------------------------------------------------------------------*/
22 #ifndef MAINWINDOW_H
22 #ifndef SCIQLOP_MAINWINDOW_H
23 #define MAINWINDOW_H
23 #define SCIQLOP_MAINWINDOW_H
24
24
25 #include <QListWidgetItem>
25 #include <QListWidgetItem>
26 #include <QMainWindow>
26 #include <QMainWindow>
@@ -32,29 +32,29
32 //#include "../Core/qlopservice.h"
32 //#include "../Core/qlopservice.h"
33 //#include "../Core/qlopgui.h"
33 //#include "../Core/qlopgui.h"
34
34
35 #include <memory>
35
36
36 namespace Ui {
37 namespace Ui {
37 class MainWindow;
38 class MainWindow;
38 }
39 } // namespace Ui
40
39
41
40 class MainWindow : public QMainWindow {
42 class MainWindow : public QMainWindow {
41 Q_OBJECT
43 Q_OBJECT
42
44
43 public:
45 public:
44 explicit MainWindow(QWidget *parent = 0);
46 explicit MainWindow(QWidget *parent = 0);
45 ~MainWindow();
47 virtual ~MainWindow();
46 public slots:
48 public slots:
47
49
48 protected:
50 protected:
49 void changeEvent(QEvent *e);
51 void changeEvent(QEvent *e);
50
52
51 private:
53 private:
52 Ui::MainWindow *ui;
54 std::unique_ptr<Ui::MainWindow> m_Ui;
53 QList<QProgressBar *> m_progress;
55 // QWidget *m_progressWidget;
54 int *m_progressThreadIds;
56 // QVBoxLayout *m_progressLayout;
55 QWidget *m_progressWidget;
56 QVBoxLayout *m_progressLayout;
57 // QList<QLopService*> m_qlopServices;
57 // QList<QLopService*> m_qlopServices;
58 };
58 };
59
59
60 #endif // MAINWINDOW_H
60 #endif // SCIQLOP_MAINWINDOW_H
Show file before | Show file after | Hide comments
@@ -1,6 +1,6
1 /*------------------------------------------------------------------------------
1 /*------------------------------------------------------------------------------
2 -- This file is a part of the QLop Software
2 -- This file is a part of the SciQLop Software
3 -- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
3 -- Copyright (C) 2017, Plasma Physics Laboratory - CNRS
4 --
4 --
5 -- This program is free software; you can redistribute it and/or modify
5 -- This program is free software; you can redistribute it and/or modify
6 -- it under the terms of the GNU General Public License as published by
6 -- it under the terms of the GNU General Public License as published by
@@ -19,8 +19,8
19 /*-- Author : Alexis Jeandet
19 /*-- Author : Alexis Jeandet
20 -- Mail : alexis.jeandet@member.fsf.org
20 -- Mail : alexis.jeandet@member.fsf.org
21 ----------------------------------------------------------------------------*/
21 ----------------------------------------------------------------------------*/
22 #include "mainwindow.h"
22 #include "MainWindow.h"
23 #include "ui_mainwindow.h"
23 #include "ui_MainWindow.h"
24 #include <QAction>
24 #include <QAction>
25 #include <QDate>
25 #include <QDate>
26 #include <QDateTime>
26 #include <QDateTime>
@@ -38,9 +38,9
38 //#include "amdatxtcodec.h"
38 //#include "amdatxtcodec.h"
39 //#include <qlopplotmanager.h>
39 //#include <qlopplotmanager.h>
40
40
41 MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow)
41 MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), m_Ui(new Ui::MainWindow)
42 {
42 {
43 ui->setupUi(this);
43 m_Ui->setupUi(this);
44 /* QLopGUI::registerMenuBar(menuBar());
44 /* QLopGUI::registerMenuBar(menuBar());
45 this->setWindowIcon(QIcon(":/sciqlopLOGO.svg"));
45 this->setWindowIcon(QIcon(":/sciqlopLOGO.svg"));
46 this->m_progressWidget = new QWidget();
46 this->m_progressWidget = new QWidget();
@@ -86,7 +86,6 MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
86
86
87 MainWindow::~MainWindow()
87 MainWindow::~MainWindow()
88 {
88 {
89 delete ui;
90 }
89 }
91
90
92
91
@@ -95,7 +94,7 void MainWindow::changeEvent(QEvent *e)
95 QMainWindow::changeEvent(e);
94 QMainWindow::changeEvent(e);
96 switch (e->type()) {
95 switch (e->type()) {
97 case QEvent::LanguageChange:
96 case QEvent::LanguageChange:
98 ui->retranslateUi(this);
97 m_Ui->retranslateUi(this);
99 break;
98 break;
100 default:
99 default:
101 break;
100 break;
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from app/src/mainwindow.ui to app/ui/MainWindow.ui
NO CONTENT: file renamed from app/src/mainwindow.ui to app/ui/MainWindow.ui
Show file before | Show file after | Hide comments
@@ -1,3 +1,4
1 # Ignore false positive relative to sqpApp macro
1 # Ignore false positive relative to App macro
2 \.h:\d+:.IPSIS_S04.*found: Ui
2 SqpApplication\.h:\d+:.IPSIS_S03.*found: sqpApp
3 SqpApplication\.h:\d+:.IPSIS_S03.*found: sqpApp
3 SqpApplication\.h:\d+:.IPSIS_S04_VARIABLE.*found: sqpApp
4 SqpApplication\.h:\d+:.IPSIS_S04_VARIABLE.*found: sqpApp
General Comments 8
Under Review
perrinel
author
Comment #1394
Edit
Delete
|

Auto status change to "Under Review"

Approved
perrinel
author
Comment #1395
Edit
Delete
|

Status change > Approved

Under Review
perrinel
author
Comment #1401
Edit
Delete
|

Pull request updated. Auto status change to "Under Review"

Changed commits:
  * 1 added
  * 0 removed

Changed files:
  * M core/CMakeLists.txt
Approved
perrinel
author
Comment #1402
Edit
Delete
|

Status change > Approved

You need to be logged in to leave comments. Login now