GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Pull Request !133

ver	Time	Author	Commit	Description
`latest`	Fri, 02 Jun 2017 09:05:59	perrinel	`r30:67c2ab4a2f13`	Remove unused cmake code
`latest`	Fri, 02 Jun 2017 09:05:42	perrinel	`r29:6d9ae743e935`	comment omp.h to ensure the compilation from the command line
`latest`	Fri, 02 Jun 2017 09:04:57	perrinel	`r28:fa79454f5abc`	Remove Qt_PATH variable from de clang analyzer launcher file since we assume using the QT native path.
3 commits hidden, click expand to show them.

0

LICENSE created 644 +1 0

	@@ -0,0 +1,1
				1	TODO

0

app/src/mainwindow.cpp created 644 +103 0

@@ -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_THREADSsizeof(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

app/src/mainwindow.ui created 644 +56 0

@@ -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>

0

.gitignore 0 -2

             build/
             CMakeLists.txt.user
             /.project
-            core/src/Version.cpp
-            core/include/Version.h

0

README.md +1 -31

@@ -1,31 +1,1
1	![](gui/resources/icones/sciqlop2PNG_1024.png){:.some-css-class style="width: 20%"}	1	TODO No newline at end of file
2
3
4	# Overview
5
6	SciQLOP (SCIentific Qt application for Learning from Observations of Plasmas) 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

0

SciQlopEnv.bat +1 -2

             @echo off
             echo Setting up environment for Qt usage...
             set QT_QMAKE_PATH=C:\Qt\5.8\mingw53_32\bin
             set QT_MINGW_PATH=C:\Qt\Tools\mingw530_32\bin
-            set NSIS_PATH=C:\Appli\NSIS
             set LLVM_PATH=C:\Appli\LLVM\bin
             set CMAKE_PATH=C:\Appli\CMake\bin
             set NINJA_PATH=C:\Appli\Ninja
             set PERL_SITE_PATH=C:\Perl64\site\bin
             set PERL_PATH=C:\Perl64\bin
             set PYTHON_PATH=C:\Appli\Python\Python36-32
             set SCAN_BUILD_PATH=C:\Dev\CNRS-DEV\cfe\tools\scan-build\bin
-            set PATH=%QT_QMAKE_PATH%;%QT_MINGW_PATH%;%PERL_SITE_PATH%;%PERL_PATH%;%PYTHON_PATH%;%NSIS_PATH%;%SCAN_BUILD_PATH%;%LLVM_PATH%;%CMAKE_PATH%;%NINJA_PATH%;%PATH%
+            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%
             cd /D C:\Dev\CNRS-DEV\SciQlopInit

0

app/CMakeLists.txt +14 -25

             ## sciqlop - CMakeLists.txt
             SET(EXECUTABLE_NAME "sciqlop")
-            SCIQLOP_SET_TO_PARENT_SCOPE(EXECUTABLE_NAME)
             SET(SOURCES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/)
-            SET(INCLUDES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include")
+            SET(INCLUDE_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/include)
-            SET(UI_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/ui)
+            SET(UI_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/src)
             SET(RES_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/resources)
-            # Include gui directory
-            include_directories("${INCLUDES_DIR}")
             #
             # Find Qt modules
             #
             SCIQLOP_FIND_QT(Core Widgets)
             #
             # Find dependent libraries
             # ========================
             find_package(sciqlop-gui)
             SET(LIBRARIES ${SCIQLOP-GUI_LIBRARIES})
             SET(EXTERN_SHARED_LIBRARIES)
             INCLUDE_DIRECTORIES(${SCIQLOP-GUI_INCLUDE_DIR})
             # Add sqpcore to the list of libraries to use
             list(APPEND LIBRARIES ${SQPCORE_LIBRARY_NAME})
             # Include core directory
             include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../core/include")
             # Add dependent shared libraries
             list(APPEND SHARED_LIBRARIES ${SQPCORE_SHARED_LIBRARIES})
             # Retrieve the location of the dynamic library to copy it to the output path
             #get_property(sqpcoreLocation TARGET ${SQPCORE_LIBRARY_NAME} PROPERTY LOCATION)
             list(APPEND SHARED_LIBRARIES_FROM_TARGETS ${sqpcoreLocation})
-            # Ui files
-            FILE (GLOB_RECURSE PROJECT_FORMS ${UI_FOLDER}/*.ui)
             #
             # Compile the application
             #
             FILE (GLOB_RECURSE APPLICATION_SOURCES
-                ${INCLUDES_DIR}/*.h
             	${SOURCES_DIR}/*.c
             	${SOURCES_DIR}/*.cpp
-                ${SOURCES_DIR}/*.h
+            	${SOURCES_DIR}/*.h)
-                ${PROJECT_FORMS})
+            # Headers files (.h)
+            FILE (GLOB_RECURSE PROJECT_HEADERS ${INCLUDE_FOLDER}/*.h)
+            # Ui files
+            FILE (GLOB_RECURSE PROJECT_FORMS ${UI_FOLDER}/*.ui)
+            # Resources files
+            FILE (GLOB_RECURSE PROJECT_RESOURCES ${RES_FOLDER}/*.qrc)
+            # Retrieve resources files
             FILE (GLOB_RECURSE APPLICATION_RESOURCES ${RES_FOLDER}/*.qrc)
             QT5_ADD_RESOURCES(RCC_HDRS ${APPLICATION_RESOURCES} )
             QT5_WRAP_UI(UIS_HDRS
              ${PROJECT_FORMS}
             )
             ADD_EXECUTABLE(${EXECUTABLE_NAME} ${APPLICATION_SOURCES} ${RCC_HDRS} ${UIS_HDRS})
             set_property(TARGET ${EXECUTABLE_NAME} PROPERTY CXX_STANDARD 14)
             set_property(TARGET ${EXECUTABLE_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
             target_link_libraries(${EXECUTABLE_NAME}
                 ${LIBRARIES})
-            INSTALL(TARGETS ${EXECUTABLE_NAME}
-              RUNTIME DESTINATION ${INSTALL_BINARY_DIR}
-              LIBRARY DESTINATION ${INSTALL_BINARY_DIR}
-              ARCHIVE DESTINATION ${INSTALL_BINARY_DIR}
             # Link with Qt5 modules
             qt5_use_modules(${EXECUTABLE_NAME} Core Widgets)
-            add_dependencies(${EXECUTABLE_NAME} ${SQPGUI_LIBRARY_NAME} ${SQPCORE_LIBRARY_NAME})
             # Add the files to the list of files to be analyzed
             LIST(APPEND CHECKSTYLE_INPUT_FILES ${APPLICATION_SOURCES})
             SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_INPUT_FILES)
             # Vera++ exclusion files
-            LIST(APPEND CHECKSTYLE_EXCLUSION_FILES ${CMAKE_CURRENT_SOURCE_DIR}/vera-exclusions/exclusions.txt)
+            #LIST(APPEND CHECKSTYLE_EXCLUSION_FILES ${CMAKE_CURRENT_SOURCE_DIR}/path/to/exclusionFiles.tcl)
             SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_EXCLUSION_FILES)
             #
             # Compile the tests
             #
             IF(BUILD_TESTS)
             	INCLUDE_DIRECTORIES(${SOURCES_DIR})
             	FILE (GLOB_RECURSE TESTS_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Test*.cpp)
             	FILE (GLOB_RECURSE TESTS_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/Test*.h)
                     SET( TEST_LIBRARIES ${LIBRARIES})
             	FOREACH( testFile ${TESTS_SOURCES} )
             		GET_FILENAME_COMPONENT( testDirectory ${testFile} DIRECTORY )
             		GET_FILENAME_COMPONENT( testName ${testFile} NAME_WE )
             		# Add to the list of sources files all the sources in the same
             		# directory that aren't another test
             		FILE (GLOB currentTestSources
             			${testDirectory}/*.c
             			${testDirectory}/*.cpp
             			${testDirectory}/*.h)
             		LIST (REMOVE_ITEM currentTestSources ${TESTS_SOURCES})
             		LIST (REMOVE_ITEM currentTestSources ${TESTS_HEADERS})
             		ADD_EXECUTABLE(${testName} ${testFile} ${currentTestSources})
             		TARGET_LINK_LIBRARIES( ${testName} ${TEST_LIBRARIES} )
             		qt5_use_modules(${testName} Test)
             		ADD_TEST( NAME ${testName} COMMAND ${testName} )
                             SCIQLOP_COPY_TO_TARGET(RUNTIME ${testName})
             	ENDFOREACH( testFile )
             	LIST(APPEND testFilesToFormat ${TESTS_SOURCES})
             	LIST(APPEND testFilesToFormat ${TESTS_HEADERS})
             	LIST(APPEND FORMATTING_INPUT_FILES ${testFilesToFormat})
                     SCIQLOP_SET_TO_PARENT_SCOPE(FORMATTING_INPUT_FILES)
             ENDIF(BUILD_TESTS)
             #
             # Set the files that must be formatted by clang-format.
             #
             LIST (APPEND FORMATTING_INPUT_FILES ${APPLICATION_SOURCES})
             SCIQLOP_SET_TO_PARENT_SCOPE(FORMATTING_INPUT_FILES)
             #
             # Set the directories that doxygen must browse to generate the
             # documentation.
             #
             # Source directories:
             LIST (APPEND DOXYGEN_INPUT_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/docs")
             LIST (APPEND DOXYGEN_INPUT_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/src")
             SCIQLOP_SET_TO_PARENT_SCOPE(DOXYGEN_INPUT_DIRS)
             # Source directories to exclude from the documentation generation
             #LIST (APPEND DOXYGEN_EXCLUDE_PATTERNS "${CMAKE_CURRENT_SOURCE_DIR}/path/to/subdir/*")
             SCIQLOP_SET_TO_PARENT_SCOPE(DOXYGEN_EXCLUDE_PATTERNS)
             #
             # Set the directories with the sources to analyze and propagate the
             # modification to the parent scope
             #
             # Source directories to analyze:
             LIST (APPEND ANALYSIS_INPUT_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/src")
             LIST (APPEND ANALYSIS_INPUT_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/tests")
             SCIQLOP_SET_TO_PARENT_SCOPE(ANALYSIS_INPUT_DIRS)
             # Source directories to exclude from the analysis
             #LIST (APPEND ANALYSIS_EXCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/path/to/subdir")
             SCIQLOP_SET_TO_PARENT_SCOPE(ANALYSIS_EXCLUDE_DIRS)

0

app/src/main.cpp ~~app/src/Main.cpp~~ renamed +3 -44

             /*------------------------------------------------------------------------------
             -- This file is a part of the QLop Software
             -- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
             --
             -- This program 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 2 of the License, or
             -- (at your option) any later version.
             --
             -- This program 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 this program; if not, write to the Free Software
             -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
             -------------------------------------------------------------------------------*/
             /*-- Author : Alexis Jeandet
             -- Mail : alexis.jeandet@member.fsf.org
             ----------------------------------------------------------------------------*/
-            #include "MainWindow.h"
+            #include "mainwindow.h"
             #include <QProcessEnvironment>
             #include <QThread>
             #include <SqpApplication.h>
             #include <qglobal.h>
-            #include <Plugin/PluginManager.h>
-            #include <QDir>
-            #include <QLoggingCategory>
-            Q_LOGGING_CATEGORY(LOG_Main, "Main")
-            namespace {
-            const auto PLUGIN_DIRECTORY_NAME = QStringLiteral("plugins");
-            } // namespace
             int main(int argc, char *argv[])
             {
-                SqpApplication a{argc, argv};
+                int ad;
+                SqpApplication a(argc, argv);
                 SqpApplication::setOrganizationName("LPP");
                 SqpApplication::setOrganizationDomain("lpp.fr");
                 SqpApplication::setApplicationName("SciQLop");
                 MainWindow w;
                 w.show();
-                // Loads plugins
-                auto pluginDir = QDir{a.applicationDirPath()};
-                auto pluginLookupPath = {
-                    a.applicationDirPath(),
-                    a.applicationDirPath() + "/" + PLUGIN_DIRECTORY_NAME,
-                    a.applicationDirPath() + "/../lib64/SciQlop",
-                    a.applicationDirPath() + "/../lib64/sciqlop",
-                    a.applicationDirPath() + "/../lib/SciQlop",
-                    a.applicationDirPath() + "/../lib/sciqlop",
-                    a.applicationDirPath() + "/../plugins",
-                };
-            #if _WIN32 || _WIN64
-                pluginDir.mkdir(PLUGIN_DIRECTORY_NAME);
-                pluginDir.cd(PLUGIN_DIRECTORY_NAME);
-            #endif
-                PluginManager pluginManager{};
-                for (auto &&path : pluginLookupPath) {
-                    QDir directory{path};
-                    if (directory.exists()) {
-                        qCDebug(LOG_Main())
-                            << QObject::tr("Plugin directory: %1").arg(directory.absolutePath());
-                        pluginManager.loadPlugins(directory);
                 return a.exec();
             }

0

app/src/mainwindow.h ~~app/include/MainWindow.h~~ renamed +14 -19

             /*------------------------------------------------------------------------------
-            -- This file is a part of the SciQLop Software
+            -- This file is a part of the QLop Software
-            -- Copyright (C) 2017, Plasma Physics Laboratory - CNRS
+            -- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
             --
             -- This program 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 2 of the License, or
             -- (at your option) any later version.
             --
             -- This program 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 this program; if not, write to the Free Software
             -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
             -------------------------------------------------------------------------------*/
             /*-- Author : Alexis Jeandet
             -- Mail : alexis.jeandet@member.fsf.org
             ----------------------------------------------------------------------------*/
-            #ifndef SCIQLOP_MAINWINDOW_H
+            #ifndef MAINWINDOW_H
-            #define SCIQLOP_MAINWINDOW_H
+            #define MAINWINDOW_H
             #include <QListWidgetItem>
-            #include <QLoggingCategory>
             #include <QMainWindow>
             #include <QProgressBar>
             #include <QProgressDialog>
             #include <QThread>
             #include <QVBoxLayout>
             #include <QWidget>
+            //#include "../Core/qlopservice.h"
+            //#include "../Core/qlopgui.h"
-            #include <Common/spimpl.h>
-            #include <memory>
-            Q_DECLARE_LOGGING_CATEGORY(LOG_MainWindow)
             namespace Ui {
             class MainWindow;
-            } // namespace Ui
             class MainWindow : public QMainWindow {
                 Q_OBJECT
             public:
                 explicit MainWindow(QWidget *parent = 0);
-                virtual ~MainWindow();
+                ~MainWindow();
             public slots:
             protected:
                 void changeEvent(QEvent *e);
             private:
-                std::unique_ptr<Ui::MainWindow> m_Ui;
+                Ui::MainWindow *ui;
-                //    QWidget *m_progressWidget;
+                QList<QProgressBar *> m_progress;
-                //    QVBoxLayout *m_progressLayout;
+                int *m_progressThreadIds;
+                QWidget *m_progressWidget;
+                QVBoxLayout *m_progressLayout;
                 // QList<QLopService*> m_qlopServices;
-                class MainWindowPrivate;
-                spimpl::unique_impl_ptr<MainWindowPrivate> impl;
             };
-            #endif // SCIQLOP_MAINWINDOW_H
+            #endif // MAINWINDOW_H

0

cmake/sciqlop.cmake +1 -1

             #
             # sciqlop.cmake
             #
             #
             # Update the CMAKE_MODULE_PATH to use custom FindXXX files
             #
             LIST( APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/CMakeModules/")
             # Include the sciqlop version file
             INCLUDE("cmake/sciqlop_version.cmake")
             # Include the sciqlop cmake macros
             INCLUDE("cmake/sciqlop_macros.cmake")
             #
             # Define the project parameters
             #
             INCLUDE("cmake/sciqlop_params.cmake")
             #
             # Configure the compiler
             #
-            #INCLUDE("cmake/compiler/compiler.cmake")
+            INCLUDE("cmake/compiler/compiler.cmake")
             #
             # Find all necessary dependencies
             #
             INCLUDE("cmake/find_libs.cmake")
             #
             # Compile all applications
             #
             INCLUDE("cmake/sciqlop_applications.cmake")
             #
             # Package creation using CPack
             #
             INCLUDE("cmake/sciqlop_package.cmake")

0

cmake/sciqlop_applications.cmake +15 -29

+            #
-            if(BUILD_TESTS)
+            # Sciqlop_modules.cmake
-                INCLUDE ("cmake/sciqlop_code_coverage.cmake")
-                APPEND_COVERAGE_COMPILER_FLAGS()
+            # Set ouptut directories
-            endif(BUILD_TESTS)
+            SET (EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/${CMAKE_BUILD_TYPE})
+            SET (LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/${CMAKE_BUILD_TYPE})
+            IF (UNIX)
+                SET (CONFIG_OUTPUT_PATH $ENV{HOME}/.config/QtProject)
+            ELSEIF(WIN32)
+                SET (CONFIG_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/${CMAKE_BUILD_TYPE}/app/QtProject)
+            ELSE()
+                SET (CONFIG_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/${CMAKE_BUILD_TYPE})
+            ENDIF()
             #
             # Compile the diffents modules
             #
-            set(sciqlop-plugin_DIR "${CMAKE_SOURCE_DIR}/plugin/cmake")
-            set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${sciqlop-plugin_DIR}")
-            ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/plugin")
             set(sciqlop-core_DIR "${CMAKE_SOURCE_DIR}/core/cmake")
             set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${sciqlop-core_DIR}")
             ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/core")
             set(sciqlop-gui_DIR "${CMAKE_SOURCE_DIR}/gui/cmake")
             set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${sciqlop-gui_DIR}")
             ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/gui")
             ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/app")
-            OPTION (BUILD_PLUGINS "Build the plugins" OFF)
-            IF(BUILD_PLUGINS)
-                set(sciqlop-mockplugin_DIR "${CMAKE_SOURCE_DIR}/plugins/mockplugin/cmake")
-                set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${sciqlop-mockplugin_DIR}")
-                ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/plugins/mockplugin")
-                set(sciqlop-amda_DIR "${CMAKE_SOURCE_DIR}/plugins/amda/cmake")
-                set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${sciqlop-amda_DIR}")
-                ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/plugins/amda")
-                # Temporary target to copy to plugins dir
-                find_package(sciqlop-mockplugin)
-                find_package(sciqlop-amda)
-                ADD_CUSTOM_TARGET(plugins
-                    COMMAND ${CMAKE_COMMAND} -E copy ${SCIQLOP-MOCKPLUGIN_LIBRARIES} "${LIBRARY_OUTPUT_PATH}/plugins/${SCIQLOP-MOCKPLUGIN_LIBRARIES_NAME}"
-                    COMMAND ${CMAKE_COMMAND} -E copy ${SCIQLOP-AMDA_LIBRARIES} "${LIBRARY_OUTPUT_PATH}/plugins/${SCIQLOP-AMDA_LIBRARIES_NAME}"
-            ENDIF(BUILD_PLUGINS)
             # LOGGER
             set(QTLOGGING_INI_FILE "${CMAKE_SOURCE_DIR}/config/QtProject/qtlogging.ini")
             FILE(COPY ${QTLOGGING_INI_FILE} DESTINATION ${CONFIG_OUTPUT_PATH})
             #
             # Code formatting
             #
             # Vera++ exclusion files
             LIST(APPEND CHECKSTYLE_EXCLUSION_FILES ${CMAKE_CURRENT_SOURCE_DIR}/formatting/vera-exclusions/exclusions.txt)
-            #SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_EXCLUSION_FILES)
+            SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_EXCLUSION_FILES)
             INCLUDE ("cmake/sciqlop_formatting.cmake")
             #
             # Documentation generation
             #
             INCLUDE ("cmake/sciqlop_doxygen.cmake")
             #
             # Source code analysis
             #
             INCLUDE ("cmake/sciqlop_code_analysis.cmake")
             INCLUDE ("cmake/sciqlop_code_cppcheck.cmake")

0

cmake/sciqlop_package.cmake 0 -59

	@@ -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)

0

cmake/sciqlop_params.cmake +11 -51

             #
             # sciqlop_params : Define compilation parameters
             #
             # Debug or release
             #
             # As the "NMake Makefiles" forces by default the CMAKE_BUILD_TYPE variable to Debug, SCIQLOP_BUILD_TYPE variable is used to be sure that the debug mode is a user choice
             #SET(SCIQLOP_BUILD_TYPE "Release" CACHE STRING "Choose to compile in Debug or Release mode")
             IF(CMAKE_BUILD_TYPE MATCHES "Debug")
+                SET (CMAKE_BUILD_TYPE "Debug")
                 SET (DEBUG_SUFFIX "d")
             ELSE()
                 MESSAGE (STATUS "Build in Release")
+                SET (SCIQLOP_BUILD_TYPE "Release")
                 SET (DEBUG_SUFFIX "")
             ENDIF()
             #
             # Need to compile tests?
             #
             OPTION (BUILD_TESTS "Build the tests" OFF)
             ENABLE_TESTING(${BUILD_TESTS})
             #
             # Path to the folder for sciqlop's extern libraries.
             #
             # When looking for an external library in sciqlop, we look to the following
             # folders:
             #   - The specific folder for the library (generally of the form <LIBRARY>_ROOT_DIR
             #   - The global Sciqlop extern folder
             #   - The system folders.
             #
             # If a dependency is found in the global extern folder or a specific folder for
             # the library, then it is installed with the sciqlop libraries. If it is found
             # in the system folders, it is not. This behavior can be overriden with the
             # <LIBRARY>_COPY_SHARED_LIBRARIES flag.
             #
             set(SCIQLOP_EXTERN_FOLDER "${CMAKE_CURRENT_SOURCE_DIR}/extern"
                 CACHE PATH "Path to the folder for sciqlop's extern libraries")
             option(SCIQLOP_FORCE_UPDATE_EXT_ROOT_DIR "Force the <LIBRARY>_ROOT_DIR to be updated to the global sciqlop extern folder"
                 OFF)
             if (SCIQLOP_FORCE_UPDATE_EXT_ROOT_DIR)
                 set(libRootDirForceValue FORCE)
             else()
                 set(libRootDirForceValue)
             endif()
-            # Sciqlop_modules.cmake
-            # Set ouptut directories
-            IF (UNIX)
-                # 32 or 64 bits compiler
-                IF( CMAKE_SIZEOF_VOID_P EQUAL 8 )
-                    SET(defaultLib "lib64/sciqlop")
-                ELSE()
-                    SET(defaultLib "lib/sciqlop")
-                ENDIF()
-                SET (EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/bin)
-                SET (CONFIG_OUTPUT_PATH $ENV{HOME}/.config/QtProject)
-                SET (LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/${defaultLib})
-            ELSEIF(WIN32)
-                SET (EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist)
-                SET (LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist)
-                SET (CONFIG_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/app/QtProject)
-            ELSE()
-                SET (EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist)
-                SET (CONFIG_OUTPUT_PATH $ENV{HOME}/.config/QtProject)
-                SET (LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist)
-            ENDIF()
             #
             # Static or shared libraries
             #
             OPTION (BUILD_SHARED_LIBS "Build the shared libraries" ON)
             # Generate position independant code (-fPIC)
             SET(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
+            #
+            # Configure installation directories
-            # Configuration for make install
-            set(PROJECT_PLUGIN_PREFIX "SciQlop")
             IF (UNIX)
-                SET(CMAKE_INSTALL_PREFIX "/usr/local/${PROJECT_PLUGIN_PREFIX}")
                 SET(defaultBin "bin")
                 SET(defaultInc "include/sciqlop")
                 # 32 or 64 bits compiler
                 IF( CMAKE_SIZEOF_VOID_P EQUAL 8 )
-                    SET(defaultLib "lib64")
+                    SET(defaultLib "lib64/sciqlop")
-                    SET(defaultPluginsLib "lib64/${PROJECT_PLUGIN_PREFIX}")
                 ELSE()
-                    SET(defaultLib "lib/")
+                    SET(defaultLib "lib/sciqlop")
-                    SET(defaultPluginsLib "lib/${PROJECT_PLUGIN_PREFIX}")
                 ENDIF()
-                SET(defaultDoc "share/docs/${PROJECT_PLUGIN_PREFIX}")
+                SET(defaultDoc "share/docs/sciqlop")
             ELSE()
                 SET(defaultBin "bin")
-                SET(defaultInc "include/${PROJECT_PLUGIN_PREFIX}")
+                SET(defaultInc "include/sciqlop")
-                SET(defaultLib "lib")
+                SET(defaultLib "lib/sciqlop")
-                SET(defaultPluginsLib "lib/${PROJECT_PLUGIN_PREFIX}")
+                SET(defaultDoc "docs/sciqlop")
-                SET(defaultDoc "docs/${PROJECT_PLUGIN_PREFIX}")
             ENDIF()
             SET(INSTALL_BINARY_DIR "${defaultBin}" CACHE STRING
                 "Installation directory for binaries")
             SET(INSTALL_LIBRARY_DIR "${defaultLib}" CACHE STRING
                 "Installation directory for libraries")
-            SET(INSTALL_PLUGINS_LIBRARY_DIR "${defaultPluginsLib}" CACHE STRING
-                "Installation directory for libraries")
             SET(INSTALL_INCLUDE_DIR "${defaultInc}" CACHE STRING
                 "Installation directory for headers")
             SET(INSTALL_DOCUMENTATION_DIR "${defaultDoc}" CACHE STRING
                 "Installation directory for documentations")
-            # Set the rpath when installing
-            SET(CMAKE_SKIP_BUILD_RPATH FALSE)
-            SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-            SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${INSTALL_LIBRARY_DIR}")
-            SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-            message("Install RPATH: ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIBRARY_DIR}")

0

core/CMakeLists.txt +3 -31

             ## core - CMakeLists.txt
             STRING(TOLOWER ${CMAKE_PROJECT_NAME} LIBRARY_PREFFIX)
             SET(SQPCORE_LIBRARY_NAME "${LIBRARY_PREFFIX}_core${DEBUG_SUFFIX}")
             SET(SOURCES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/")
             SET(INCLUDES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include/")
             # Include core directory
             include_directories("${INCLUDES_DIR}")
             # Set a variable to display a warning in the version files.
             SET(SCIQLOP_CMAKE_GENERATION_WARNING "DON'T CHANGE THIS FILE. AUTOGENERATED BY CMAKE.")
             # Generate the version file from the cmake version variables. The version
             # variables are defined in the cmake/sciqlop_version.cmake file.
             CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/resources/Version.h.in"
                     "${INCLUDES_DIR}/Version.h")
             CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/resources/Version.cpp.in"
             	"${SOURCES_DIR}/Version.cpp")
-            # Find dependent modules
-            find_package(sciqlop-plugin)
-            INCLUDE_DIRECTORIES(${SCIQLOP-PLUGIN_INCLUDE_DIR})
             #
             # Find Qt modules
             #
-            SCIQLOP_FIND_QT(Core Network)
+            SCIQLOP_FIND_QT(Core)
             #
             # Compile the library library
             #
-            ADD_DEFINITIONS(-DCORE_LIB)
             FILE (GLOB_RECURSE MODULE_SOURCES
                     ${INCLUDES_DIR}/*.h
                     ${SOURCES_DIR}/*.c
                     ${SOURCES_DIR}/*.cpp
             	${SOURCES_DIR}/*.h)
             ADD_LIBRARY(${SQPCORE_LIBRARY_NAME} ${MODULE_SOURCES})
             set_property(TARGET ${SQPCORE_LIBRARY_NAME} PROPERTY CXX_STANDARD 14)
             set_property(TARGET ${SQPCORE_LIBRARY_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
             TARGET_LINK_LIBRARIES(${SQPCORE_LIBRARY_NAME})
-            qt5_use_modules(${SQPCORE_LIBRARY_NAME} Core Network)
+            qt5_use_modules(${SQPCORE_LIBRARY_NAME} Core)
-            INSTALL(TARGETS ${SQPCORE_LIBRARY_NAME}
-              RUNTIME DESTINATION ${INSTALL_BINARY_DIR}
-              LIBRARY DESTINATION ${INSTALL_LIBRARY_DIR}
-              ARCHIVE DESTINATION ${INSTALL_LIBRARY_DIR}
             # From cmake documentation: http://www.cmake.org/cmake/help/v3.0/manual/cmake-buildsystem.7.html
             # Entries in the COMPILE_DEFINITIONS are prefixed with -D or /D and added to the compile line in an unspecified order.
             # The DEFINE_SYMBOL target property is also added as a compile definition as a special convenience case for SHARED and MODULE library targets
             IF(BUILD_SHARED_LIBS)
                     SET_TARGET_PROPERTIES(${SQPCORE_LIBRARY_NAME} PROPERTIES COMPILE_DEFINITIONS "SCIQLOP_EXPORT")
             ELSE()
                     TARGET_COMPILE_DEFINITIONS(${SQPCORE_LIBRARY_NAME} PUBLIC "SCIQLOP_STATIC_LIBRARIES")
             ENDIF()
             # Set the variable to parent scope so that the other projects can copy the
             # dependent shared libraries
             SCIQLOP_SET_TO_PARENT_SCOPE(SQPCORE_LIBRARY_NAME)
             # Copy extern shared libraries to the lib folder
             SCIQLOP_COPY_TO_TARGET(LIBRARY ${SQPCORE_LIBRARY_NAME} ${EXTERN_SHARED_LIBRARIES})
             # Add the files to the list of files to be analyzed
             LIST(APPEND CHECKSTYLE_INPUT_FILES ${MODULE_SOURCES})
             SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_INPUT_FILES)
             # Vera++ exclusion files
             LIST(APPEND CHECKSTYLE_EXCLUSION_FILES ${CMAKE_CURRENT_SOURCE_DIR}/vera-exclusions/exclusions.txt)
             SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_EXCLUSION_FILES)
             #
             # Compile the tests
             #
             IF(BUILD_TESTS)
             	INCLUDE_DIRECTORIES(${SOURCES_DIR})
             	FILE (GLOB_RECURSE TESTS_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Test*.cpp)
             	FILE (GLOB_RECURSE TESTS_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/Test*.h)
                     SET( TEST_LIBRARIES ${SQPCORE_LIBRARY_NAME})
-                    SET(TARGETS_COV)
             	FOREACH( testFile ${TESTS_SOURCES} )
             		GET_FILENAME_COMPONENT( testDirectory ${testFile} DIRECTORY )
             		GET_FILENAME_COMPONENT( testName ${testFile} NAME_WE )
             		# Add to the list of sources files all the sources in the same
             		# directory that aren't another test
             		FILE (GLOB currentTestSources
             			${testDirectory}/*.c
             			${testDirectory}/*.cpp
             			${testDirectory}/*.h)
             		LIST (REMOVE_ITEM currentTestSources ${TESTS_SOURCES})
-                            # LIST (REMOVE_ITEM currentTestSources ${TESTS_HEADERS})
+            		LIST (REMOVE_ITEM currentTestSources ${TESTS_HEADERS})
             		ADD_EXECUTABLE(${testName} ${testFile} ${currentTestSources})
-                            set_property(TARGET ${testName} PROPERTY CXX_STANDARD 14)
-                            set_property(TARGET ${testName} PROPERTY CXX_STANDARD_REQUIRED ON)
             		TARGET_LINK_LIBRARIES( ${testName} ${TEST_LIBRARIES} )
             		qt5_use_modules(${testName} Test)
             		ADD_TEST( NAME ${testName} COMMAND ${testName} )
                             SCIQLOP_COPY_TO_TARGET(RUNTIME ${testName} ${EXTERN_SHARED_LIBRARIES})
-                            set(Coverage_NAME ${testName})
-                            if(UNIX)
-                                SETUP_TARGET_FOR_COVERAGE(TARGET ${testName}_coverage OUTPUT ${testFile}-path NAME ${testFile} EXECUTABLE ${testName})
-                                LIST( APPEND TARGETS_COV ${testName}_coverage)
-                            endif(UNIX)
             	ENDFOREACH( testFile )
-                    add_custom_target(coverage)
-                    FOREACH( target_cov ${TARGETS_COV} )
-                        add_custom_command(TARGET coverage PRE_BUILD COMMAND make ${target_cov})
-                    ENDFOREACH( target_cov )
             	LIST(APPEND testFilesToFormat ${TESTS_SOURCES})
             	LIST(APPEND testFilesToFormat ${TESTS_HEADERS})
             	LIST(APPEND FORMATTING_INPUT_FILES ${testFilesToFormat})
                     SCIQLOP_SET_TO_PARENT_SCOPE(FORMATTING_INPUT_FILES)
             ENDIF(BUILD_TESTS)
             #
             # Set the files that must be formatted by clang-format.
             #
             LIST (APPEND FORMATTING_INPUT_FILES ${MODULE_SOURCES})
             SCIQLOP_SET_TO_PARENT_SCOPE(FORMATTING_INPUT_FILES)
             #
             # Set the directories that doxygen must browse to generate the
             # documentation.
             #
             # Source directories:
             LIST (APPEND DOXYGEN_INPUT_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/docs")
             LIST (APPEND DOXYGEN_INPUT_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/src")
             SCIQLOP_SET_TO_PARENT_SCOPE(DOXYGEN_INPUT_DIRS)
             # Source directories to exclude from the documentation generation
             #LIST (APPEND DOXYGEN_EXCLUDE_PATTERNS "${CMAKE_CURRENT_SOURCE_DIR}/path/to/subdir/*")
             SCIQLOP_SET_TO_PARENT_SCOPE(DOXYGEN_EXCLUDE_PATTERNS)
             #
             # Set the directories with the sources to analyze and propagate the
             # modification to the parent scope
             #
             # Source directories to analyze:
             LIST (APPEND ANALYSIS_INPUT_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/src")
             LIST (APPEND ANALYSIS_INPUT_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/tests")
             SCIQLOP_SET_TO_PARENT_SCOPE(ANALYSIS_INPUT_DIRS)
             # Source directories to exclude from the analysis
             #LIST (APPEND ANALYSIS_EXCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/path/to/subdir")
             SCIQLOP_SET_TO_PARENT_SCOPE(ANALYSIS_EXCLUDE_DIRS)

0

core/include/DataSource/DataSourceController.h +8 -63

@@ -1,94 +1,39
1	#ifndef SCIQLOP_DATASOURCECONTROLLER_H	1	#ifndef SCIQLOP_DATASOURCECONTROLLER_H
2	#define SCIQLOP_DATASOURCECONTROLLER_H	2	#define SCIQLOP_DATASOURCECONTROLLER_H
3		3
4	#include "~~CoreGlobal~~.h"	4	#include "DataSourceController.h"
5		5
6	#include <QLoggingCategory>	6	#include <QLoggingCategory>
7	#include <QObject>	7	#include <QObject>
8	#include <QUuid>
9		8
10	#include <Common/spimpl.h>	9	#include <Common/spimpl.h>
11		10
12	Q_DECLARE_LOGGING_CATEGORY(LOG_DataSourceController)	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 ~~and its plugins. This~~	14	* @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	15	* and its plugins. This is the intermediate class that SciQlop have to use
20	* first use register method to initialize a plugin specified by its metadata name (JSON plugin	16	* in the way to connect a data source. Please first use load method to intialize
21	* source) then others specifics method will be able to access it. You can load a data source driver	17	* a plugin specified by its metadata name (JSON plugin source) then others specifics
22	* plugin then create a data source.	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 ~~SCIQLOP_CORE_EXPORT~~ DataSourceController : public QObject {	21	class DataSourceController : public QObject {
25	Q_OBJECT	22	Q_OBJECT
26	public:	23	public:
27	explicit DataSourceController(QObject *parent = 0);	24	explicit DataSourceController(QObject *parent = 0);
28	virtual ~DataSourceController();	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	public slots:	27	public slots:
68	/// Manage init/end of the controller	28	/// Manage init/end of the controller
69	void initialize();	29	void initialize();
70	void finalize();	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	private:	32	private:
88	void waitForFinish();	33	void waitForFinish();
89		34
90	class DataSourceControllerPrivate;	35	class DataSourceControllerPrivate;
91	spimpl::unique_impl_ptr<DataSourceControllerPrivate> impl;	36	spimpl::unique_impl_ptr<DataSourceControllerPrivate> impl;
92	};	37	};
93		38
94	#endif // SCIQLOP_DATASOURCECONTROLLER_H	39	#endif // SCIQLOP_DATASOURCECONTROLLER_H

0

core/src/DataSource/DataSourceController.cpp +7 -102

@@ -1,143 +1,48
1	#include "DataSource/DataSourceController.h"	1	#include "DataSource/DataSourceController.h"
2	#include "DataSource/DataSourceItem.h"
3
4	#include <Data/IDataProvider.h>
5		2
6	#include <QMutex>	3	#include <QMutex>
7	#include <QThread>	4	#include <QThread>
8		5
9	#include <QDir>	6	#include <QDir>
10	#include <QStandardPaths>	7	#include <QStandardPaths>
11		8
12	Q_LOGGING_CATEGORY(LOG_DataSourceController, "DataSourceController")	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	class DataSourceController::DataSourceControllerPrivate {	11	class DataSourceController::DataSourceControllerPrivate {
37	public:	12	public:
		13	DataSourceControllerPrivate() {}
		14
38	QMutex m_WorkingMutex;	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	DataSourceController::DataSourceController(QObject *parent)	18	DataSourceController::DataSourceController(QObject *parent)
50	: impl{spimpl::make_unique_impl<DataSourceControllerPrivate>()}	19	: impl{spimpl::make_unique_impl<DataSourceControllerPrivate>()}
51	{	20	{
52	qCDebug(LOG_DataSourceController()) << tr("DataSourceController ~~construction~~")	21	qCDebug(LOG_DataSourceController()) << tr("Construction du DataSourceController")
53	<< QThread::currentThread();	22	<< QThread::currentThread();
54	}	23	}
55		24
56	DataSourceController::~DataSourceController()	25	DataSourceController::~DataSourceController()
57	{	26	{
58	qCDebug(LOG_DataSourceController()) << tr("DataSourceController ~~destruction~~")	27	qCDebug(LOG_DataSourceController()) << tr("Desctruction du DataSourceController")
59	<< QThread::currentThread();	28	<< QThread::currentThread();
60	this->waitForFinish();	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	void DataSourceController::initialize()	32	void DataSourceController::initialize()
128	{	33	{
129	qCDebug(LOG_DataSourceController()) << tr("DataSourceController ~~init~~")	34	qCDebug(LOG_DataSourceController()) << tr("initialize du DataSourceController")
130	<< QThread::currentThread();	35	<< QThread::currentThread();
131	impl->m_WorkingMutex.lock();	36	impl->m_WorkingMutex.lock();
132	qCDebug(LOG_DataSourceController()) << tr("DataSourceController ~~init~~ END");	37	qCDebug(LOG_DataSourceController()) << tr("initialize du DataSourceController END");
133	}	38	}
134		39
135	void DataSourceController::finalize()	40	void DataSourceController::finalize()
136	{	41	{
137	impl->m_WorkingMutex.unlock();	42	impl->m_WorkingMutex.unlock();
138	}	43	}
139		44
140	void DataSourceController::waitForFinish()	45	void DataSourceController::waitForFinish()
141	{	46	{
142	QMutexLocker locker{&impl->m_WorkingMutex};	47	QMutexLocker locker(&impl->m_WorkingMutex);
143	}	48	}

0

core/vera-exclusions/exclusions.txt 0 -49

@@ -1,52 +1,3
1	# On ignore toutes les règles vera++ pour le fichier spimpl	1	# On ignore toutes les règles vera++ pour le fichier spimpl
2	Common/spimpl\.h:\d+:.*	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.

0

formatting/cmake/use_clangformat.cmake 0 -10

             #
             # use_clangformat.cmake
             #
             # The following functions are defined in this document:
             #
             # ADD_CLANGFORMAT_TARGETS(<globExpression> ...
             #   [ADD_TO_ALL]
             #   [NAME <name>]
             #   [NAME_ALL <nameall>]
             #   [STYLE style]
             #   [RECURSE])
             #
             # Two custom targets will be created:
             # * format_reports is run as part of the build, and is not rerun unless one of
             # the file formatted is modified (only created if ADD_TO_ALL is provided);
             # * format must be explicitely called (make format) and is rerun even if the
             # files to format have not been modified. To achieve this behavior, the commands
             # used in this target pretend to produce a file without actually producing it.
             # Because the output file is not there after the run, the command will be rerun
             # again at the next target build.
             #
             # If ADD_TO_ALL is provided then a target will be added to the default build
             # targets so that each time a source file is compiled, it is formatted with
             # clang-format.
             #
             # NAME and NAME_ALL customize the name of the targets (format and format_reports
             # by default respectively).
             #
             # STYLE sets the style used by clang-format (default to "file").
             #
             # RECURSE selects if the glob expressions should be applied recursively or not.
             FUNCTION(ADD_CLANGFORMAT_TARGETS)
                 # Default values
                 SET(target "format")
                 SET(target_all "format_all")
                 SET(style "file")
                 SET(recurse OFF)
                 SET(addToAll OFF)
                 SET(globs)
                 # Parse the options
                 MATH(EXPR lastIdx "${ARGC} - 1")
                 SET(i 0)
                 WHILE(i LESS ${ARGC})
                     SET(arg "${ARGV${i}}")
                     IF("${arg}" STREQUAL "ADD_TO_ALL")
                         SET(addToAll ON)
                     ELSEIF("${arg}" STREQUAL "NAME")
                         clangformat_incr(i)
                         SET(target "${ARGV${i}}")
                     ELSEIF("${arg}" STREQUAL "NAME_ALL")
                         clangformat_incr(i)
                         SET(target_all "${ARGV${i}}")
                     ELSEIF("${arg}" STREQUAL "STYLE")
                         clangformat_incr(i)
                         SET(style "${ARGV${i}}")
                     ELSEIF("${arg}" STREQUAL "RECURSE")
                         SET(recurse ON)
                     ELSE()
                         LIST(APPEND globs ${arg})
                     ENDIF()
                     clangformat_incr(i)
                 ENDWHILE()
                 # Retrieve source files to format
                 IF(recurse)
                     FILE(GLOB_RECURSE srcs ${globs})
                 ELSE()
                     FILE(GLOB srcs ${globs})
                 ENDIF()
                 IF(NOT CLANGFORMAT_EXECUTABLE)
                     MESSAGE(FATAL_ERROR "Unable to find clang-format executable")
                 ENDIF()
                 # Format each source file with clang-format
                 SET(touchedFiles)
                 SET(fakedTouchedFiles)
                 SET(reportNb 0)
                 # Create the directory where the touched files will be saved
                 SET(formatDirectory "${CMAKE_CURRENT_BINARY_DIR}/format")
                 FILE(MAKE_DIRECTORY ${formatDirectory})
-            #    STRING(REPLACE "*.ui" "" srcs ${srcs})
-                FOREACH(item ${globs})
-                  STRING(REGEX MATCH ".*\.ui$" item ${item})
-                  IF(item)
-                    LIST(APPEND UIS ${item})
-                  ENDIF(item)
-                ENDFOREACH(item ${globs})
-                LIST(REMOVE_ITEM srcs ${UIS})
                 FOREACH (s ${srcs})
                     SET(touchedFile ${formatDirectory}/format_touchedfile_${reportNb})
                     IF(addToAll)
                         ADD_CUSTOM_COMMAND(
                             OUTPUT ${touchedFile}
                             COMMAND ${CLANGFORMAT_EXECUTABLE}
                                 -style="${style}"
                                 -i
                                 ${s}
                             # Create a file so that this command is executed only if the source
                             # file is modified
                             COMMAND ${CMAKE_COMMAND} -E touch ${touchedFile}
                             DEPENDS ${s}
                             COMMENT "Formatting code with clang-format of ${s}"
                         )
                     ENDIF()
                     SET(fakedTouchedFile ${formatDirectory}/format_fakedtouchedfile_${reportNb})
                     ADD_CUSTOM_COMMAND(
                         OUTPUT ${fakedTouchedFile}
                         COMMAND ${CLANGFORMAT_EXECUTABLE}
                             -style="${style}"
                             -i
                             ${s}
                         DEPENDS ${s}
                         COMMENT "Formatting code with clang-format of ${s}"
                     )
                     LIST(APPEND touchedFiles ${touchedFile})
                     LIST(APPEND fakedTouchedFiles ${fakedTouchedFile})
                     clangformat_incr(reportNb)
                 ENDFOREACH()
                 # Create the custom targets that will trigger the custom command created
                 # previously
                 IF(addToAll)
                     ADD_CUSTOM_TARGET(${target_all} ALL DEPENDS ${touchedFiles})
                 ENDIF()
                 ADD_CUSTOM_TARGET(${target} DEPENDS ${fakedTouchedFiles})
             ENDFUNCTION(ADD_CLANGFORMAT_TARGETS)
             macro(clangformat_incr var_name)
               math(EXPR ${var_name} "${${var_name}} + 1")
             endmacro()

0

formatting/vera-exclusions/exclusions.txt 0 -15

@@ -1,19 +1,4
1	# On ignore toutes les règles vera++ pour le fichier spimpl	1	# On ignore toutes les règles vera++ pour le fichier spimpl
2		2
3	.IPSIS_S04_METHOD.found: Q_DECLARE_LOGGING_CATEGORY.*	3	.IPSIS_S04_METHOD.found: Q_DECLARE_LOGGING_CATEGORY.*
4	.IPSIS_S04_VARIABLE.found: impl.*	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.

0

gui/CMakeLists.txt +4 -15

             ## gui - CMakeLists.txt
             STRING(TOLOWER ${CMAKE_PROJECT_NAME} LIBRARY_PREFFIX)
             SET(SQPGUI_LIBRARY_NAME "${LIBRARY_PREFFIX}_gui${DEBUG_SUFFIX}")
             SET(SOURCES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src")
             SET(INCLUDES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include")
             SET(UI_FOLDER "${CMAKE_CURRENT_SOURCE_DIR}/ui")
             SET(RES_FOLDER "${CMAKE_CURRENT_SOURCE_DIR}/resources")
             # Include gui directory
             include_directories("${INCLUDES_DIR}")
             include_directories("${CMAKE_CURRENT_BINARY_DIR}")
             # Set a variable to display a warning in the version files.
             SET(SCIQLOP_CMAKE_GENERATION_WARNING "DON'T CHANGE THIS FILE. AUTOGENERATED BY CMAKE.")
             #
             # Find Qt modules
             #
-            SCIQLOP_FIND_QT(Core Widgets PrintSupport)
+            SCIQLOP_FIND_QT(Core Widgets)
             #
             # Find dependent libraries
             # ========================
             find_package(sciqlop-core)
             SET(LIBRARIES ${SCIQLOP-CORE_LIBRARIES})
             INCLUDE_DIRECTORIES(${SCIQLOP-CORE_INCLUDE_DIR})
             # Add sqpcore to the list of libraries to use
             list(APPEND LIBRARIES ${SQPCORE_LIBRARY_NAME})
             # Add dependent shared libraries
             list(APPEND SHARED_LIBRARIES ${SQPCORE_SHARED_LIBRARIES})
             # Ui files
             FILE (GLOB_RECURSE PROJECT_FORMS ${UI_FOLDER}/*.ui)
             # Resources files
             FILE (GLOB_RECURSE PROJECT_RESOURCES ${RES_FOLDER}/*.qrc)
             #
             # Compile the library library
             #
             FILE (GLOB_RECURSE MODULE_SOURCES
                     ${INCLUDES_DIR}/*.h
                     ${SOURCES_DIR}/*.c
                     ${SOURCES_DIR}/*.cpp
                     ${SOURCES_DIR}/*.h
                     ${PROJECT_FORMS})
             QT5_ADD_RESOURCES(RCC_HDRS
               ${PROJECT_RESOURCES}
             )
             QT5_WRAP_UI(UIS_HDRS
              ${PROJECT_FORMS}
             )
             ADD_LIBRARY(${SQPGUI_LIBRARY_NAME} ${MODULE_SOURCES} ${UIS_HDRS} ${RCC_HDRS})
             set_property(TARGET ${SQPGUI_LIBRARY_NAME} PROPERTY CXX_STANDARD 14)
             set_property(TARGET ${SQPGUI_LIBRARY_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
             TARGET_LINK_LIBRARIES(${SQPGUI_LIBRARY_NAME} ${LIBRARIES})
-            qt5_use_modules(${SQPGUI_LIBRARY_NAME} Core Widgets PrintSupport)
+            qt5_use_modules(${SQPGUI_LIBRARY_NAME} Core Widgets)
-            INSTALL(TARGETS ${SQPGUI_LIBRARY_NAME}
-              RUNTIME DESTINATION ${INSTALL_BINARY_DIR}
-              LIBRARY DESTINATION ${INSTALL_LIBRARY_DIR}
-              ARCHIVE DESTINATION ${INSTALL_LIBRARY_DIR}
-            add_dependencies(${SQPGUI_LIBRARY_NAME} ${SQPCORE_LIBRARY_NAME})
             # From cmake documentation: http://www.cmake.org/cmake/help/v3.0/manual/cmake-buildsystem.7.html
             # Entries in the COMPILE_DEFINITIONS are prefixed with -D or /D and added to the compile line in an unspecified order.
             # The DEFINE_SYMBOL target property is also added as a compile definition as a special convenience case for SHARED and MODULE library targets
             IF(BUILD_SHARED_LIBS)
                     SET_TARGET_PROPERTIES(${SQPGUI_LIBRARY_NAME} PROPERTIES COMPILE_DEFINITIONS "SCIQLOP_EXPORT")
             ELSE()
                     TARGET_COMPILE_DEFINITIONS(${SQPGUI_LIBRARY_NAME} PUBLIC "SCIQLOP_STATIC_LIBRARIES")
             ENDIF()
             # Set the variable to parent scope so that the other projects can copy the
             # dependent shared libraries
             SCIQLOP_SET_TO_PARENT_SCOPE(SQPGUI_LIBRARY_NAME)
             # Copy extern shared libraries to the lib folder
             SCIQLOP_COPY_TO_TARGET(LIBRARY ${SQPGUI_LIBRARY_NAME})
             # Add the files to the list of files to be analyzed
             LIST(APPEND CHECKSTYLE_INPUT_FILES ${MODULE_SOURCES})
             SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_INPUT_FILES)
             # Vera++ exclusion files
-            LIST(APPEND CHECKSTYLE_EXCLUSION_FILES ${CMAKE_CURRENT_SOURCE_DIR}/vera-exclusions/exclusions.txt)
+            #LIST(APPEND CHECKSTYLE_EXCLUSION_FILES ${CMAKE_CURRENT_SOURCE_DIR}/path/to/exclusionFiles.tcl)
             SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_EXCLUSION_FILES)
             #
             # Compile the tests
             #
             IF(BUILD_TESTS)
                     INCLUDE_DIRECTORIES(${SOURCES_DIR})
                     FILE (GLOB_RECURSE TESTS_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Test*.cpp)
                     FILE (GLOB_RECURSE TESTS_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/Test*.h)
                     SET( TEST_LIBRARIES ${SQPGUI_LIBRARY_NAME})
                     FOREACH( testFile ${TESTS_SOURCES} )
                             GET_FILENAME_COMPONENT( testDirectory ${testFile} DIRECTORY )
                             GET_FILENAME_COMPONENT( testName ${testFile} NAME_WE )
                             # Add to the list of sources files all the sources in the same
                             # directory that aren't another test
                             FILE (GLOB currentTestSources
                                     ${testDirectory}/*.c
                                     ${testDirectory}/*.cpp
                                     ${testDirectory}/*.h)
                             LIST (REMOVE_ITEM currentTestSources ${TESTS_SOURCES})
-                            # LIST (REMOVE_ITEM currentTestSources ${TESTS_HEADERS})
+                            LIST (REMOVE_ITEM currentTestSources ${TESTS_HEADERS})
                             ADD_EXECUTABLE(${testName} ${testFile} ${currentTestSources})
-                            set_property(TARGET ${testName} PROPERTY CXX_STANDARD 14)
-                            set_property(TARGET ${testName} PROPERTY CXX_STANDARD_REQUIRED ON)
                             TARGET_LINK_LIBRARIES( ${testName} ${TEST_LIBRARIES} )
                             qt5_use_modules(${testName} Test)
                             ADD_TEST( NAME ${testName} COMMAND ${testName} )
                             SCIQLOP_COPY_TO_TARGET(RUNTIME ${testName} ${EXTERN_SHARED_LIBRARIES})
                     ENDFOREACH( testFile )
                     LIST(APPEND testFilesToFormat ${TESTS_SOURCES})
                     LIST(APPEND testFilesToFormat ${TESTS_HEADERS})
                     LIST(APPEND FORMATTING_INPUT_FILES ${testFilesToFormat})
                     SCIQLOP_SET_TO_PARENT_SCOPE(FORMATTING_INPUT_FILES)
             ENDIF(BUILD_TESTS)
             #
             # Set the files that must be formatted by clang-format.
             #
             LIST (APPEND FORMATTING_INPUT_FILES ${MODULE_SOURCES})
             SCIQLOP_SET_TO_PARENT_SCOPE(FORMATTING_INPUT_FILES)
             #
             # Set the directories that doxygen must browse to generate the
             # documentation.
             #
             # Source directories:
             LIST (APPEND DOXYGEN_INPUT_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/docs")
             LIST (APPEND DOXYGEN_INPUT_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/src")
             SCIQLOP_SET_TO_PARENT_SCOPE(DOXYGEN_INPUT_DIRS)
             # Source directories to exclude from the documentation generation
             #LIST (APPEND DOXYGEN_EXCLUDE_PATTERNS "${CMAKE_CURRENT_SOURCE_DIR}/path/to/subdir/*")
             SCIQLOP_SET_TO_PARENT_SCOPE(DOXYGEN_EXCLUDE_PATTERNS)
             #
             # Set the directories with the sources to analyze and propagate the
             # modification to the parent scope
             #
             # Source directories to analyze:
             LIST (APPEND ANALYSIS_INPUT_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/src")
             LIST (APPEND ANALYSIS_INPUT_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/tests")
             SCIQLOP_SET_TO_PARENT_SCOPE(ANALYSIS_INPUT_DIRS)
             # Source directories to exclude from the analysis
             #LIST (APPEND ANALYSIS_EXCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/path/to/subdir")
             SCIQLOP_SET_TO_PARENT_SCOPE(ANALYSIS_EXCLUDE_DIRS)

0

gui/include/SqpApplication.h +3 -21

             #ifndef SCIQLOP_SQPAPPLICATION_H
             #define SCIQLOP_SQPAPPLICATION_H
             #include "SqpApplication.h"
             #include <QApplication>
             #include <QLoggingCategory>
             #include <Common/spimpl.h>
             Q_DECLARE_LOGGING_CATEGORY(LOG_SqpApplication)
-            #if defined(sqpApp)
-            #undef sqpApp
-            #endif
-            #define sqpApp (static_cast<SqpApplication *>(QCoreApplication::instance()))
-            class DataSourceController;
-            class NetworkController;
-            class TimeController;
-            class VariableController;
-            class VisualizationController;
             /**
              * @brief The SqpApplication class aims to make the link between SciQlop
-             * and its plugins. This is the intermediate class that SciQlop has to use
+             * and its plugins. This is the intermediate class that SciQlop have to use
-             * in the way to connect a data source. Please first use load method to initialize
+             * in the way to connect a data source. Please first use load method to intialize
              * a plugin specified by its metadata name (JSON plugin source) then others specifics
-             * method will be able to access it.
+             * method will ba able to access it.
              * You can load a data source driver plugin then create a data source.
              */
             class SqpApplication : public QApplication {
                 Q_OBJECT
             public:
                 explicit SqpApplication(int &argc, char **argv);
                 virtual ~SqpApplication();
                 void initialize();
-                /// Accessors for the differents sciqlop controllers
-                DataSourceController &dataSourceController() noexcept;
-                NetworkController &networkController() noexcept;
-                TimeController &timeController() noexcept;
-                VariableController &variableController() noexcept;
-                VisualizationController &visualizationController() noexcept;
             private:
                 class SqpApplicationPrivate;
                 spimpl::unique_impl_ptr<SqpApplicationPrivate> impl;
             };
             #endif // SCIQLOP_SQPAPPLICATION_H

0

gui/src/SqpApplication.cpp +7 -112

@@ -1,150 +1,45
1	#include "SqpApplication.h"	1	#include "SqpApplication.h"
2		2
3	#include <Data/IDataProvider.h>
4	#include <DataSource/DataSourceController.h>	3	#include <DataSource/DataSourceController.h>
5	#include <Network/NetworkController.h>
6	#include <QThread>	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	Q_LOGGING_CATEGORY(LOG_SqpApplication, "SqpApplication")	6	Q_LOGGING_CATEGORY(LOG_SqpApplication, "SqpApplication")
13		7
14	class SqpApplication::SqpApplicationPrivate {	8	class SqpApplication::SqpApplicationPrivate {
15	public:	9	public:
16	SqpApplicationPrivate()	10	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
61	virtual ~SqpApplicationPrivate()	11	virtual ~SqpApplicationPrivate()
62	{	12	{
		13	qCInfo(LOG_SqpApplication()) << tr("Desctruction du SqpApplicationPrivate");
63	m_DataSourceControllerThread.quit();	14	m_DataSourceControllerThread.quit();
64	m_DataSourceControllerThread.wait();	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	std::unique_ptr<DataSourceController> m_DataSourceController;	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	QThread m_DataSourceControllerThread;	19	QThread m_DataSourceControllerThread;
82	QThread m_NetworkControllerThread;
83	QThread m_VariableControllerThread;
84	QThread m_VisualizationControllerThread;
85	};	20	};
86		21
87		22
88	SqpApplication::SqpApplication(int &argc, char **argv)	23	SqpApplication::SqpApplication(int &argc, char **argv)
89	: QApplication{argc, argv}, impl{spimpl::make_unique_impl<SqpApplicationPrivate>()}	24	: QApplication(argc, argv), impl{spimpl::make_unique_impl<SqpApplicationPrivate>()}
90	{	25	{
91	qC~~Debug~~(LOG_SqpApplication()) << tr("SqpApplication ~~construction~~") << ~~QThread~~::~~currentThread~~();	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	connect(&impl->m_DataSourceControllerThread, &QThread::started,	31	connect(&impl->m_DataSourceControllerThread, &QThread::started,
94	impl->m_DataSourceController.get(), &DataSourceController::initialize);	32	impl->m_DataSourceController.get(), &DataSourceController::initialize);
95	connect(&impl->m_DataSourceControllerThread, &QThread::finished,	33	connect(&impl->m_DataSourceControllerThread, &QThread::finished,
96	impl->m_DataSourceController.get(), &DataSourceController::finalize);	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	impl->m_DataSourceControllerThread.start();	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	SqpApplication::~SqpApplication()	39	SqpApplication::~SqpApplication()
120	{	40	{
121	}	41	}
122		42
123	void SqpApplication::initialize()	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	}

0

COPYING removed 0 -674

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (674 lines changed) Show them Hide them

0

app/meson.build removed 0 -38

1

NO CONTENT: file was removed

0

app/resources/qlopapp.rc removed 0 -1

1

NO CONTENT: file was removed

0

app/resources/sciqlop.ico removed binary 0 0

1

NO CONTENT: file was removed, binary diff hidden

0

app/src/MainWindow.cpp removed 0 -254

1

NO CONTENT: file was removed

0

app/ui/MainWindow.ui removed 0 -164

1

NO CONTENT: file was removed

0

app/vera-exclusions/exclusions.txt removed 0 -5

1

NO CONTENT: file was removed

0

build_cfg/mac/Info.plist removed 0 -22

1

NO CONTENT: file was removed

0

build_cfg/mac/build.sh removed 0 -8

1

NO CONTENT: file was removed

0

build_cfg/mac/install_script.sh removed 0 -12

1

NO CONTENT: file was removed

0

build_cfg/mac/sciqlopLOGO.icns removed binary 0 0

1

NO CONTENT: file was removed, binary diff hidden

0

build_cfg/windows/build.sh removed 0 -8

1

NO CONTENT: file was removed

0

build_cfg/windows/cross_fedora_win64.txt removed 0 -18

1

NO CONTENT: file was removed

0

build_cfg/windows/install_script.sh removed 0 -26

1

NO CONTENT: file was removed

0

cmake/sciqlop_code_coverage.cmake removed 0 -191

1

NO CONTENT: file was removed

0

cmake/sciqlop_package_qt.cmake removed 0 -36

1

NO CONTENT: file was removed

0

core/include/Common/DateUtils.h removed 0 -19

1

NO CONTENT: file was removed

0

core/include/Common/MetaTypes.h removed 0 -46

1

NO CONTENT: file was removed

0

core/include/Common/SortUtils.h removed 0 -139

1

NO CONTENT: file was removed

0

core/include/Common/StringUtils.h removed 0 -35

1

NO CONTENT: file was removed

0

core/include/CoreGlobal.h removed 0 -12

1

NO CONTENT: file was removed

0

core/include/Data/AcquisitionDataPacket.h removed 0 -25

1

NO CONTENT: file was removed

0

core/include/Data/AcquisitionRequest.h removed 0 -40

1

NO CONTENT: file was removed

0

core/include/Data/ArrayData.h removed 0 -374

1

NO CONTENT: file was removed

0

core/include/Data/ArrayDataIterator.h removed 0 -74

1

NO CONTENT: file was removed

0

core/include/Data/DataProviderParameters.h removed 0 -18

1

NO CONTENT: file was removed

0

core/include/Data/DataSeries.h removed 0 -400

1

NO CONTENT: file was removed

0

core/include/Data/DataSeriesIterator.h removed 0 -78

1

NO CONTENT: file was removed

0

core/include/Data/DataSeriesMergeHelper.h removed 0 -83

1

NO CONTENT: file was removed

0

core/include/Data/IDataProvider.h removed 0 -81

1

NO CONTENT: file was removed

0

core/include/Data/IDataSeries.h removed 0 -113

1

NO CONTENT: file was removed

0

core/include/Data/ScalarSeries.h removed 0 -27

1

NO CONTENT: file was removed

0

core/include/Data/SqpIterator.h removed 0 -112

1

NO CONTENT: file was removed

0

core/include/Data/SqpRange.h removed 0 -58

1

NO CONTENT: file was removed

0

core/include/Data/VariableRequest.h removed 0 -28

1

NO CONTENT: file was removed

0

core/include/Data/VectorSeries.h removed 0 -34

1

NO CONTENT: file was removed

0

core/include/DataSource/DataSourceItem.h removed 0 -102

1

NO CONTENT: file was removed

0

core/include/DataSource/DataSourceItemAction.h removed 0 -52

1

NO CONTENT: file was removed

0

core/include/Network/NetworkController.h removed 0 -53

1

NO CONTENT: file was removed

0

core/include/Plugin/PluginManager.h removed 0 -36

1

NO CONTENT: file was removed

0

core/include/Settings/ISqpSettingsBindable.h removed 0 -21

1

NO CONTENT: file was removed

0

core/include/Settings/SqpSettingsDefs.h removed 0 -22

1

NO CONTENT: file was removed

0

core/include/Time/TimeController.h removed 0 -42

1

NO CONTENT: file was removed

0

core/include/Variable/Variable.h removed 0 -83

1

NO CONTENT: file was removed

0

core/include/Variable/VariableAcquisitionWorker.h removed 0 -66

1

NO CONTENT: file was removed

0

core/include/Variable/VariableCacheController.h removed 0 -45

1

NO CONTENT: file was removed

0

core/include/Variable/VariableCacheStrategy.h removed 0 -37

1

NO CONTENT: file was removed

0

core/include/Variable/VariableCacheStrategyFactory.h removed 0 -44

1

NO CONTENT: file was removed

0

core/include/Variable/VariableController.h removed 0 -130

1

NO CONTENT: file was removed

0

core/include/Variable/VariableModel.h removed 0 -95

1

NO CONTENT: file was removed

0

core/include/Variable/VariableSingleThresholdCacheStrategy.h removed 0 -32

1

NO CONTENT: file was removed

0

core/include/Variable/VariableSynchronizationGroup.h removed 0 -38

1

NO CONTENT: file was removed

0

core/include/Visualization/VisualizationController.h removed 0 -51

1

NO CONTENT: file was removed

0

core/meson.build removed 0 -63

1

NO CONTENT: file was removed

0

core/src/Common/DateUtils.cpp removed 0 -13

1

NO CONTENT: file was removed

0

core/src/Common/StringUtils.cpp removed 0 -30

1

NO CONTENT: file was removed

0

core/src/Data/ArrayDataIterator.cpp removed 0 -77

1

NO CONTENT: file was removed

0

core/src/Data/DataSeriesIterator.cpp removed 0 -83

1

NO CONTENT: file was removed

0

core/src/Data/ScalarSeries.cpp removed 0 -31

1

NO CONTENT: file was removed

0

core/src/Data/VectorSeries.cpp removed 0 -85

1

NO CONTENT: file was removed

0

core/src/DataSource/DataSourceItem.cpp removed 0 -145

1

NO CONTENT: file was removed

0

core/src/DataSource/DataSourceItemAction.cpp removed 0 -44

1

NO CONTENT: file was removed

0

core/src/Network/NetworkController.cpp removed 0 -148

1

NO CONTENT: file was removed

0

core/src/Plugin/PluginManager.cpp removed 0 -124

1

NO CONTENT: file was removed

0

core/src/Settings/SqpSettingsDefs.cpp removed 0 -18

1

NO CONTENT: file was removed

0

core/src/Time/TimeController.cpp removed 0 -29

1

NO CONTENT: file was removed

0

core/src/Variable/Variable.cpp removed 0 -315

1

NO CONTENT: file was removed

0

core/src/Variable/VariableAcquisitionWorker.cpp removed 0 -322

1

NO CONTENT: file was removed

0

core/src/Variable/VariableCacheController.cpp removed 0 -225

1

NO CONTENT: file was removed

0

core/src/Variable/VariableController.cpp removed 0 -842

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (842 lines changed) Show them Hide them

0

core/src/Variable/VariableModel.cpp removed 0 -293

1

NO CONTENT: file was removed

0

core/src/Variable/VariableSynchronizationGroup.cpp removed 0 -32

1

NO CONTENT: file was removed

0

core/src/Visualization/VisualizationController.cpp removed 0 -48

1

NO CONTENT: file was removed

0

core/tests/Common/TestStringUtils.cpp removed 0 -50

1

NO CONTENT: file was removed

0

core/tests/Data/TestDataSeries.cpp removed 0 -636

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (636 lines changed) Show them Hide them

0

core/tests/Data/TestOneDimArrayData.cpp removed 0 -181

1

NO CONTENT: file was removed

0

core/tests/Data/TestTwoDimArrayData.cpp removed 0 -240

1

NO CONTENT: file was removed

0

core/tests/DataSource/TestDataSourceController.cpp removed 0 -49

1

NO CONTENT: file was removed

0

core/tests/Variable/TestVariable.cpp removed 0 -177

1

NO CONTENT: file was removed

0

core/tests/Variable/TestVariableCacheController.cpp removed 0 -333

1

NO CONTENT: file was removed

0

core/tests/Variable/TestVariableController.cpp removed 0 -74

1

NO CONTENT: file was removed

0

core/tests/Variable/TestVariableSync.cpp removed 0 -310

1

NO CONTENT: file was removed

0

core/tests/meson.build removed 0 -20

1

NO CONTENT: file was removed

0

gui/include/Common/ColorUtils.h removed 0 -19

1

NO CONTENT: file was removed

0

gui/include/DataSource/DataSourceTreeWidgetHelper.h removed 0 -23

1

NO CONTENT: file was removed

0

gui/include/DataSource/DataSourceTreeWidgetItem.h removed 0 -37

1

NO CONTENT: file was removed

0

gui/include/DataSource/DataSourceWidget.h removed 0 -42

1

NO CONTENT: file was removed

0

gui/include/Settings/SqpSettingsDialog.h removed 0 -40

1

NO CONTENT: file was removed

0

gui/include/Settings/SqpSettingsGeneralWidget.h removed 0 -32

1

NO CONTENT: file was removed

0

gui/include/SidePane/SqpSidePane.h removed 0 -27

1

NO CONTENT: file was removed

0

gui/include/TimeWidget/TimeWidget.h removed 0 -32

1

NO CONTENT: file was removed

0

gui/include/Variable/RenameVariableDialog.h removed 0 -32

1

NO CONTENT: file was removed

0

gui/include/Variable/VariableInspectorWidget.h removed 0 -56

1

NO CONTENT: file was removed

0

gui/include/Variable/VariableMenuHeaderWidget.h removed 0 -37

1

NO CONTENT: file was removed

0

gui/include/Visualization/IGraphSynchronizer.h removed 0 -24

1

NO CONTENT: file was removed

0

gui/include/Visualization/IVariableContainer.h removed 0 -22

1

NO CONTENT: file was removed

0

gui/include/Visualization/IVisualizationWidget.h removed 0 -25

1

NO CONTENT: file was removed

0

gui/include/Visualization/IVisualizationWidgetVisitor.h removed 0 -28

1

NO CONTENT: file was removed

0

gui/include/Visualization/QCustomPlotSynchronizer.h removed 0 -26

1

NO CONTENT: file was removed

0

gui/include/Visualization/VisualizationDefs.h removed 0 -10

1

NO CONTENT: file was removed

0

gui/include/Visualization/VisualizationGraphHelper.h removed 0 -39

1

NO CONTENT: file was removed

0

gui/include/Visualization/VisualizationGraphRenderingDelegate.h removed 0 -31

1

NO CONTENT: file was removed

0

gui/include/Visualization/VisualizationGraphWidget.h removed 0 -98

1

NO CONTENT: file was removed

0

gui/include/Visualization/VisualizationTabWidget.h removed 0 -57

1

NO CONTENT: file was removed

0

gui/include/Visualization/VisualizationWidget.h removed 0 -54

1

NO CONTENT: file was removed

0

gui/include/Visualization/VisualizationZoneWidget.h removed 0 -60

1

NO CONTENT: file was removed

0

gui/include/Visualization/operations/FindVariableOperation.h removed 0 -42

1

NO CONTENT: file was removed

0

gui/include/Visualization/operations/GenerateVariableMenuOperation.h removed 0 -48

1

NO CONTENT: file was removed

0

gui/include/Visualization/operations/MenuBuilder.h removed 0 -61

1

NO CONTENT: file was removed

0

gui/include/Visualization/operations/RemoveVariableOperation.h removed 0 -41

1

NO CONTENT: file was removed

0

gui/include/Visualization/operations/RescaleAxeOperation.h removed 0 -42

1

NO CONTENT: file was removed

0

gui/include/Visualization/qcustomplot.h removed 0 -7219

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (7219 lines changed) Show them Hide them

0

gui/meson.build removed 0 -80

1

NO CONTENT: file was removed

0

gui/resources/icones/dataSourceComponent.png removed binary 0 0

1

NO CONTENT: file was removed, binary diff hidden

0

gui/resources/icones/dataSourceNode.png removed binary 0 0

1

NO CONTENT: file was removed, binary diff hidden

0

gui/resources/icones/dataSourceProduct.png removed binary 0 0

1

NO CONTENT: file was removed, binary diff hidden

0

gui/resources/icones/dataSourceRoot.png removed binary 0 0

1

NO CONTENT: file was removed, binary diff hidden

0

gui/resources/icones/delete.png removed binary 0 0

1

NO CONTENT: file was removed, binary diff hidden

0

gui/resources/icones/down.png removed binary 0 0

1

NO CONTENT: file was removed, binary diff hidden

0

gui/resources/icones/next.png removed binary 0 0

1

NO CONTENT: file was removed, binary diff hidden

0

gui/resources/icones/openInspector.png removed binary 0 0

1

NO CONTENT: file was removed, binary diff hidden

0

gui/resources/icones/plot.png removed binary 0 0

1

NO CONTENT: file was removed, binary diff hidden

0

gui/resources/icones/previous.png removed binary 0 0

1

NO CONTENT: file was removed, binary diff hidden

0

gui/resources/icones/sciqlop2PNG_1024.png removed binary 0 0

1

NO CONTENT: file was removed, binary diff hidden

0

gui/resources/icones/unplot.png removed binary 0 0

1

NO CONTENT: file was removed, binary diff hidden

0

gui/resources/icones/up.png removed binary 0 0

1

NO CONTENT: file was removed, binary diff hidden

0

gui/resources/sqpguiresources.qrc removed 0 -16

1

NO CONTENT: file was removed

0

gui/src/Common/ColorUtils.cpp removed 0 -29

1

NO CONTENT: file was removed

0

gui/src/DataSource/DataSourceTreeWidgetHelper.cpp removed 0 -36

1

NO CONTENT: file was removed

0

gui/src/DataSource/DataSourceTreeWidgetItem.cpp removed 0 -176

1

NO CONTENT: file was removed

0

gui/src/DataSource/DataSourceWidget.cpp removed 0 -100

1

NO CONTENT: file was removed

0

gui/src/Settings/SqpSettingsDialog.cpp removed 0 -66

1

NO CONTENT: file was removed

0

gui/src/Settings/SqpSettingsGeneralWidget.cpp removed 0 -51

1

NO CONTENT: file was removed

0

gui/src/SidePane/SqpSidePane.cpp removed 0 -47

1

NO CONTENT: file was removed

0

gui/src/TimeWidget/TimeWidget.cpp removed 0 -50

1

NO CONTENT: file was removed

0

gui/src/Variable/RenameVariableDialog.cpp removed 0 -63

1

NO CONTENT: file was removed

0

gui/src/Variable/VariableInspectorWidget.cpp removed 0 -239

1

NO CONTENT: file was removed

0

gui/src/Variable/VariableMenuHeaderWidget.cpp removed 0 -38

1

NO CONTENT: file was removed

0

gui/src/Visualization/QCustomPlotSynchronizer.cpp removed 0 -30

1

NO CONTENT: file was removed

0

gui/src/Visualization/VisualizationGraphHelper.cpp removed 0 -204

1

NO CONTENT: file was removed

0

gui/src/Visualization/VisualizationGraphRenderingDelegate.cpp removed 0 -275

1

NO CONTENT: file was removed

0

gui/src/Visualization/VisualizationGraphWidget.cpp removed 0 -356

1

NO CONTENT: file was removed

0

gui/src/Visualization/VisualizationTabWidget.cpp removed 0 -129

1

NO CONTENT: file was removed

0

gui/src/Visualization/VisualizationWidget.cpp removed 0 -172

1

NO CONTENT: file was removed

0

gui/src/Visualization/VisualizationZoneWidget.cpp removed 0 -302

1

NO CONTENT: file was removed

0

gui/src/Visualization/operations/FindVariableOperation.cpp removed 0 -72

1

NO CONTENT: file was removed

0

gui/src/Visualization/operations/GenerateVariableMenuOperation.cpp removed 0 -216

1

NO CONTENT: file was removed

0

gui/src/Visualization/operations/MenuBuilder.cpp removed 0 -58

1

NO CONTENT: file was removed

0

gui/src/Visualization/operations/RemoveVariableOperation.cpp removed 0 -70

1

NO CONTENT: file was removed

0

gui/src/Visualization/operations/RescaleAxeOperation.cpp removed 0 -69

1

NO CONTENT: file was removed

0

gui/src/Visualization/qcustomplot.cpp removed 0 -31403

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (31403 lines changed) Show them Hide them

0

gui/ui/DataSource/DataSourceWidget.ui removed 0 -33

1

NO CONTENT: file was removed

0

gui/ui/Settings/SqpSettingsDialog.ui removed 0 -84

1

NO CONTENT: file was removed

0

gui/ui/Settings/SqpSettingsGeneralWidget.ui removed 0 -74

1

NO CONTENT: file was removed

0

gui/ui/SidePane/SqpSidePane.ui removed 0 -42

1

NO CONTENT: file was removed

0

gui/ui/TimeWidget/TimeWidget.ui removed 0 -98

1

NO CONTENT: file was removed

0

gui/ui/Variable/RenameVariableDialog.ui removed 0 -90

1

NO CONTENT: file was removed

0

gui/ui/Variable/VariableInspectorWidget.ui removed 0 -31

1

NO CONTENT: file was removed

0

gui/ui/Variable/VariableMenuHeaderWidget.ui removed 0 -31

1

NO CONTENT: file was removed

0

gui/ui/Visualization/VisualizationGraphWidget.ui removed 0 -51

1

NO CONTENT: file was removed

0

gui/ui/Visualization/VisualizationTabWidget.ui removed 0 -73

1

NO CONTENT: file was removed

0

gui/ui/Visualization/VisualizationWidget.ui removed 0 -40

1

NO CONTENT: file was removed

0

gui/ui/Visualization/VisualizationZoneWidget.ui removed 0 -117

1

NO CONTENT: file was removed

0

gui/vera-exclusions/exclusions.txt removed 0 -9

1

NO CONTENT: file was removed

0

meson.build removed 0 -36

1

NO CONTENT: file was removed

0

plugin/CMakeLists.txt removed 0 -52

1

NO CONTENT: file was removed

0

plugin/cmake/Findsciqlop-plugin.cmake removed 0 -12

1

NO CONTENT: file was removed

0

plugin/include/Plugin/IPlugin.h removed 0 -20

1

NO CONTENT: file was removed

0

plugins/amda/CMakeLists.txt removed 0 -167

1

NO CONTENT: file was removed

0

plugins/amda/cmake/Findsciqlop-amda.cmake removed 0 -22

1

NO CONTENT: file was removed

0

plugins/amda/include/AmdaDefs.h removed 0 -17

1

NO CONTENT: file was removed

0

plugins/amda/include/AmdaGlobal.h removed 0 -12

1

NO CONTENT: file was removed

0

plugins/amda/include/AmdaParser.h removed 0 -23

1

NO CONTENT: file was removed

0

plugins/amda/include/AmdaPlugin.h removed 0 -29

1

NO CONTENT: file was removed

0

plugins/amda/include/AmdaProvider.h removed 0 -44

1

NO CONTENT: file was removed

0

plugins/amda/include/AmdaResultParser.h removed 0 -21

1

NO CONTENT: file was removed

0

plugins/amda/meson.build removed 0 -73

1

NO CONTENT: file was removed

0

plugins/amda/resources/amda.json removed 0 -3

1

NO CONTENT: file was removed

0

plugins/amda/resources/amdaresources.qrc removed 0 -6

1

NO CONTENT: file was removed

0

plugins/amda/resources/samples/AmdaSample.json removed 0 -22288

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (22288 lines changed) Show them Hide them

0

plugins/amda/resources/samples/AmdaSampleV2.json removed 0 -29129

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (29129 lines changed) Show them Hide them

0

plugins/amda/src/AmdaDefs.cpp removed 0 -7

1

NO CONTENT: file was removed

0

plugins/amda/src/AmdaParser.cpp removed 0 -125

1

NO CONTENT: file was removed

0

plugins/amda/src/AmdaPlugin.cpp removed 0 -74

1

NO CONTENT: file was removed

0

plugins/amda/src/AmdaProvider.cpp removed 0 -284

1

NO CONTENT: file was removed

0

plugins/amda/src/AmdaResultParser.cpp removed 0 -225

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaAcquisition/AmdaData-2012-01-01-12-00-00_2012-01-03-12-00-00.txt removed 0 -10802

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (10802 lines changed) Show them Hide them

0

plugins/amda/tests-resources/TestAmdaParser/TwoRootsFile.json removed 0 -4

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaParser/ValidFile1.json removed 0 -63

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaParser/WrongRootKey.json removed 0 -5

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaParser/WrongRootType.json removed 0 -3

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/FileNotFound.txt removed 0 -3

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/NaNValue.txt removed 0 -64

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/NaNX.txt removed 0 -64

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/NoUnit.txt removed 0 -60

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/TooManyValues.txt removed 0 -64

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/ValidScalar1.txt removed 0 -71

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/ValidVector1.txt removed 0 -71

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/WrongDate.txt removed 0 -64

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/WrongUnit.txt removed 0 -64

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/WrongValue.txt removed 0 -64

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/amdaV1/FileNotFound.txt removed 0 -3

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/amdaV1/NaNValue.txt removed 0 -6

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/amdaV1/NaNX.txt removed 0 -6

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/amdaV1/NoUnit.txt removed 0 -2

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/amdaV1/TooManyValues.txt removed 0 -6

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/amdaV1/ValidScalar1.txt removed 0 -13

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/amdaV1/ValidVector1.txt removed 0 -12

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/amdaV1/WrongDate.txt removed 0 -6

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/amdaV1/WrongUnit.txt removed 0 -6

1

NO CONTENT: file was removed

0

plugins/amda/tests-resources/TestAmdaResultParser/amdaV1/WrongValue.txt removed 0 -6

1

NO CONTENT: file was removed

0

plugins/amda/tests/TestAmdaAcquisition.cpp removed 0 -197

1

NO CONTENT: file was removed

0

plugins/amda/tests/TestAmdaParser.cpp removed 0 -176

1

NO CONTENT: file was removed

0

plugins/amda/tests/TestAmdaResultParser.cpp removed 0 -281

1

NO CONTENT: file was removed

0

plugins/meson.build removed 0 -2

1

NO CONTENT: file was removed

0

plugins/mockplugin/CMakeLists.txt removed 0 -160

1

NO CONTENT: file was removed

0

plugins/mockplugin/cmake/Findsciqlop-mockplugin.cmake removed 0 -22

1

NO CONTENT: file was removed

0

plugins/mockplugin/include/CosinusProvider.h removed 0 -36

1

NO CONTENT: file was removed

0

plugins/mockplugin/include/MockPlugin.h removed 0 -29

1

NO CONTENT: file was removed

0

plugins/mockplugin/include/MockPluginGlobal.h removed 0 -12

1

NO CONTENT: file was removed

0

plugins/mockplugin/meson.build removed 0 -45

1

NO CONTENT: file was removed

0

plugins/mockplugin/resources/mockplugin.json removed 0 -3

1

NO CONTENT: file was removed

0

plugins/mockplugin/src/CosinusProvider.cpp removed 0 -115

1

NO CONTENT: file was removed

0

plugins/mockplugin/src/MockPlugin.cpp removed 0 -79

1

NO CONTENT: file was removed

0

plugins/mockplugin/tests-resources/TestCosinusAcquisition/Cosinus_100Hz_20170101_1200_20170101_1300.txt removed 0 -360000

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (360000 lines changed) Show them Hide them

0

plugins/mockplugin/tests/TestCosinusAcquisition.cpp removed 0 -191

1

NO CONTENT: file was removed

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages