Auto status change to "Under Review"
Closed
Pull request !133
Created on
Fri, 02 Jun 2017 11:13:15,
- Remove unused cmake code
- comment omp.h to ensure the compilation from the command line
- Remove Qt_PATH variable from de clang analyzer launcher file since we
- comment omp.h to ensure the compilation from the command line
- Remove Qt_PATH variable from de clang analyzer launcher file since we
Pull request versions not available.
| ver | Time | Author | Commit | Description | |
|---|---|---|---|---|---|
latest
|
r30:67c2ab4a2f13
|
|
|||
latest
|
r29:6d9ae743e935
|
|
|||
latest
|
r28:fa79454f5abc
|
|
| @@ -0,0 +1,1 | |||
|
|
1 | TODO | |
| @@ -0,0 +1,103 | |||
|
|
1 | /*------------------------------------------------------------------------------ | |
|
|
2 | -- This file is a part of the QLop Software | |
|
|
3 | -- Copyright (C) 2015, Plasma Physics Laboratory - CNRS | |
|
|
4 | -- | |
|
|
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 | |
|
|
7 | -- the Free Software Foundation; either version 2 of the License, or | |
|
|
8 | -- (at your option) any later version. | |
|
|
9 | -- | |
|
|
10 | -- This program is distributed in the hope that it will be useful, | |
|
|
11 | -- but WITHOUT ANY WARRANTY; without even the implied warranty of | |
|
|
12 | -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
|
|
13 | -- GNU General Public License for more details. | |
|
|
14 | -- | |
|
|
15 | -- You should have received a copy of the GNU General Public License | |
|
|
16 | -- along with this program; if not, write to the Free Software | |
|
|
17 | -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
|
|
18 | -------------------------------------------------------------------------------*/ | |
|
|
19 | /*-- Author : Alexis Jeandet | |
|
|
20 | -- Mail : alexis.jeandet@member.fsf.org | |
|
|
21 | ----------------------------------------------------------------------------*/ | |
|
|
22 | #include "mainwindow.h" | |
|
|
23 | #include "ui_mainwindow.h" | |
|
|
24 | #include <QAction> | |
|
|
25 | #include <QDate> | |
|
|
26 | #include <QDateTime> | |
|
|
27 | #include <QDir> | |
|
|
28 | #include <QFileDialog> | |
|
|
29 | //#include <omp.h> | |
|
|
30 | //#include <network/filedownloader.h> | |
|
|
31 | //#include <qlopdatabase.h> | |
|
|
32 | //#include <qlopsettings.h> | |
|
|
33 | //#include <qlopgui.h> | |
|
|
34 | //#include <spacedata.h> | |
|
|
35 | //#include "qlopcore.h" | |
|
|
36 | //#include "qlopcodecmanager.h" | |
|
|
37 | //#include "cdfcodec.h" | |
|
|
38 | //#include "amdatxtcodec.h" | |
|
|
39 | //#include <qlopplotmanager.h> | |
|
|
40 | ||
|
|
41 | MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) | |
|
|
42 | { | |
|
|
43 | ui->setupUi(this); | |
|
|
44 | /* QLopGUI::registerMenuBar(menuBar()); | |
|
|
45 | this->setWindowIcon(QIcon(":/sciqlopLOGO.svg")); | |
|
|
46 | this->m_progressWidget = new QWidget(); | |
|
|
47 | this->m_progressLayout = new QVBoxLayout(this->m_progressWidget); | |
|
|
48 | this->m_progressWidget->setLayout(this->m_progressLayout); | |
|
|
49 | this->m_progressWidget->setWindowModality(Qt::WindowModal); | |
|
|
50 | m_progressThreadIds = (int*) malloc(OMP_THREADS*sizeof(int)); | |
|
|
51 | for(int i=0;i<OMP_THREADS;i++) | |
|
|
52 | { | |
|
|
53 | this->m_progress.append(new QProgressBar(this->m_progressWidget)); | |
|
|
54 | this->m_progress.last()->setMinimum(0); | |
|
|
55 | this->m_progress.last()->setMaximum(100); | |
|
|
56 | this->m_progressLayout->addWidget(this->m_progress.last()); | |
|
|
57 | this->m_progressWidget->hide(); | |
|
|
58 | this->m_progressThreadIds[i] = -1; | |
|
|
59 | } | |
|
|
60 | this->m_progressWidget->setWindowTitle("Loading File"); | |
|
|
61 | const QList<QLopService*>ServicesToLoad=QList<QLopService*>() | |
|
|
62 | << QLopCore::self() | |
|
|
63 | << QLopPlotManager::self() | |
|
|
64 | << QLopCodecManager::self() | |
|
|
65 | << FileDownloader::self() | |
|
|
66 | << QLopDataBase::self() | |
|
|
67 | << SpaceData::self(); | |
|
|
68 | ||
|
|
69 | CDFCodec::registerToManager(); | |
|
|
70 | AMDATXTCodec::registerToManager(); | |
|
|
71 | ||
|
|
72 | ||
|
|
73 | for(int i=0;i<ServicesToLoad.count();i++) | |
|
|
74 | { | |
|
|
75 | qDebug()<<ServicesToLoad.at(i)->serviceName(); | |
|
|
76 | ServicesToLoad.at(i)->initialize(); //must be called before getGUI | |
|
|
77 | QDockWidget* wdgt=ServicesToLoad.at(i)->getGUI(); | |
|
|
78 | if(wdgt) | |
|
|
79 | { | |
|
|
80 | wdgt->setAllowedAreas(Qt::AllDockWidgetAreas); | |
|
|
81 | this->addDockWidget(Qt::TopDockWidgetArea,wdgt); | |
|
|
82 | } | |
|
|
83 | PythonQt::self()->getMainModule().addObject(ServicesToLoad.at(i)->serviceName(),(QObject*)ServicesToLoad.at(i)); | |
|
|
84 | }*/ | |
|
|
85 | } | |
|
|
86 | ||
|
|
87 | MainWindow::~MainWindow() | |
|
|
88 | { | |
|
|
89 | delete ui; | |
|
|
90 | } | |
|
|
91 | ||
|
|
92 | ||
|
|
93 | void MainWindow::changeEvent(QEvent *e) | |
|
|
94 | { | |
|
|
95 | QMainWindow::changeEvent(e); | |
|
|
96 | switch (e->type()) { | |
|
|
97 | case QEvent::LanguageChange: | |
|
|
98 | ui->retranslateUi(this); | |
|
|
99 | break; | |
|
|
100 | default: | |
|
|
101 | break; | |
|
|
102 | } | |
|
|
103 | } | |
| @@ -0,0 +1,56 | |||
|
|
1 | <?xml version="1.0" encoding="UTF-8"?> | |
|
|
2 | <ui version="4.0"> | |
|
|
3 | <class>MainWindow</class> | |
|
|
4 | <widget class="QMainWindow" name="MainWindow"> | |
|
|
5 | <property name="geometry"> | |
|
|
6 | <rect> | |
|
|
7 | <x>0</x> | |
|
|
8 | <y>0</y> | |
|
|
9 | <width>800</width> | |
|
|
10 | <height>600</height> | |
|
|
11 | </rect> | |
|
|
12 | </property> | |
|
|
13 | <property name="windowTitle"> | |
|
|
14 | <string>QLop</string> | |
|
|
15 | </property> | |
|
|
16 | <property name="dockNestingEnabled"> | |
|
|
17 | <bool>true</bool> | |
|
|
18 | </property> | |
|
|
19 | <widget class="QWidget" name="centralWidget"> | |
|
|
20 | <property name="enabled"> | |
|
|
21 | <bool>true</bool> | |
|
|
22 | </property> | |
|
|
23 | <property name="sizePolicy"> | |
|
|
24 | <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> | |
|
|
25 | <horstretch>0</horstretch> | |
|
|
26 | <verstretch>0</verstretch> | |
|
|
27 | </sizepolicy> | |
|
|
28 | </property> | |
|
|
29 | <property name="maximumSize"> | |
|
|
30 | <size> | |
|
|
31 | <width>16777215</width> | |
|
|
32 | <height>16777215</height> | |
|
|
33 | </size> | |
|
|
34 | </property> | |
|
|
35 | </widget> | |
|
|
36 | <widget class="QMenuBar" name="menuBar"> | |
|
|
37 | <property name="geometry"> | |
|
|
38 | <rect> | |
|
|
39 | <x>0</x> | |
|
|
40 | <y>0</y> | |
|
|
41 | <width>800</width> | |
|
|
42 | <height>45</height> | |
|
|
43 | </rect> | |
|
|
44 | </property> | |
|
|
45 | </widget> | |
|
|
46 | <widget class="QStatusBar" name="statusBar"/> | |
|
|
47 | <action name="actionIndex_Viewer"> | |
|
|
48 | <property name="text"> | |
|
|
49 | <string>Index Viewer</string> | |
|
|
50 | </property> | |
|
|
51 | </action> | |
|
|
52 | </widget> | |
|
|
53 | <layoutdefault spacing="6" margin="11"/> | |
|
|
54 | <resources/> | |
|
|
55 | <connections/> | |
|
|
56 | </ui> | |
| @@ -1,5 +1,3 | |||
|
|
1 | 1 | build/ |
|
|
2 | 2 | CMakeLists.txt.user |
|
|
3 | 3 | /.project |
|
|
4 | core/src/Version.cpp | |
|
|
5 | core/include/Version.h | |
| @@ -1,31 +1,1 | |||
|
|
1 | {:.some-css-class style="width: 20%"} | |
|
|
2 | ||
|
|
3 | ||
|
|
4 | # Overview | |
|
|
5 | ||
|
|
6 | ** SciQLOP ** (**SCI**entific **Q**t application for **L**earning from **O**bservations of **P**lasmas) aims to be an ergonomic | |
|
|
7 | and powerful tool enabling visualization and analysis of in-situ space plasma data. This goal rises some | |
|
|
8 | challenges either technical and in the conception and the design. | |
|
|
9 | The time resolution allowed by nowadays measurements imply the ability to plot millions of points just for | |
|
|
10 | one sensor with no compromise on interactivity. Plots may stay responsive even with millions of points. | |
|
|
11 | Being able to scroll, zoom, move and export the plots with the mouse are the minimal interactions expected by the user. | |
|
|
12 | SciQLOP may also abstract the manipulation of physic data while providing contextual features such as | |
|
|
13 | coordinate transform, physical quantity extraction from data. | |
|
|
14 | That said increasing graphical features usually lead to slower software and more complex GUI. Keeping | |
|
|
15 | SciQLOP lightweight and intuitive is one of the priorities to make it usable and competitive. | |
|
|
16 | ||
|
|
17 | ||
|
|
18 | ## How to build | |
|
|
19 | ||
|
|
20 | ``` | |
|
|
21 | git clone https://hephaistos.lpp.polytechnique.fr/rhodecode/HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop | |
|
|
22 | cd SciQLop | |
|
|
23 | mkdir build && cd build | |
|
|
24 | cmake ../ | |
|
|
25 | make | |
|
|
26 | ||
|
|
27 | ``` | |
|
|
28 | ||
|
|
29 | ## How to contribute | |
|
|
30 | ||
|
|
31 | Contact sciqlop@lpp.polytechnique.fr | |
|
|
1 | TODO No newline at end of file | |
| @@ -3,7 +3,6 echo Setting up environment for Qt usage... | |||
|
|
3 | 3 | |
|
|
4 | 4 | set QT_QMAKE_PATH=C:\Qt\5.8\mingw53_32\bin |
|
|
5 | 5 | set QT_MINGW_PATH=C:\Qt\Tools\mingw530_32\bin |
|
|
6 | set NSIS_PATH=C:\Appli\NSIS | |
|
|
7 | 6 | set LLVM_PATH=C:\Appli\LLVM\bin |
|
|
8 | 7 | set CMAKE_PATH=C:\Appli\CMake\bin |
|
|
9 | 8 | set NINJA_PATH=C:\Appli\Ninja |
| @@ -14,5 +13,5 set PYTHON_PATH=C:\Appli\Python\Python36-32 | |||
|
|
14 | 13 | set SCAN_BUILD_PATH=C:\Dev\CNRS-DEV\cfe\tools\scan-build\bin |
|
|
15 | 14 | |
|
|
16 | 15 | |
|
|
17 |
set PATH=%QT_QMAKE_PATH%;%QT_MINGW_PATH%;%PERL_SITE_PATH%;%PERL_PATH%;%PYTHON_PATH%; |
|
|
|
16 | set PATH=%QT_QMAKE_PATH%;%QT_MINGW_PATH%;%PERL_SITE_PATH%;%PERL_PATH%;%PYTHON_PATH%;%SCAN_BUILD_PATH%;%LLVM_PATH%;%CMAKE_PATH%;%NINJA_PATH%;%PATH% | |
|
|
18 | 17 | cd /D C:\Dev\CNRS-DEV\SciQlopInit |
| @@ -1,20 +1,15 | |||
|
|
1 | 1 | |
|
|
2 | 2 | ## sciqlop - CMakeLists.txt |
|
|
3 | 3 | SET(EXECUTABLE_NAME "sciqlop") |
|
|
4 | SCIQLOP_SET_TO_PARENT_SCOPE(EXECUTABLE_NAME) | |
|
|
5 | 4 | SET(SOURCES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/) |
|
|
6 |
SET(INCLUDE |
|
|
|
7 |
SET(UI_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/ |
|
|
|
5 | SET(INCLUDE_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/include) | |
|
|
6 | SET(UI_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/src) | |
|
|
8 | 7 | SET(RES_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/resources) |
|
|
9 | 8 | |
|
|
10 | # Include gui directory | |
|
|
11 | include_directories("${INCLUDES_DIR}") | |
|
|
12 | ||
|
|
13 | 9 | # |
|
|
14 | 10 | # Find Qt modules |
|
|
15 | 11 | # |
|
|
16 | 12 | SCIQLOP_FIND_QT(Core Widgets) |
|
|
17 | ||
|
|
18 | 13 | |
|
|
19 | 14 | # |
|
|
20 | 15 | # Find dependent libraries |
| @@ -39,19 +34,24 list(APPEND SHARED_LIBRARIES ${SQPCORE_SHARED_LIBRARIES}) | |||
|
|
39 | 34 | #get_property(sqpcoreLocation TARGET ${SQPCORE_LIBRARY_NAME} PROPERTY LOCATION) |
|
|
40 | 35 | list(APPEND SHARED_LIBRARIES_FROM_TARGETS ${sqpcoreLocation}) |
|
|
41 | 36 | |
|
|
42 | # Ui files | |
|
|
43 | FILE (GLOB_RECURSE PROJECT_FORMS ${UI_FOLDER}/*.ui) | |
|
|
44 | ||
|
|
45 | 37 | # |
|
|
46 | 38 | # Compile the application |
|
|
47 | 39 | # |
|
|
48 | 40 | FILE (GLOB_RECURSE APPLICATION_SOURCES |
|
|
49 |
|
|
|
|
50 |
|
|
|
|
51 |
|
|
|
|
52 | ${SOURCES_DIR}/*.h | |
|
|
53 | ${PROJECT_FORMS}) | |
|
|
41 | ${SOURCES_DIR}/*.c | |
|
|
42 | ${SOURCES_DIR}/*.cpp | |
|
|
43 | ${SOURCES_DIR}/*.h) | |
|
|
44 | ||
|
|
45 | # Headers files (.h) | |
|
|
46 | FILE (GLOB_RECURSE PROJECT_HEADERS ${INCLUDE_FOLDER}/*.h) | |
|
|
47 | ||
|
|
48 | # Ui files | |
|
|
49 | FILE (GLOB_RECURSE PROJECT_FORMS ${UI_FOLDER}/*.ui) | |
|
|
54 | 50 | |
|
|
51 | # Resources files | |
|
|
52 | FILE (GLOB_RECURSE PROJECT_RESOURCES ${RES_FOLDER}/*.qrc) | |
|
|
53 | ||
|
|
54 | # Retrieve resources files | |
|
|
55 | 55 | FILE (GLOB_RECURSE APPLICATION_RESOURCES ${RES_FOLDER}/*.qrc) |
|
|
56 | 56 | |
|
|
57 | 57 | QT5_ADD_RESOURCES(RCC_HDRS ${APPLICATION_RESOURCES} ) |
| @@ -66,32 +66,22 set_property(TARGET ${EXECUTABLE_NAME} PROPERTY CXX_STANDARD 14) | |||
|
|
66 | 66 | set_property(TARGET ${EXECUTABLE_NAME} PROPERTY CXX_STANDARD_REQUIRED ON) |
|
|
67 | 67 | target_link_libraries(${EXECUTABLE_NAME} |
|
|
68 | 68 | ${LIBRARIES}) |
|
|
69 | ||
|
|
70 | INSTALL(TARGETS ${EXECUTABLE_NAME} | |
|
|
71 | RUNTIME DESTINATION ${INSTALL_BINARY_DIR} | |
|
|
72 | LIBRARY DESTINATION ${INSTALL_BINARY_DIR} | |
|
|
73 | ARCHIVE DESTINATION ${INSTALL_BINARY_DIR} | |
|
|
74 | ) | |
|
|
69 | ||
|
|
75 | 70 | # Link with Qt5 modules |
|
|
76 | 71 | qt5_use_modules(${EXECUTABLE_NAME} Core Widgets) |
|
|
77 | ||
|
|
78 | ||
|
|
79 | add_dependencies(${EXECUTABLE_NAME} ${SQPGUI_LIBRARY_NAME} ${SQPCORE_LIBRARY_NAME}) | |
|
|
80 | ||
|
|
81 | 72 | |
|
|
82 | 73 | |
|
|
83 | 74 | # Add the files to the list of files to be analyzed |
|
|
84 | 75 | LIST(APPEND CHECKSTYLE_INPUT_FILES ${APPLICATION_SOURCES}) |
|
|
85 | 76 | SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_INPUT_FILES) |
|
|
86 | 77 | # Vera++ exclusion files |
|
|
87 |
LIST(APPEND CHECKSTYLE_EXCLUSION_FILES ${CMAKE_CURRENT_SOURCE_DIR}/ |
|
|
|
78 | #LIST(APPEND CHECKSTYLE_EXCLUSION_FILES ${CMAKE_CURRENT_SOURCE_DIR}/path/to/exclusionFiles.tcl) | |
|
|
88 | 79 | SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_EXCLUSION_FILES) |
|
|
89 | 80 | |
|
|
90 | 81 | # |
|
|
91 | 82 | # Compile the tests |
|
|
92 | 83 | # |
|
|
93 | 84 | IF(BUILD_TESTS) |
|
|
94 | ||
|
|
95 | 85 | INCLUDE_DIRECTORIES(${SOURCES_DIR}) |
|
|
96 | 86 | FILE (GLOB_RECURSE TESTS_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Test*.cpp) |
|
|
97 | 87 | FILE (GLOB_RECURSE TESTS_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/Test*.h) |
| @@ -99,7 +89,7 IF(BUILD_TESTS) | |||
|
|
99 | 89 | |
|
|
100 | 90 | FOREACH( testFile ${TESTS_SOURCES} ) |
|
|
101 | 91 | GET_FILENAME_COMPONENT( testDirectory ${testFile} DIRECTORY ) |
|
|
102 |
|
|
|
|
92 | GET_FILENAME_COMPONENT( testName ${testFile} NAME_WE ) | |
|
|
103 | 93 | |
|
|
104 | 94 | # Add to the list of sources files all the sources in the same |
|
|
105 | 95 | # directory that aren't another test |
| @@ -111,7 +101,7 IF(BUILD_TESTS) | |||
|
|
111 | 101 | LIST (REMOVE_ITEM currentTestSources ${TESTS_HEADERS}) |
|
|
112 | 102 | |
|
|
113 | 103 | ADD_EXECUTABLE(${testName} ${testFile} ${currentTestSources}) |
|
|
114 |
|
|
|
|
104 | TARGET_LINK_LIBRARIES( ${testName} ${TEST_LIBRARIES} ) | |
|
|
115 | 105 | qt5_use_modules(${testName} Test) |
|
|
116 | 106 | |
|
|
117 | 107 | ADD_TEST( NAME ${testName} COMMAND ${testName} ) |
| @@ -122,7 +112,6 IF(BUILD_TESTS) | |||
|
|
122 | 112 | LIST(APPEND testFilesToFormat ${TESTS_SOURCES}) |
|
|
123 | 113 | LIST(APPEND testFilesToFormat ${TESTS_HEADERS}) |
|
|
124 | 114 | LIST(APPEND FORMATTING_INPUT_FILES ${testFilesToFormat}) |
|
|
125 | ||
|
|
126 | 115 | SCIQLOP_SET_TO_PARENT_SCOPE(FORMATTING_INPUT_FILES) |
|
|
127 | 116 | ENDIF(BUILD_TESTS) |
|
|
128 | 117 | |
| @@ -19,62 +19,21 | |||
|
|
19 | 19 | /*-- Author : Alexis Jeandet |
|
|
20 | 20 | -- Mail : alexis.jeandet@member.fsf.org |
|
|
21 | 21 | ----------------------------------------------------------------------------*/ |
|
|
22 |
#include " |
|
|
|
22 | #include "mainwindow.h" | |
|
|
23 | 23 | #include <QProcessEnvironment> |
|
|
24 | 24 | #include <QThread> |
|
|
25 | 25 | #include <SqpApplication.h> |
|
|
26 | 26 | #include <qglobal.h> |
|
|
27 | 27 | |
|
|
28 | #include <Plugin/PluginManager.h> | |
|
|
29 | #include <QDir> | |
|
|
30 | ||
|
|
31 | #include <QLoggingCategory> | |
|
|
32 | ||
|
|
33 | Q_LOGGING_CATEGORY(LOG_Main, "Main") | |
|
|
34 | ||
|
|
35 | namespace { | |
|
|
36 | ||
|
|
37 | const auto PLUGIN_DIRECTORY_NAME = QStringLiteral("plugins"); | |
|
|
38 | ||
|
|
39 | ||
|
|
40 | } // namespace | |
|
|
41 | ||
|
|
42 | 28 | int main(int argc, char *argv[]) |
|
|
43 | 29 | { |
|
|
44 | SqpApplication a{argc, argv}; | |
|
|
30 | int ad; | |
|
|
31 | SqpApplication a(argc, argv); | |
|
|
45 | 32 | SqpApplication::setOrganizationName("LPP"); |
|
|
46 | 33 | SqpApplication::setOrganizationDomain("lpp.fr"); |
|
|
47 | 34 | SqpApplication::setApplicationName("SciQLop"); |
|
|
48 | 35 | MainWindow w; |
|
|
49 | 36 | w.show(); |
|
|
50 | 37 | |
|
|
51 | // Loads plugins | |
|
|
52 | auto pluginDir = QDir{a.applicationDirPath()}; | |
|
|
53 | auto pluginLookupPath = { | |
|
|
54 | a.applicationDirPath(), | |
|
|
55 | a.applicationDirPath() + "/" + PLUGIN_DIRECTORY_NAME, | |
|
|
56 | a.applicationDirPath() + "/../lib64/SciQlop", | |
|
|
57 | a.applicationDirPath() + "/../lib64/sciqlop", | |
|
|
58 | a.applicationDirPath() + "/../lib/SciQlop", | |
|
|
59 | a.applicationDirPath() + "/../lib/sciqlop", | |
|
|
60 | a.applicationDirPath() + "/../plugins", | |
|
|
61 | }; | |
|
|
62 | ||
|
|
63 | #if _WIN32 || _WIN64 | |
|
|
64 | pluginDir.mkdir(PLUGIN_DIRECTORY_NAME); | |
|
|
65 | pluginDir.cd(PLUGIN_DIRECTORY_NAME); | |
|
|
66 | #endif | |
|
|
67 | ||
|
|
68 | PluginManager pluginManager{}; | |
|
|
69 | ||
|
|
70 | for (auto &&path : pluginLookupPath) { | |
|
|
71 | QDir directory{path}; | |
|
|
72 | if (directory.exists()) { | |
|
|
73 | qCDebug(LOG_Main()) | |
|
|
74 | << QObject::tr("Plugin directory: %1").arg(directory.absolutePath()); | |
|
|
75 | pluginManager.loadPlugins(directory); | |
|
|
76 | } | |
|
|
77 | } | |
|
|
78 | ||
|
|
79 | 38 | return a.exec(); |
|
|
80 | 39 | } |
| @@ -1,6 +1,6 | |||
|
|
1 | 1 | /*------------------------------------------------------------------------------ |
|
|
2 |
-- This file is a part of the |
|
|
|
3 |
-- Copyright (C) 201 |
|
|
|
2 | -- This file is a part of the QLop Software | |
|
|
3 | -- Copyright (C) 2015, Plasma Physics Laboratory - CNRS | |
|
|
4 | 4 | -- |
|
|
5 | 5 | -- This program is free software; you can redistribute it and/or modify |
|
|
6 | 6 | -- it under the terms of the GNU General Public License as published by |
| @@ -19,47 +19,42 | |||
|
|
19 | 19 | /*-- Author : Alexis Jeandet |
|
|
20 | 20 | -- Mail : alexis.jeandet@member.fsf.org |
|
|
21 | 21 | ----------------------------------------------------------------------------*/ |
|
|
22 |
#ifndef |
|
|
|
23 |
#define |
|
|
|
22 | #ifndef MAINWINDOW_H | |
|
|
23 | #define MAINWINDOW_H | |
|
|
24 | 24 | |
|
|
25 | 25 | #include <QListWidgetItem> |
|
|
26 | #include <QLoggingCategory> | |
|
|
27 | 26 | #include <QMainWindow> |
|
|
28 | 27 | #include <QProgressBar> |
|
|
29 | 28 | #include <QProgressDialog> |
|
|
30 | 29 | #include <QThread> |
|
|
31 | 30 | #include <QVBoxLayout> |
|
|
32 | 31 | #include <QWidget> |
|
|
32 | //#include "../Core/qlopservice.h" | |
|
|
33 | //#include "../Core/qlopgui.h" | |
|
|
33 | 34 | |
|
|
34 | #include <Common/spimpl.h> | |
|
|
35 | ||
|
|
36 | #include <memory> | |
|
|
37 | ||
|
|
38 | Q_DECLARE_LOGGING_CATEGORY(LOG_MainWindow) | |
|
|
39 | 35 | |
|
|
40 | 36 | namespace Ui { |
|
|
41 | 37 | class MainWindow; |
|
|
42 | } // namespace Ui | |
|
|
43 | ||
|
|
38 | } | |
|
|
44 | 39 | |
|
|
45 | 40 | class MainWindow : public QMainWindow { |
|
|
46 | 41 | Q_OBJECT |
|
|
47 | 42 | |
|
|
48 | 43 | public: |
|
|
49 | 44 | explicit MainWindow(QWidget *parent = 0); |
|
|
50 |
|
|
|
|
45 | ~MainWindow(); | |
|
|
51 | 46 | public slots: |
|
|
52 | 47 | |
|
|
53 | 48 | protected: |
|
|
54 | 49 | void changeEvent(QEvent *e); |
|
|
55 | 50 | |
|
|
56 | 51 | private: |
|
|
57 |
|
|
|
|
58 | // QWidget *m_progressWidget; | |
|
|
59 | // QVBoxLayout *m_progressLayout; | |
|
|
52 | Ui::MainWindow *ui; | |
|
|
53 | QList<QProgressBar *> m_progress; | |
|
|
54 | int *m_progressThreadIds; | |
|
|
55 | QWidget *m_progressWidget; | |
|
|
56 | QVBoxLayout *m_progressLayout; | |
|
|
60 | 57 | // QList<QLopService*> m_qlopServices; |
|
|
61 | class MainWindowPrivate; | |
|
|
62 | spimpl::unique_impl_ptr<MainWindowPrivate> impl; | |
|
|
63 | 58 | }; |
|
|
64 | 59 | |
|
|
65 |
#endif // |
|
|
|
60 | #endif // MAINWINDOW_H | |
| @@ -21,7 +21,7 INCLUDE("cmake/sciqlop_params.cmake") | |||
|
|
21 | 21 | # |
|
|
22 | 22 | # Configure the compiler |
|
|
23 | 23 | # |
|
|
24 |
|
|
|
|
24 | INCLUDE("cmake/compiler/compiler.cmake") | |
|
|
25 | 25 | |
|
|
26 | 26 | # |
|
|
27 | 27 | # Find all necessary dependencies |
| @@ -1,16 +1,21 | |||
|
|
1 | ||
|
|
2 | if(BUILD_TESTS) | |
|
|
3 | INCLUDE ("cmake/sciqlop_code_coverage.cmake") | |
|
|
4 | APPEND_COVERAGE_COMPILER_FLAGS() | |
|
|
5 | endif(BUILD_TESTS) | |
|
|
1 | # | |
|
|
2 | # Sciqlop_modules.cmake | |
|
|
3 | # | |
|
|
4 | # Set ouptut directories | |
|
|
5 | # | |
|
|
6 | SET (EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/${CMAKE_BUILD_TYPE}) | |
|
|
7 | SET (LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/${CMAKE_BUILD_TYPE}) | |
|
|
8 | IF (UNIX) | |
|
|
9 | SET (CONFIG_OUTPUT_PATH $ENV{HOME}/.config/QtProject) | |
|
|
10 | ELSEIF(WIN32) | |
|
|
11 | SET (CONFIG_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/${CMAKE_BUILD_TYPE}/app/QtProject) | |
|
|
12 | ELSE() | |
|
|
13 | SET (CONFIG_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/${CMAKE_BUILD_TYPE}) | |
|
|
14 | ENDIF() | |
|
|
6 | 15 | |
|
|
7 | 16 | # |
|
|
8 | 17 | # Compile the diffents modules |
|
|
9 | 18 | # |
|
|
10 | set(sciqlop-plugin_DIR "${CMAKE_SOURCE_DIR}/plugin/cmake") | |
|
|
11 | set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${sciqlop-plugin_DIR}") | |
|
|
12 | ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/plugin") | |
|
|
13 | ||
|
|
14 | 19 | set(sciqlop-core_DIR "${CMAKE_SOURCE_DIR}/core/cmake") |
|
|
15 | 20 | set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${sciqlop-core_DIR}") |
|
|
16 | 21 | ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/core") |
| @@ -21,25 +26,6 ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/gui") | |||
|
|
21 | 26 | |
|
|
22 | 27 | ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/app") |
|
|
23 | 28 | |
|
|
24 | OPTION (BUILD_PLUGINS "Build the plugins" OFF) | |
|
|
25 | IF(BUILD_PLUGINS) | |
|
|
26 | set(sciqlop-mockplugin_DIR "${CMAKE_SOURCE_DIR}/plugins/mockplugin/cmake") | |
|
|
27 | set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${sciqlop-mockplugin_DIR}") | |
|
|
28 | ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/plugins/mockplugin") | |
|
|
29 | ||
|
|
30 | set(sciqlop-amda_DIR "${CMAKE_SOURCE_DIR}/plugins/amda/cmake") | |
|
|
31 | set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${sciqlop-amda_DIR}") | |
|
|
32 | ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/plugins/amda") | |
|
|
33 | ||
|
|
34 | # Temporary target to copy to plugins dir | |
|
|
35 | find_package(sciqlop-mockplugin) | |
|
|
36 | find_package(sciqlop-amda) | |
|
|
37 | ADD_CUSTOM_TARGET(plugins | |
|
|
38 | COMMAND ${CMAKE_COMMAND} -E copy ${SCIQLOP-MOCKPLUGIN_LIBRARIES} "${LIBRARY_OUTPUT_PATH}/plugins/${SCIQLOP-MOCKPLUGIN_LIBRARIES_NAME}" | |
|
|
39 | COMMAND ${CMAKE_COMMAND} -E copy ${SCIQLOP-AMDA_LIBRARIES} "${LIBRARY_OUTPUT_PATH}/plugins/${SCIQLOP-AMDA_LIBRARIES_NAME}" | |
|
|
40 | ) | |
|
|
41 | ENDIF(BUILD_PLUGINS) | |
|
|
42 | ||
|
|
43 | 29 | # LOGGER |
|
|
44 | 30 | set(QTLOGGING_INI_FILE "${CMAKE_SOURCE_DIR}/config/QtProject/qtlogging.ini") |
|
|
45 | 31 | FILE(COPY ${QTLOGGING_INI_FILE} DESTINATION ${CONFIG_OUTPUT_PATH}) |
| @@ -50,7 +36,7 FILE(COPY ${QTLOGGING_INI_FILE} DESTINATION ${CONFIG_OUTPUT_PATH}) | |||
|
|
50 | 36 | # |
|
|
51 | 37 | # Vera++ exclusion files |
|
|
52 | 38 | LIST(APPEND CHECKSTYLE_EXCLUSION_FILES ${CMAKE_CURRENT_SOURCE_DIR}/formatting/vera-exclusions/exclusions.txt) |
|
|
53 |
|
|
|
|
39 | SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_EXCLUSION_FILES) | |
|
|
54 | 40 | INCLUDE ("cmake/sciqlop_formatting.cmake") |
|
|
55 | 41 | |
|
|
56 | 42 | # |
| @@ -1,59 +0,0 | |||
|
|
1 | # | |
|
|
2 | # Generate the source package of SciqLop. | |
|
|
3 | # | |
|
|
4 | ||
|
|
5 | install(DIRECTORY | |
|
|
6 | ${EXECUTABLE_OUTPUT_PATH} | |
|
|
7 | DESTINATION "." | |
|
|
8 | USE_SOURCE_PERMISSIONS | |
|
|
9 | COMPONENT CORE | |
|
|
10 | PATTERN "*.a" EXCLUDE | |
|
|
11 | ) | |
|
|
12 | ||
|
|
13 | set(EXECUTABLEDOTEXTENSION) | |
|
|
14 | if(WIN32) | |
|
|
15 | set(EXECUTABLEDOTEXTENSION ".exe") | |
|
|
16 | endif(WIN32) | |
|
|
17 | set (SCIQLOP_EXE_LOCATION ${EXECUTABLE_OUTPUT_PATH}/${EXECUTABLE_NAME}${EXECUTABLEDOTEXTENSION}) | |
|
|
18 | ||
|
|
19 | if(WIN32) | |
|
|
20 | include ("cmake/sciqlop_package_qt.cmake") | |
|
|
21 | endif(WIN32) | |
|
|
22 | ||
|
|
23 | ||
|
|
24 | SET (CPACK_PACKAGE_VENDOR "CNRS") | |
|
|
25 | SET (CPACK_PACKAGE_VERSION_MAJOR "${SCIQLOP_VERSION_MAJOR}") | |
|
|
26 | SET (CPACK_PACKAGE_VERSION_MINOR "${SCIQLOP_VERSION_MINOR}") | |
|
|
27 | SET (CPACK_PACKAGE_VERSION_PATCH "${SCIQLOP_VERSION_PATCH}${SCIQLOP_VERSION_SUFFIX}") | |
|
|
28 | SET (CPACK_PACKAGE_VERSION "${SCIQLOP_VERSION}") | |
|
|
29 | SET (CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/COPYING) | |
|
|
30 | SET (CPACK_PACKAGE_CONTACT "nicolas.aunai@lpp.polytechnique.fr") | |
|
|
31 | SET(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/README.md) | |
|
|
32 | # SET(CPACK_RESOURCE_FILE_WELCOME ${CMAKE_CURRENT_SOURCE_DIR}/WARN.txt) | |
|
|
33 | SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/COPYING) | |
|
|
34 | # SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${PROJECT_NAME}-${PROJECT_VERSION}) | |
|
|
35 | SET(FULLBUILD ON) | |
|
|
36 | ||
|
|
37 | SET(CPACK_PACKAGE_NAME ${PROJECT_NAME}) | |
|
|
38 | SET(CPACK_GENERATOR "NSIS") | |
|
|
39 | SET(CPACK_MONOLITHIC_INSTALL 1) | |
|
|
40 | #SET(CPACK_COMPONENTS_ALL sciqlop qt) | |
|
|
41 | SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-Setup") | |
|
|
42 | SET(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_NAME}) | |
|
|
43 | ||
|
|
44 | set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME}) | |
|
|
45 | ||
|
|
46 | if (WIN32) | |
|
|
47 | SET(CPACK_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}) | |
|
|
48 | SET(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON) | |
|
|
49 | SET(CPACK_NSIS_COMPONENT_INSTALL ON) | |
|
|
50 | SET(CPACK_SYSTEM_NAME "MinGW32") | |
|
|
51 | SET(CPACK_PACKAGING_INSTALL_PREFIX "") | |
|
|
52 | #SET(CPACK_GENERATOR "NSIS") | |
|
|
53 | SET(CPACK_NSIS_DISPLAY_NAME ${PROJECT_NAME}) | |
|
|
54 | SET(CPACK_NSIS_MUI_FINISHPAGE_RUN ${SCIQLOP_EXECUTABLE_NAME}) | |
|
|
55 | SET(CPACK_NSIS_MUI_ICON ${SCIQLOP_EXECUTABLE_ICON_LOCATION}) | |
|
|
56 | SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\${SCIQLOP_EXECUTABLE_NAME}.exe") | |
|
|
57 | endif (WIN32) | |
|
|
58 | ||
|
|
59 | INCLUDE(CPack) | |
| @@ -7,9 +7,11 | |||
|
|
7 | 7 | #SET(SCIQLOP_BUILD_TYPE "Release" CACHE STRING "Choose to compile in Debug or Release mode") |
|
|
8 | 8 | |
|
|
9 | 9 | IF(CMAKE_BUILD_TYPE MATCHES "Debug") |
|
|
10 | SET (CMAKE_BUILD_TYPE "Debug") | |
|
|
10 | 11 | SET (DEBUG_SUFFIX "d") |
|
|
11 | 12 | ELSE() |
|
|
12 | 13 | MESSAGE (STATUS "Build in Release") |
|
|
14 | SET (SCIQLOP_BUILD_TYPE "Release") | |
|
|
13 | 15 | SET (DEBUG_SUFFIX "") |
|
|
14 | 16 | ENDIF() |
|
|
15 | 17 | |
| @@ -44,30 +46,6 else() | |||
|
|
44 | 46 | set(libRootDirForceValue) |
|
|
45 | 47 | endif() |
|
|
46 | 48 | |
|
|
47 | # | |
|
|
48 | # Sciqlop_modules.cmake | |
|
|
49 | # | |
|
|
50 | # Set ouptut directories | |
|
|
51 | # | |
|
|
52 | IF (UNIX) | |
|
|
53 | # 32 or 64 bits compiler | |
|
|
54 | IF( CMAKE_SIZEOF_VOID_P EQUAL 8 ) | |
|
|
55 | SET(defaultLib "lib64/sciqlop") | |
|
|
56 | ELSE() | |
|
|
57 | SET(defaultLib "lib/sciqlop") | |
|
|
58 | ENDIF() | |
|
|
59 | SET (EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/bin) | |
|
|
60 | SET (CONFIG_OUTPUT_PATH $ENV{HOME}/.config/QtProject) | |
|
|
61 | SET (LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/${defaultLib}) | |
|
|
62 | ELSEIF(WIN32) | |
|
|
63 | SET (EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist) | |
|
|
64 | SET (LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist) | |
|
|
65 | SET (CONFIG_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/app/QtProject) | |
|
|
66 | ELSE() | |
|
|
67 | SET (EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist) | |
|
|
68 | SET (CONFIG_OUTPUT_PATH $ENV{HOME}/.config/QtProject) | |
|
|
69 | SET (LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist) | |
|
|
70 | ENDIF() | |
|
|
71 | 49 | |
|
|
72 | 50 | |
|
|
73 | 51 | # |
| @@ -78,51 +56,33 OPTION (BUILD_SHARED_LIBS "Build the shared libraries" ON) | |||
|
|
78 | 56 | # Generate position independant code (-fPIC) |
|
|
79 | 57 | SET(CMAKE_POSITION_INDEPENDENT_CODE TRUE) |
|
|
80 | 58 | |
|
|
81 | ||
|
|
82 | ||
|
|
83 | # Configuration for make install | |
|
|
84 | ||
|
|
85 | set(PROJECT_PLUGIN_PREFIX "SciQlop") | |
|
|
86 | ||
|
|
59 | # | |
|
|
60 | # Configure installation directories | |
|
|
61 | # | |
|
|
87 | 62 | IF (UNIX) |
|
|
88 | SET(CMAKE_INSTALL_PREFIX "/usr/local/${PROJECT_PLUGIN_PREFIX}") | |
|
|
89 | 63 | SET(defaultBin "bin") |
|
|
90 | 64 | SET(defaultInc "include/sciqlop") |
|
|
91 | 65 | |
|
|
92 | 66 | # 32 or 64 bits compiler |
|
|
93 | 67 | IF( CMAKE_SIZEOF_VOID_P EQUAL 8 ) |
|
|
94 | SET(defaultLib "lib64") | |
|
|
95 | SET(defaultPluginsLib "lib64/${PROJECT_PLUGIN_PREFIX}") | |
|
|
68 | SET(defaultLib "lib64/sciqlop") | |
|
|
96 | 69 | ELSE() |
|
|
97 | SET(defaultLib "lib/") | |
|
|
98 | SET(defaultPluginsLib "lib/${PROJECT_PLUGIN_PREFIX}") | |
|
|
70 | SET(defaultLib "lib/sciqlop") | |
|
|
99 | 71 | ENDIF() |
|
|
100 | 72 | |
|
|
101 |
SET(defaultDoc "share/docs/ |
|
|
|
73 | SET(defaultDoc "share/docs/sciqlop") | |
|
|
102 | 74 | ELSE() |
|
|
103 | 75 | SET(defaultBin "bin") |
|
|
104 |
SET(defaultInc "include/ |
|
|
|
105 | SET(defaultLib "lib") | |
|
|
106 | SET(defaultPluginsLib "lib/${PROJECT_PLUGIN_PREFIX}") | |
|
|
107 | SET(defaultDoc "docs/${PROJECT_PLUGIN_PREFIX}") | |
|
|
76 | SET(defaultInc "include/sciqlop") | |
|
|
77 | SET(defaultLib "lib/sciqlop") | |
|
|
78 | SET(defaultDoc "docs/sciqlop") | |
|
|
108 | 79 | ENDIF() |
|
|
109 | 80 | |
|
|
110 | 81 | SET(INSTALL_BINARY_DIR "${defaultBin}" CACHE STRING |
|
|
111 | 82 | "Installation directory for binaries") |
|
|
112 | 83 | SET(INSTALL_LIBRARY_DIR "${defaultLib}" CACHE STRING |
|
|
113 | 84 | "Installation directory for libraries") |
|
|
114 | SET(INSTALL_PLUGINS_LIBRARY_DIR "${defaultPluginsLib}" CACHE STRING | |
|
|
115 | "Installation directory for libraries") | |
|
|
116 | 85 | SET(INSTALL_INCLUDE_DIR "${defaultInc}" CACHE STRING |
|
|
117 | 86 | "Installation directory for headers") |
|
|
118 | 87 | SET(INSTALL_DOCUMENTATION_DIR "${defaultDoc}" CACHE STRING |
|
|
119 | 88 | "Installation directory for documentations") |
|
|
120 | ||
|
|
121 | ||
|
|
122 | # Set the rpath when installing | |
|
|
123 | SET(CMAKE_SKIP_BUILD_RPATH FALSE) | |
|
|
124 | SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) | |
|
|
125 | SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${INSTALL_LIBRARY_DIR}") | |
|
|
126 | SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) | |
|
|
127 | ||
|
|
128 | message("Install RPATH: ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIBRARY_DIR}") | |
| @@ -16,22 +16,15 CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/resources/Version.h.in" | |||
|
|
16 | 16 | "${INCLUDES_DIR}/Version.h") |
|
|
17 | 17 | CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/resources/Version.cpp.in" |
|
|
18 | 18 | "${SOURCES_DIR}/Version.cpp") |
|
|
19 | ||
|
|
20 | # Find dependent modules | |
|
|
21 | find_package(sciqlop-plugin) | |
|
|
22 | INCLUDE_DIRECTORIES(${SCIQLOP-PLUGIN_INCLUDE_DIR}) | |
|
|
23 | ||
|
|
19 | ||
|
|
24 | 20 | # |
|
|
25 | 21 | # Find Qt modules |
|
|
26 | 22 | # |
|
|
27 |
SCIQLOP_FIND_QT(Core |
|
|
|
23 | SCIQLOP_FIND_QT(Core) | |
|
|
28 | 24 | |
|
|
29 | 25 | # |
|
|
30 | 26 | # Compile the library library |
|
|
31 | 27 | # |
|
|
32 | ||
|
|
33 | ADD_DEFINITIONS(-DCORE_LIB) | |
|
|
34 | ||
|
|
35 | 28 | FILE (GLOB_RECURSE MODULE_SOURCES |
|
|
36 | 29 | ${INCLUDES_DIR}/*.h |
|
|
37 | 30 | ${SOURCES_DIR}/*.c |
| @@ -42,14 +35,8 ADD_LIBRARY(${SQPCORE_LIBRARY_NAME} ${MODULE_SOURCES}) | |||
|
|
42 | 35 | set_property(TARGET ${SQPCORE_LIBRARY_NAME} PROPERTY CXX_STANDARD 14) |
|
|
43 | 36 | set_property(TARGET ${SQPCORE_LIBRARY_NAME} PROPERTY CXX_STANDARD_REQUIRED ON) |
|
|
44 | 37 | TARGET_LINK_LIBRARIES(${SQPCORE_LIBRARY_NAME}) |
|
|
45 |
qt5_use_modules(${SQPCORE_LIBRARY_NAME} Core |
|
|
|
46 | ||
|
|
47 | INSTALL(TARGETS ${SQPCORE_LIBRARY_NAME} | |
|
|
48 | RUNTIME DESTINATION ${INSTALL_BINARY_DIR} | |
|
|
49 | LIBRARY DESTINATION ${INSTALL_LIBRARY_DIR} | |
|
|
50 | ARCHIVE DESTINATION ${INSTALL_LIBRARY_DIR} | |
|
|
51 | ) | |
|
|
52 | ||
|
|
38 | qt5_use_modules(${SQPCORE_LIBRARY_NAME} Core) | |
|
|
39 | ||
|
|
53 | 40 | # From cmake documentation: http://www.cmake.org/cmake/help/v3.0/manual/cmake-buildsystem.7.html |
|
|
54 | 41 | # Entries in the COMPILE_DEFINITIONS are prefixed with -D or /D and added to the compile line in an unspecified order. |
|
|
55 | 42 | # The DEFINE_SYMBOL target property is also added as a compile definition as a special convenience case for SHARED and MODULE library targets |
| @@ -82,9 +69,8 IF(BUILD_TESTS) | |||
|
|
82 | 69 | FILE (GLOB_RECURSE TESTS_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/Test*.h) |
|
|
83 | 70 | SET( TEST_LIBRARIES ${SQPCORE_LIBRARY_NAME}) |
|
|
84 | 71 | |
|
|
85 | SET(TARGETS_COV) | |
|
|
86 | 72 | FOREACH( testFile ${TESTS_SOURCES} ) |
|
|
87 |
|
|
|
|
73 | GET_FILENAME_COMPONENT( testDirectory ${testFile} DIRECTORY ) | |
|
|
88 | 74 | GET_FILENAME_COMPONENT( testName ${testFile} NAME_WE ) |
|
|
89 | 75 | |
|
|
90 | 76 | # Add to the list of sources files all the sources in the same |
| @@ -92,32 +78,18 IF(BUILD_TESTS) | |||
|
|
92 | 78 | FILE (GLOB currentTestSources |
|
|
93 | 79 | ${testDirectory}/*.c |
|
|
94 | 80 | ${testDirectory}/*.cpp |
|
|
95 |
|
|
|
|
96 |
|
|
|
|
97 |
|
|
|
|
81 | ${testDirectory}/*.h) | |
|
|
82 | LIST (REMOVE_ITEM currentTestSources ${TESTS_SOURCES}) | |
|
|
83 | LIST (REMOVE_ITEM currentTestSources ${TESTS_HEADERS}) | |
|
|
98 | 84 | |
|
|
99 |
|
|
|
|
100 | set_property(TARGET ${testName} PROPERTY CXX_STANDARD 14) | |
|
|
101 | set_property(TARGET ${testName} PROPERTY CXX_STANDARD_REQUIRED ON) | |
|
|
102 | TARGET_LINK_LIBRARIES( ${testName} ${TEST_LIBRARIES} ) | |
|
|
103 | qt5_use_modules(${testName} Test) | |
|
|
85 | ADD_EXECUTABLE(${testName} ${testFile} ${currentTestSources}) | |
|
|
86 | TARGET_LINK_LIBRARIES( ${testName} ${TEST_LIBRARIES} ) | |
|
|
87 | qt5_use_modules(${testName} Test) | |
|
|
104 | 88 | |
|
|
105 |
|
|
|
|
89 | ADD_TEST( NAME ${testName} COMMAND ${testName} ) | |
|
|
106 | 90 | |
|
|
107 | 91 | SCIQLOP_COPY_TO_TARGET(RUNTIME ${testName} ${EXTERN_SHARED_LIBRARIES}) |
|
|
108 | set(Coverage_NAME ${testName}) | |
|
|
109 | if(UNIX) | |
|
|
110 | SETUP_TARGET_FOR_COVERAGE(TARGET ${testName}_coverage OUTPUT ${testFile}-path NAME ${testFile} EXECUTABLE ${testName}) | |
|
|
111 | LIST( APPEND TARGETS_COV ${testName}_coverage) | |
|
|
112 | endif(UNIX) | |
|
|
113 | ||
|
|
114 | ENDFOREACH( testFile ) | |
|
|
115 | ||
|
|
116 | add_custom_target(coverage) | |
|
|
117 | ||
|
|
118 | FOREACH( target_cov ${TARGETS_COV} ) | |
|
|
119 | add_custom_command(TARGET coverage PRE_BUILD COMMAND make ${target_cov}) | |
|
|
120 | ENDFOREACH( target_cov ) | |
|
|
92 | ENDFOREACH( testFile ) | |
|
|
121 | 93 | |
|
|
122 | 94 | LIST(APPEND testFilesToFormat ${TESTS_SOURCES}) |
|
|
123 | 95 | LIST(APPEND testFilesToFormat ${TESTS_HEADERS}) |
| @@ -1,89 +1,34 | |||
|
|
1 | 1 | #ifndef SCIQLOP_DATASOURCECONTROLLER_H |
|
|
2 | 2 | #define SCIQLOP_DATASOURCECONTROLLER_H |
|
|
3 | 3 | |
|
|
4 |
#include " |
|
|
|
4 | #include "DataSourceController.h" | |
|
|
5 | 5 | |
|
|
6 | 6 | #include <QLoggingCategory> |
|
|
7 | 7 | #include <QObject> |
|
|
8 | #include <QUuid> | |
|
|
9 | 8 | |
|
|
10 | 9 | #include <Common/spimpl.h> |
|
|
11 | 10 | |
|
|
12 | 11 | Q_DECLARE_LOGGING_CATEGORY(LOG_DataSourceController) |
|
|
13 | 12 | |
|
|
14 | class DataSourceItem; | |
|
|
15 | class IDataProvider; | |
|
|
16 | ||
|
|
17 | 13 | /** |
|
|
18 |
* @brief The DataSourceController class aims to make the link between SciQlop |
|
|
|
19 | * is the intermediate class that SciQlop has to use in the way to connect a data source. Please | |
|
|
20 | * first use register method to initialize a plugin specified by its metadata name (JSON plugin | |
|
|
21 | * source) then others specifics method will be able to access it. You can load a data source driver | |
|
|
22 | * plugin then create a data source. | |
|
|
14 | * @brief The DataSourceController class aims to make the link between SciQlop | |
|
|
15 | * and its plugins. This is the intermediate class that SciQlop have to use | |
|
|
16 | * in the way to connect a data source. Please first use load method to intialize | |
|
|
17 | * a plugin specified by its metadata name (JSON plugin source) then others specifics | |
|
|
18 | * method will ba able to access it. | |
|
|
19 | * You can load a data source driver plugin then create a data source. | |
|
|
23 | 20 | */ |
|
|
24 |
class |
|
|
|
21 | class DataSourceController : public QObject { | |
|
|
25 | 22 | Q_OBJECT |
|
|
26 | 23 | public: |
|
|
27 | 24 | explicit DataSourceController(QObject *parent = 0); |
|
|
28 | 25 | virtual ~DataSourceController(); |
|
|
29 | 26 | |
|
|
30 | /** | |
|
|
31 | * Registers a data source. The method delivers a unique id that can be used afterwards to | |
|
|
32 | * access to the data source properties (structure, connection parameters, data provider, etc.) | |
|
|
33 | * @param dataSourceName the name of the data source | |
|
|
34 | * @return the unique id with which the data source has been registered | |
|
|
35 | */ | |
|
|
36 | QUuid registerDataSource(const QString &dataSourceName) noexcept; | |
|
|
37 | ||
|
|
38 | /** | |
|
|
39 | * Sets the structure of a data source. The controller takes ownership of the structure. | |
|
|
40 | * @param dataSourceUid the unique id with which the data source has been registered into the | |
|
|
41 | * controller. If it is invalid, the method has no effect. | |
|
|
42 | * @param dataSourceItem the structure of the data source. It must be not null to be registered | |
|
|
43 | * @sa registerDataSource() | |
|
|
44 | */ | |
|
|
45 | void setDataSourceItem(const QUuid &dataSourceUid, | |
|
|
46 | std::unique_ptr<DataSourceItem> dataSourceItem) noexcept; | |
|
|
47 | ||
|
|
48 | /** | |
|
|
49 | * Sets the data provider used to retrieve data from of a data source. The controller takes | |
|
|
50 | * ownership of the provider. | |
|
|
51 | * @param dataSourceUid the unique id with which the data source has been registered into the | |
|
|
52 | * controller. If it is invalid, the method has no effect. | |
|
|
53 | * @param dataProvider the provider of the data source | |
|
|
54 | * @sa registerDataSource() | |
|
|
55 | */ | |
|
|
56 | void setDataProvider(const QUuid &dataSourceUid, | |
|
|
57 | std::unique_ptr<IDataProvider> dataProvider) noexcept; | |
|
|
58 | ||
|
|
59 | /** | |
|
|
60 | * Loads an item (product) as a variable in SciQlop | |
|
|
61 | * @param dataSourceUid the unique id of the data source containing the item. It is used to get | |
|
|
62 | * the data provider associated to the data source, and pass it to for the variable creation | |
|
|
63 | * @param productItem the item to load | |
|
|
64 | */ | |
|
|
65 | void loadProductItem(const QUuid &dataSourceUid, const DataSourceItem &productItem) noexcept; | |
|
|
66 | ||
|
|
67 | 27 | public slots: |
|
|
68 | 28 | /// Manage init/end of the controller |
|
|
69 | 29 | void initialize(); |
|
|
70 | 30 | void finalize(); |
|
|
71 | 31 | |
|
|
72 | signals: | |
|
|
73 | /// Signal emitted when a structure has been set for a data source | |
|
|
74 | void dataSourceItemSet(DataSourceItem *dataSourceItem); | |
|
|
75 | ||
|
|
76 | /** | |
|
|
77 | * Signal emitted when a variable creation is asked for a product | |
|
|
78 | * @param variableName the name of the variable | |
|
|
79 | * @param variableMetadata the metadata of the variable | |
|
|
80 | * @param variableProvider the provider that will be used to retrieve the data of the variable | |
|
|
81 | * (can be null) | |
|
|
82 | */ | |
|
|
83 | void variableCreationRequested(const QString &variableName, | |
|
|
84 | const QVariantHash &variableMetadata, | |
|
|
85 | std::shared_ptr<IDataProvider> variableProvider); | |
|
|
86 | ||
|
|
87 | 32 | private: |
|
|
88 | 33 | void waitForFinish(); |
|
|
89 | 34 | |
| @@ -1,7 +1,4 | |||
|
|
1 | 1 | #include "DataSource/DataSourceController.h" |
|
|
2 | #include "DataSource/DataSourceItem.h" | |
|
|
3 | ||
|
|
4 | #include <Data/IDataProvider.h> | |
|
|
5 | 2 | |
|
|
6 | 3 | #include <QMutex> |
|
|
7 | 4 | #include <QThread> |
| @@ -11,125 +8,33 | |||
|
|
11 | 8 | |
|
|
12 | 9 | Q_LOGGING_CATEGORY(LOG_DataSourceController, "DataSourceController") |
|
|
13 | 10 | |
|
|
14 | namespace { | |
|
|
15 | ||
|
|
16 | /** | |
|
|
17 | * Builds the metadata of the variable that will be generated from the loading of an item | |
|
|
18 | * @param dataSourceItem the data source item from which to generate the metadata | |
|
|
19 | * @return the metadata of the variable | |
|
|
20 | */ | |
|
|
21 | QVariantHash variableMetadata(const DataSourceItem &dataSourceItem) | |
|
|
22 | { | |
|
|
23 | // Variable metadata contains... | |
|
|
24 | ||
|
|
25 | // ... all metadata of the item | |
|
|
26 | auto result = dataSourceItem.data(); | |
|
|
27 | ||
|
|
28 | // ... and the name of the plugin, recovered from root item | |
|
|
29 | result.insert(QStringLiteral("plugin"), dataSourceItem.rootItem().name()); | |
|
|
30 | ||
|
|
31 | return result; | |
|
|
32 | } | |
|
|
33 | ||
|
|
34 | } // namespace | |
|
|
35 | ||
|
|
36 | 11 | class DataSourceController::DataSourceControllerPrivate { |
|
|
37 | 12 | public: |
|
|
13 | DataSourceControllerPrivate() {} | |
|
|
14 | ||
|
|
38 | 15 | QMutex m_WorkingMutex; |
|
|
39 | /// Data sources registered | |
|
|
40 | QHash<QUuid, QString> m_DataSources; | |
|
|
41 | /// Data sources structures | |
|
|
42 | std::map<QUuid, std::unique_ptr<DataSourceItem> > m_DataSourceItems; | |
|
|
43 | /// Data providers registered | |
|
|
44 | /// @remarks Data providers are stored as shared_ptr as they can be sent to a variable and | |
|
|
45 | /// continue to live without necessarily the data source controller | |
|
|
46 | std::map<QUuid, std::shared_ptr<IDataProvider> > m_DataProviders; | |
|
|
47 | 16 | }; |
|
|
48 | 17 | |
|
|
49 | 18 | DataSourceController::DataSourceController(QObject *parent) |
|
|
50 | 19 | : impl{spimpl::make_unique_impl<DataSourceControllerPrivate>()} |
|
|
51 | 20 | { |
|
|
52 |
qCDebug(LOG_DataSourceController()) << tr("DataSourceController |
|
|
|
21 | qCDebug(LOG_DataSourceController()) << tr("Construction du DataSourceController") | |
|
|
53 | 22 | << QThread::currentThread(); |
|
|
54 | 23 | } |
|
|
55 | 24 | |
|
|
56 | 25 | DataSourceController::~DataSourceController() |
|
|
57 | 26 | { |
|
|
58 |
qCDebug(LOG_DataSourceController()) << tr("DataSourceController |
|
|
|
27 | qCDebug(LOG_DataSourceController()) << tr("Desctruction du DataSourceController") | |
|
|
59 | 28 | << QThread::currentThread(); |
|
|
60 | 29 | this->waitForFinish(); |
|
|
61 | 30 | } |
|
|
62 | 31 | |
|
|
63 | QUuid DataSourceController::registerDataSource(const QString &dataSourceName) noexcept | |
|
|
64 | { | |
|
|
65 | auto dataSourceUid = QUuid::createUuid(); | |
|
|
66 | impl->m_DataSources.insert(dataSourceUid, dataSourceName); | |
|
|
67 | ||
|
|
68 | return dataSourceUid; | |
|
|
69 | } | |
|
|
70 | ||
|
|
71 | void DataSourceController::setDataSourceItem( | |
|
|
72 | const QUuid &dataSourceUid, std::unique_ptr<DataSourceItem> dataSourceItem) noexcept | |
|
|
73 | { | |
|
|
74 | if (!dataSourceItem) { | |
|
|
75 | qCWarning(LOG_DataSourceController()) | |
|
|
76 | << tr("Data source item can't be registered (null item)"); | |
|
|
77 | return; | |
|
|
78 | } | |
|
|
79 | ||
|
|
80 | if (impl->m_DataSources.contains(dataSourceUid)) { | |
|
|
81 | // The data provider is implicitly converted to a shared_ptr | |
|
|
82 | impl->m_DataSourceItems.insert(std::make_pair(dataSourceUid, std::move(dataSourceItem))); | |
|
|
83 | ||
|
|
84 | // Retrieves the data source item to emit the signal with it | |
|
|
85 | auto it = impl->m_DataSourceItems.find(dataSourceUid); | |
|
|
86 | if (it != impl->m_DataSourceItems.end()) { | |
|
|
87 | emit dataSourceItemSet(it->second.get()); | |
|
|
88 | } | |
|
|
89 | } | |
|
|
90 | else { | |
|
|
91 | qCWarning(LOG_DataSourceController()) << tr("Can't set data source item for uid %1 : no " | |
|
|
92 | "data source has been registered with the uid") | |
|
|
93 | .arg(dataSourceUid.toString()); | |
|
|
94 | } | |
|
|
95 | } | |
|
|
96 | ||
|
|
97 | void DataSourceController::setDataProvider(const QUuid &dataSourceUid, | |
|
|
98 | std::unique_ptr<IDataProvider> dataProvider) noexcept | |
|
|
99 | { | |
|
|
100 | if (impl->m_DataSources.contains(dataSourceUid)) { | |
|
|
101 | impl->m_DataProviders.insert(std::make_pair(dataSourceUid, std::move(dataProvider))); | |
|
|
102 | } | |
|
|
103 | else { | |
|
|
104 | qCWarning(LOG_DataSourceController()) << tr("Can't set data provider for uid %1 : no data " | |
|
|
105 | "source has been registered with the uid") | |
|
|
106 | .arg(dataSourceUid.toString()); | |
|
|
107 | } | |
|
|
108 | } | |
|
|
109 | ||
|
|
110 | void DataSourceController::loadProductItem(const QUuid &dataSourceUid, | |
|
|
111 | const DataSourceItem &productItem) noexcept | |
|
|
112 | { | |
|
|
113 | if (productItem.type() == DataSourceItemType::PRODUCT | |
|
|
114 | || productItem.type() == DataSourceItemType::COMPONENT) { | |
|
|
115 | /// Retrieves the data provider of the data source (if any) | |
|
|
116 | auto it = impl->m_DataProviders.find(dataSourceUid); | |
|
|
117 | auto dataProvider = (it != impl->m_DataProviders.end()) ? it->second : nullptr; | |
|
|
118 | ||
|
|
119 | emit variableCreationRequested(productItem.name(), variableMetadata(productItem), | |
|
|
120 | dataProvider); | |
|
|
121 | } | |
|
|
122 | else { | |
|
|
123 | qCWarning(LOG_DataSourceController()) << tr("Can't load an item that is not a product"); | |
|
|
124 | } | |
|
|
125 | } | |
|
|
126 | ||
|
|
127 | 32 | void DataSourceController::initialize() |
|
|
128 | 33 | { |
|
|
129 |
qCDebug(LOG_DataSourceController()) << tr("DataSourceController |
|
|
|
34 | qCDebug(LOG_DataSourceController()) << tr("initialize du DataSourceController") | |
|
|
130 | 35 | << QThread::currentThread(); |
|
|
131 | 36 | impl->m_WorkingMutex.lock(); |
|
|
132 |
qCDebug(LOG_DataSourceController()) << tr("DataSourceController |
|
|
|
37 | qCDebug(LOG_DataSourceController()) << tr("initialize du DataSourceController END"); | |
|
|
133 | 38 | } |
|
|
134 | 39 | |
|
|
135 | 40 | void DataSourceController::finalize() |
| @@ -139,5 +44,5 void DataSourceController::finalize() | |||
|
|
139 | 44 | |
|
|
140 | 45 | void DataSourceController::waitForFinish() |
|
|
141 | 46 | { |
|
|
142 |
QMutexLocker locker |
|
|
|
47 | QMutexLocker locker(&impl->m_WorkingMutex); | |
|
|
143 | 48 | } |
| @@ -1,52 +1,3 | |||
|
|
1 | 1 | # On ignore toutes les règles vera++ pour le fichier spimpl |
|
|
2 | 2 | Common/spimpl\.h:\d+:.* |
|
|
3 | 3 | |
|
|
4 | # Ignore false positive relative to two class definitions in a same file | |
|
|
5 | ArrayData\.h:\d+:.*IPSIS_S01.* | |
|
|
6 | ArrayDataIterator\.h:\d+:.*IPSIS_S01.* | |
|
|
7 | DataSourceItem\.h:\d+:.*IPSIS_S01.* | |
|
|
8 | DataSeries\.h:\d+:.*IPSIS_S01.* | |
|
|
9 | DataSeriesIterator\.h:\d+:.*IPSIS_S01.* | |
|
|
10 | DataSeriesMergeHelper\.h:\d+:.*IPSIS_S01.* | |
|
|
11 | ||
|
|
12 | # Ignore false positive relative to a template class | |
|
|
13 | ArrayData\.h:\d+:.*IPSIS_S04_METHOD.*found: push_back | |
|
|
14 | ArrayData\.h:\d+:.*IPSIS_S04_VARIABLE.*found: (const_iterator) | |
|
|
15 | ArrayData\.h:\d+:.*IPSIS_S04_VARIABLE.*found: (D) | |
|
|
16 | ArrayData\.h:\d+:.*IPSIS_S04_VARIABLE.*found: (IC) | |
|
|
17 | ArrayData\.h:\d+:.*IPSIS_S04_NAMESPACE.*found: (arraydata_detail) | |
|
|
18 | ArrayData\.h:\d+:.*IPSIS_S06.*found: (D) | |
|
|
19 | ArrayData\.h:\d+:.*IPSIS_S06.*found: (Dim) | |
|
|
20 | ArrayData\.h:\d+:.*IPSIS_S06.*found: (IC) | |
|
|
21 | ArrayData\.h:\d+:.*IPSIS_S06.*found: (IsConst) | |
|
|
22 | DataSeries\.h:\d+:.*IPSIS_S04_METHOD.*found: LOG_DataSeries | |
|
|
23 | DataSeries\.h:\d+:.*IPSIS_S04_METHOD.*found: push_back | |
|
|
24 | DataSeries\.h:\d+:.*IPSIS_S04_VARIABLE.* | |
|
|
25 | DataSeries\.h:\d+:.*IPSIS_S04_NAMESPACE.*found: (dataseries_detail) | |
|
|
26 | DataSeries\.h:\d+:.*IPSIS_S05.* | |
|
|
27 | DataSeries\.h:\d+:.*IPSIS_S06.*found: (value_type) | |
|
|
28 | DataSeries\.h:\d+:.*IPSIS_S06.*found: (DataSeriesIteratorValue) | |
|
|
29 | DataSeries\.h:\d+:.*IPSIS_S06.*found: (Dim) | |
|
|
30 | DataSeries\.h:\d+:.*IPSIS_S06.*found: (IC) | |
|
|
31 | DataSeries\.h:\d+:.*IPSIS_S06.*found: (IsConst) | |
|
|
32 | ||
|
|
33 | # Ignore false positive relative to iterators | |
|
|
34 | SqpIterator\.h:\d+:.*IPSIS_S04_VARIABLE.*found: (random_access_iterator_tag) | |
|
|
35 | SqpIterator\.h:\d+:.*IPSIS_S04_VARIABLE.*found: (T) | |
|
|
36 | SqpIterator\.h:\d+:.*IPSIS_S04_VARIABLE.*found: (ptrdiff_t) | |
|
|
37 | SqpIterator\.h:\d+:.*IPSIS_S04_VARIABLE.*found: (value_type) | |
|
|
38 | SqpIterator\.h:\d+:.*IPSIS_S06.*found: (iterator_category) | |
|
|
39 | SqpIterator\.h:\d+:.*IPSIS_S06.*found: (random_access_iterator_tag) | |
|
|
40 | SqpIterator\.h:\d+:.*IPSIS_S06.*found: (value_type) | |
|
|
41 | SqpIterator\.h:\d+:.*IPSIS_S06.*found: (T) | |
|
|
42 | SqpIterator\.h:\d+:.*IPSIS_S06.*found: (difference_type) | |
|
|
43 | SqpIterator\.h:\d+:.*IPSIS_S06.*found: (ptrdiff_t) | |
|
|
44 | SqpIterator\.h:\d+:.*IPSIS_S06.*found: (pointer) | |
|
|
45 | SqpIterator\.h:\d+:.*IPSIS_S06.*found: (reference) | |
|
|
46 | SqpIterator\.h:\d+:.*IPSIS_S06.*found: (value_type) | |
|
|
47 | ||
|
|
48 | # Ignore false positive relative to an alias | |
|
|
49 | DataSourceItemAction\.h:\d+:.*IPSIS_S06.*found: (ExecuteFunction) | |
|
|
50 | ||
|
|
51 | # Ignore false positive relative to unnamed namespace | |
|
|
52 | VariableController\.cpp:\d+:.*IPSIS_F13.* | |
| @@ -63,7 +63,6 FUNCTION(ADD_CLANGFORMAT_TARGETS) | |||
|
|
63 | 63 | clangformat_incr(i) |
|
|
64 | 64 | ENDWHILE() |
|
|
65 | 65 | |
|
|
66 | ||
|
|
67 | 66 | # Retrieve source files to format |
|
|
68 | 67 | IF(recurse) |
|
|
69 | 68 | FILE(GLOB_RECURSE srcs ${globs}) |
| @@ -82,15 +81,6 FUNCTION(ADD_CLANGFORMAT_TARGETS) | |||
|
|
82 | 81 | # Create the directory where the touched files will be saved |
|
|
83 | 82 | SET(formatDirectory "${CMAKE_CURRENT_BINARY_DIR}/format") |
|
|
84 | 83 | FILE(MAKE_DIRECTORY ${formatDirectory}) |
|
|
85 | # STRING(REPLACE "*.ui" "" srcs ${srcs}) | |
|
|
86 | FOREACH(item ${globs}) | |
|
|
87 | STRING(REGEX MATCH ".*\.ui$" item ${item}) | |
|
|
88 | IF(item) | |
|
|
89 | LIST(APPEND UIS ${item}) | |
|
|
90 | ENDIF(item) | |
|
|
91 | ENDFOREACH(item ${globs}) | |
|
|
92 | ||
|
|
93 | LIST(REMOVE_ITEM srcs ${UIS}) | |
|
|
94 | 84 | FOREACH (s ${srcs}) |
|
|
95 | 85 | SET(touchedFile ${formatDirectory}/format_touchedfile_${reportNb}) |
|
|
96 | 86 | IF(addToAll) |
| @@ -2,18 +2,3 | |||
|
|
2 | 2 | |
|
|
3 | 3 | .*IPSIS_S04_METHOD.*found: Q_DECLARE_LOGGING_CATEGORY.* |
|
|
4 | 4 | .*IPSIS_S04_VARIABLE.*found: impl.* |
|
|
5 | ||
|
|
6 | # Ignore false positive relative to 'noexcept' keyword | |
|
|
7 | .*IPSIS_S04_VARIABLE.*found: noexcept | |
|
|
8 | .*IPSIS_S06.*found: noexcept | |
|
|
9 | ||
|
|
10 | # Ignore false positive relative to 'override' keyword | |
|
|
11 | .*IPSIS_S04_VARIABLE.*found: override | |
|
|
12 | .*IPSIS_S06.*found: override | |
|
|
13 | ||
|
|
14 | # Ignore false positive relative to 'final' keyword | |
|
|
15 | .*IPSIS_S04_VARIABLE.*found: final | |
|
|
16 | .*IPSIS_S06.*found: final | |
|
|
17 | ||
|
|
18 | # Ignore false positive relative to unnamed namespace | |
|
|
19 | .*IPSIS_F13.* | |
| @@ -17,7 +17,7 SET(SCIQLOP_CMAKE_GENERATION_WARNING "DON'T CHANGE THIS FILE. AUTOGENERATED BY C | |||
|
|
17 | 17 | # |
|
|
18 | 18 | # Find Qt modules |
|
|
19 | 19 | # |
|
|
20 |
SCIQLOP_FIND_QT(Core Widgets |
|
|
|
20 | SCIQLOP_FIND_QT(Core Widgets) | |
|
|
21 | 21 | |
|
|
22 | 22 | # |
|
|
23 | 23 | # Find dependent libraries |
| @@ -65,16 +65,7 set_property(TARGET ${SQPGUI_LIBRARY_NAME} PROPERTY CXX_STANDARD 14) | |||
|
|
65 | 65 | set_property(TARGET ${SQPGUI_LIBRARY_NAME} PROPERTY CXX_STANDARD_REQUIRED ON) |
|
|
66 | 66 | |
|
|
67 | 67 | TARGET_LINK_LIBRARIES(${SQPGUI_LIBRARY_NAME} ${LIBRARIES}) |
|
|
68 |
qt5_use_modules(${SQPGUI_LIBRARY_NAME} Core Widgets |
|
|
|
69 | ||
|
|
70 | ||
|
|
71 | INSTALL(TARGETS ${SQPGUI_LIBRARY_NAME} | |
|
|
72 | RUNTIME DESTINATION ${INSTALL_BINARY_DIR} | |
|
|
73 | LIBRARY DESTINATION ${INSTALL_LIBRARY_DIR} | |
|
|
74 | ARCHIVE DESTINATION ${INSTALL_LIBRARY_DIR} | |
|
|
75 | ) | |
|
|
76 | add_dependencies(${SQPGUI_LIBRARY_NAME} ${SQPCORE_LIBRARY_NAME}) | |
|
|
77 | ||
|
|
68 | qt5_use_modules(${SQPGUI_LIBRARY_NAME} Core Widgets) | |
|
|
78 | 69 | |
|
|
79 | 70 | # From cmake documentation: http://www.cmake.org/cmake/help/v3.0/manual/cmake-buildsystem.7.html |
|
|
80 | 71 | # Entries in the COMPILE_DEFINITIONS are prefixed with -D or /D and added to the compile line in an unspecified order. |
| @@ -96,7 +87,7 SCIQLOP_COPY_TO_TARGET(LIBRARY ${SQPGUI_LIBRARY_NAME}) | |||
|
|
96 | 87 | LIST(APPEND CHECKSTYLE_INPUT_FILES ${MODULE_SOURCES}) |
|
|
97 | 88 | SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_INPUT_FILES) |
|
|
98 | 89 | # Vera++ exclusion files |
|
|
99 |
LIST(APPEND CHECKSTYLE_EXCLUSION_FILES ${CMAKE_CURRENT_SOURCE_DIR}/ |
|
|
|
90 | #LIST(APPEND CHECKSTYLE_EXCLUSION_FILES ${CMAKE_CURRENT_SOURCE_DIR}/path/to/exclusionFiles.tcl) | |
|
|
100 | 91 | SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_EXCLUSION_FILES) |
|
|
101 | 92 | |
|
|
102 | 93 | # |
| @@ -119,11 +110,9 IF(BUILD_TESTS) | |||
|
|
119 | 110 | ${testDirectory}/*.cpp |
|
|
120 | 111 | ${testDirectory}/*.h) |
|
|
121 | 112 | LIST (REMOVE_ITEM currentTestSources ${TESTS_SOURCES}) |
|
|
122 |
|
|
|
|
113 | LIST (REMOVE_ITEM currentTestSources ${TESTS_HEADERS}) | |
|
|
123 | 114 | |
|
|
124 | 115 | ADD_EXECUTABLE(${testName} ${testFile} ${currentTestSources}) |
|
|
125 | set_property(TARGET ${testName} PROPERTY CXX_STANDARD 14) | |
|
|
126 | set_property(TARGET ${testName} PROPERTY CXX_STANDARD_REQUIRED ON) | |
|
|
127 | 116 | TARGET_LINK_LIBRARIES( ${testName} ${TEST_LIBRARIES} ) |
|
|
128 | 117 | qt5_use_modules(${testName} Test) |
|
|
129 | 118 | |
| @@ -10,23 +10,12 | |||
|
|
10 | 10 | |
|
|
11 | 11 | Q_DECLARE_LOGGING_CATEGORY(LOG_SqpApplication) |
|
|
12 | 12 | |
|
|
13 | #if defined(sqpApp) | |
|
|
14 | #undef sqpApp | |
|
|
15 | #endif | |
|
|
16 | #define sqpApp (static_cast<SqpApplication *>(QCoreApplication::instance())) | |
|
|
17 | ||
|
|
18 | class DataSourceController; | |
|
|
19 | class NetworkController; | |
|
|
20 | class TimeController; | |
|
|
21 | class VariableController; | |
|
|
22 | class VisualizationController; | |
|
|
23 | ||
|
|
24 | 13 | /** |
|
|
25 | 14 | * @brief The SqpApplication class aims to make the link between SciQlop |
|
|
26 |
* and its plugins. This is the intermediate class that SciQlop ha |
|
|
|
27 |
* in the way to connect a data source. Please first use load method to in |
|
|
|
15 | * and its plugins. This is the intermediate class that SciQlop have to use | |
|
|
16 | * in the way to connect a data source. Please first use load method to intialize | |
|
|
28 | 17 | * a plugin specified by its metadata name (JSON plugin source) then others specifics |
|
|
29 |
* method will b |
|
|
|
18 | * method will ba able to access it. | |
|
|
30 | 19 | * You can load a data source driver plugin then create a data source. |
|
|
31 | 20 | */ |
|
|
32 | 21 | |
| @@ -37,13 +26,6 public: | |||
|
|
37 | 26 | virtual ~SqpApplication(); |
|
|
38 | 27 | void initialize(); |
|
|
39 | 28 | |
|
|
40 | /// Accessors for the differents sciqlop controllers | |
|
|
41 | DataSourceController &dataSourceController() noexcept; | |
|
|
42 | NetworkController &networkController() noexcept; | |
|
|
43 | TimeController &timeController() noexcept; | |
|
|
44 | VariableController &variableController() noexcept; | |
|
|
45 | VisualizationController &visualizationController() noexcept; | |
|
|
46 | ||
|
|
47 | 29 | private: |
|
|
48 | 30 | class SqpApplicationPrivate; |
|
|
49 | 31 | spimpl::unique_impl_ptr<SqpApplicationPrivate> impl; |
| @@ -1,119 +1,39 | |||
|
|
1 | 1 | #include "SqpApplication.h" |
|
|
2 | 2 | |
|
|
3 | #include <Data/IDataProvider.h> | |
|
|
4 | 3 | #include <DataSource/DataSourceController.h> |
|
|
5 | #include <Network/NetworkController.h> | |
|
|
6 | 4 | #include <QThread> |
|
|
7 | #include <Time/TimeController.h> | |
|
|
8 | #include <Variable/Variable.h> | |
|
|
9 | #include <Variable/VariableController.h> | |
|
|
10 | #include <Visualization/VisualizationController.h> | |
|
|
11 | 5 | |
|
|
12 | 6 | Q_LOGGING_CATEGORY(LOG_SqpApplication, "SqpApplication") |
|
|
13 | 7 | |
|
|
14 | 8 | class SqpApplication::SqpApplicationPrivate { |
|
|
15 | 9 | public: |
|
|
16 | SqpApplicationPrivate() | |
|
|
17 | : m_DataSourceController{std::make_unique<DataSourceController>()}, | |
|
|
18 | m_NetworkController{std::make_unique<NetworkController>()}, | |
|
|
19 | m_TimeController{std::make_unique<TimeController>()}, | |
|
|
20 | m_VariableController{std::make_unique<VariableController>()}, | |
|
|
21 | m_VisualizationController{std::make_unique<VisualizationController>()} | |
|
|
22 | { | |
|
|
23 | // /////////////////////////////// // | |
|
|
24 | // Connections between controllers // | |
|
|
25 | // /////////////////////////////// // | |
|
|
26 | ||
|
|
27 | // VariableController <-> DataSourceController | |
|
|
28 | connect(m_DataSourceController.get(), | |
|
|
29 | SIGNAL(variableCreationRequested(const QString &, const QVariantHash &, | |
|
|
30 | std::shared_ptr<IDataProvider>)), | |
|
|
31 | m_VariableController.get(), | |
|
|
32 | SLOT(createVariable(const QString &, const QVariantHash &, | |
|
|
33 | std::shared_ptr<IDataProvider>))); | |
|
|
34 | ||
|
|
35 | // VariableController <-> VisualizationController | |
|
|
36 | connect(m_VariableController.get(), | |
|
|
37 | SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable>)), | |
|
|
38 | m_VisualizationController.get(), | |
|
|
39 | SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable>)), Qt::DirectConnection); | |
|
|
40 | ||
|
|
41 | connect(m_VariableController.get(), | |
|
|
42 | SIGNAL(rangeChanged(std::shared_ptr<Variable>, const SqpRange &)), | |
|
|
43 | m_VisualizationController.get(), | |
|
|
44 | SIGNAL(rangeChanged(std::shared_ptr<Variable>, const SqpRange &))); | |
|
|
45 | ||
|
|
46 | ||
|
|
47 | m_DataSourceController->moveToThread(&m_DataSourceControllerThread); | |
|
|
48 | m_DataSourceControllerThread.setObjectName("DataSourceControllerThread"); | |
|
|
49 | m_NetworkController->moveToThread(&m_NetworkControllerThread); | |
|
|
50 | m_NetworkControllerThread.setObjectName("NetworkControllerThread"); | |
|
|
51 | m_VariableController->moveToThread(&m_VariableControllerThread); | |
|
|
52 | m_VariableControllerThread.setObjectName("VariableControllerThread"); | |
|
|
53 | m_VisualizationController->moveToThread(&m_VisualizationControllerThread); | |
|
|
54 | m_VisualizationControllerThread.setObjectName("VsualizationControllerThread"); | |
|
|
55 | ||
|
|
56 | ||
|
|
57 | // Additionnal init | |
|
|
58 | m_VariableController->setTimeController(m_TimeController.get()); | |
|
|
59 | } | |
|
|
60 | ||
|
|
10 | SqpApplicationPrivate() {} | |
|
|
61 | 11 | virtual ~SqpApplicationPrivate() |
|
|
62 | 12 | { |
|
|
13 | qCInfo(LOG_SqpApplication()) << tr("Desctruction du SqpApplicationPrivate"); | |
|
|
63 | 14 | m_DataSourceControllerThread.quit(); |
|
|
64 | 15 | m_DataSourceControllerThread.wait(); |
|
|
65 | ||
|
|
66 | m_NetworkControllerThread.quit(); | |
|
|
67 | m_NetworkControllerThread.wait(); | |
|
|
68 | ||
|
|
69 | m_VariableControllerThread.quit(); | |
|
|
70 | m_VariableControllerThread.wait(); | |
|
|
71 | ||
|
|
72 | m_VisualizationControllerThread.quit(); | |
|
|
73 | m_VisualizationControllerThread.wait(); | |
|
|
74 | 16 | } |
|
|
75 | 17 | |
|
|
76 | 18 | std::unique_ptr<DataSourceController> m_DataSourceController; |
|
|
77 | std::unique_ptr<VariableController> m_VariableController; | |
|
|
78 | std::unique_ptr<TimeController> m_TimeController; | |
|
|
79 | std::unique_ptr<NetworkController> m_NetworkController; | |
|
|
80 | std::unique_ptr<VisualizationController> m_VisualizationController; | |
|
|
81 | 19 | QThread m_DataSourceControllerThread; |
|
|
82 | QThread m_NetworkControllerThread; | |
|
|
83 | QThread m_VariableControllerThread; | |
|
|
84 | QThread m_VisualizationControllerThread; | |
|
|
85 | 20 | }; |
|
|
86 | 21 | |
|
|
87 | 22 | |
|
|
88 | 23 | SqpApplication::SqpApplication(int &argc, char **argv) |
|
|
89 |
: QApplication |
|
|
|
24 | : QApplication(argc, argv), impl{spimpl::make_unique_impl<SqpApplicationPrivate>()} | |
|
|
90 | 25 | { |
|
|
91 |
qC |
|
|
|
26 | qCInfo(LOG_SqpApplication()) << tr("Construction du SqpApplication"); | |
|
|
27 | ||
|
|
28 | impl->m_DataSourceController = std::make_unique<DataSourceController>(); | |
|
|
29 | impl->m_DataSourceController->moveToThread(&impl->m_DataSourceControllerThread); | |
|
|
92 | 30 | |
|
|
93 | 31 | connect(&impl->m_DataSourceControllerThread, &QThread::started, |
|
|
94 | 32 | impl->m_DataSourceController.get(), &DataSourceController::initialize); |
|
|
95 | 33 | connect(&impl->m_DataSourceControllerThread, &QThread::finished, |
|
|
96 | 34 | impl->m_DataSourceController.get(), &DataSourceController::finalize); |
|
|
97 | 35 | |
|
|
98 | connect(&impl->m_NetworkControllerThread, &QThread::started, impl->m_NetworkController.get(), | |
|
|
99 | &NetworkController::initialize); | |
|
|
100 | connect(&impl->m_NetworkControllerThread, &QThread::finished, impl->m_NetworkController.get(), | |
|
|
101 | &NetworkController::finalize); | |
|
|
102 | ||
|
|
103 | connect(&impl->m_VariableControllerThread, &QThread::started, impl->m_VariableController.get(), | |
|
|
104 | &VariableController::initialize); | |
|
|
105 | connect(&impl->m_VariableControllerThread, &QThread::finished, impl->m_VariableController.get(), | |
|
|
106 | &VariableController::finalize); | |
|
|
107 | ||
|
|
108 | connect(&impl->m_VisualizationControllerThread, &QThread::started, | |
|
|
109 | impl->m_VisualizationController.get(), &VisualizationController::initialize); | |
|
|
110 | connect(&impl->m_VisualizationControllerThread, &QThread::finished, | |
|
|
111 | impl->m_VisualizationController.get(), &VisualizationController::finalize); | |
|
|
112 | ||
|
|
113 | 36 | impl->m_DataSourceControllerThread.start(); |
|
|
114 | impl->m_NetworkControllerThread.start(); | |
|
|
115 | impl->m_VariableControllerThread.start(); | |
|
|
116 | impl->m_VisualizationControllerThread.start(); | |
|
|
117 | 37 | } |
|
|
118 | 38 | |
|
|
119 | 39 | SqpApplication::~SqpApplication() |
| @@ -123,28 +43,3 SqpApplication::~SqpApplication() | |||
|
|
123 | 43 | void SqpApplication::initialize() |
|
|
124 | 44 | { |
|
|
125 | 45 | } |
|
|
126 | ||
|
|
127 | DataSourceController &SqpApplication::dataSourceController() noexcept | |
|
|
128 | { | |
|
|
129 | return *impl->m_DataSourceController; | |
|
|
130 | } | |
|
|
131 | ||
|
|
132 | NetworkController &SqpApplication::networkController() noexcept | |
|
|
133 | { | |
|
|
134 | return *impl->m_NetworkController; | |
|
|
135 | } | |
|
|
136 | ||
|
|
137 | TimeController &SqpApplication::timeController() noexcept | |
|
|
138 | { | |
|
|
139 | return *impl->m_TimeController; | |
|
|
140 | } | |
|
|
141 | ||
|
|
142 | VariableController &SqpApplication::variableController() noexcept | |
|
|
143 | { | |
|
|
144 | return *impl->m_VariableController; | |
|
|
145 | } | |
|
|
146 | ||
|
|
147 | VisualizationController &SqpApplication::visualizationController() noexcept | |
|
|
148 | { | |
|
|
149 | return *impl->m_VisualizationController; | |
|
|
150 | } | |
|
|
1 | NO CONTENT: file was removed | |
| This diff has been collapsed as it changes many lines, (674 lines changed) Show them Hide them | |||
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed, binary diff hidden |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed, binary diff hidden |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed | |
| This diff has been collapsed as it changes many lines, (842 lines changed) Show them Hide them | |||
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed | |
| This diff has been collapsed as it changes many lines, (636 lines changed) Show them Hide them | |||
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed | |
| This diff has been collapsed as it changes many lines, (7219 lines changed) Show them Hide them | |||
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed, binary diff hidden |
|
|
1 | NO CONTENT: file was removed, binary diff hidden |
|
|
1 | NO CONTENT: file was removed, binary diff hidden |
|
|
1 | NO CONTENT: file was removed, binary diff hidden |
|
|
1 | NO CONTENT: file was removed, binary diff hidden |
|
|
1 | NO CONTENT: file was removed, binary diff hidden |
|
|
1 | NO CONTENT: file was removed, binary diff hidden |
|
|
1 | NO CONTENT: file was removed, binary diff hidden |
|
|
1 | NO CONTENT: file was removed, binary diff hidden |
|
|
1 | NO CONTENT: file was removed, binary diff hidden |
|
|
1 | NO CONTENT: file was removed, binary diff hidden |
|
|
1 | NO CONTENT: file was removed, binary diff hidden |
|
|
1 | NO CONTENT: file was removed, binary diff hidden |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed | |
| This diff has been collapsed as it changes many lines, (31403 lines changed) Show them Hide them | |||
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed | |
| This diff has been collapsed as it changes many lines, (22288 lines changed) Show them Hide them | |||
|
|
1 | NO CONTENT: file was removed | |
| This diff has been collapsed as it changes many lines, (29129 lines changed) Show them Hide them | |||
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed | |
| This diff has been collapsed as it changes many lines, (10802 lines changed) Show them Hide them | |||
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed |
|
|
1 | NO CONTENT: file was removed | |
| This diff has been collapsed as it changes many lines, (360000 lines changed) Show them Hide them | |||
|
|
1 | NO CONTENT: file was removed |
General Comments 3