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

ver	Time	Author	Commit	Description
`latest`	Mon, 05 Jun 2017 13:37:15	perrinel	`r45:569ae9410a6b`	Remove unused gcov link
`latest`	Mon, 05 Jun 2017 13:32:47	perrinel	`r44:31b8fb9583a3`	Add the coverage target whith the test. make coverage will call the code coverage for every test of the core module.
2 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

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

             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 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 +16 -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
             #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}/*.c
+            	${SOURCES_DIR}/*.cpp
-                ${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} )
             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

0

app/src/main.cpp ~~app/src/Main.cpp~~ renamed +1 -43

@@ -19,26 +19,12
19	/*-- Author : Alexis Jeandet	19	/*-- Author : Alexis Jeandet
20	-- Mail : alexis.jeandet@member.fsf.org	20	-- Mail : alexis.jeandet@member.fsf.org
21	----------------------------------------------------------------------------*/	21	----------------------------------------------------------------------------*/
22	#include "~~MainW~~indow.h"	22	#include "mainwindow.h"
23	#include <QProcessEnvironment>	23	#include <QProcessEnvironment>
24	#include <QThread>	24	#include <QThread>
25	#include <SqpApplication.h>	25	#include <SqpApplication.h>
26	#include <qglobal.h>	26	#include <qglobal.h>
27		27
28	#include <Plugin/PluginManager.h>
29	#include <QDir>
30
31	#include <QLoggingCategory>
32
33	Q_LOGGING_CATEGORY(LOG_Main, "Main")
34
35	namespace {
36
37	const auto PLUGIN_DIRECTORY_NAME = QStringLiteral("plugins");
38
39
40	} // namespace
41
42	int main(int argc, char *argv[])	28	int main(int argc, char *argv[])
43	{	29	{
44	SqpApplication a{argc, argv};	30	SqpApplication a{argc, argv};
@@ -48,33 +34,5 int main(int argc, char *argv[])
48	MainWindow w;	34	MainWindow w;
49	w.show();	35	w.show();
50		36
51	// Loads plugins
52	auto pluginDir = QDir{a.applicationDirPath()};
53	auto pluginLookupPath = {
54	a.applicationDirPath(),
55	a.applicationDirPath() + "/" + PLUGIN_DIRECTORY_NAME,
56	a.applicationDirPath() + "/../lib64/SciQlop",
57	a.applicationDirPath() + "/../lib64/sciqlop",
58	a.applicationDirPath() + "/../lib/SciQlop",
59	a.applicationDirPath() + "/../lib/sciqlop",
60	a.applicationDirPath() + "/../plugins",
61	};
62
63	#if _WIN32 \|\| _WIN64
64	pluginDir.mkdir(PLUGIN_DIRECTORY_NAME);
65	pluginDir.cd(PLUGIN_DIRECTORY_NAME);
66	#endif
67
68	PluginManager pluginManager{};
69
70	for (auto &&path : pluginLookupPath) {
71	QDir directory{path};
72	if (directory.exists()) {
73	qCDebug(LOG_Main())
74	<< QObject::tr("Plugin directory: %1").arg(directory.absolutePath());
75	pluginManager.loadPlugins(directory);
76	}
77	}
78
79	return a.exec();	37	return a.exec();
80	}	38	}

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
             /*-- 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

app/vera-exclusions/exclusions.txt +3 -5

@@ -1,5 +1,3
1	# Ignore false positive relative to App macro	1	# Ignore false positive relative to sqpApp macro
2	\.h:\d+:.IPSIS_S0~~4.*found: Ui~~	2	SqpApplication\.h:\d+:.IPSIS_S03.*found: sqpApp
3		3	SqpApplication\.h:\d+:.IPSIS_S04_VARIABLE.*found: sqpApp
4	# Ignore false positive relative to macros
5	Main\.cpp:\d+:.IPSIS_S04_VARIABLE.found: (__ppc64__) No newline at end of file

0

cmake/sciqlop.cmake +1 -1

             #
             # Configure the compiler
             #
-            #INCLUDE("cmake/compiler/compiler.cmake")
+            INCLUDE("cmake/compiler/compiler.cmake")
             #
             # Find all necessary dependencies

0

cmake/sciqlop_applications.cmake +16 -24

@@ -1,16 +1,27
		1	#
		2	# Sciqlop_modules.cmake
		3	#
		4	# Set ouptut directories
		5	#
		6	SET (EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/${CMAKE_BUILD_TYPE})
		7	SET (LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/${CMAKE_BUILD_TYPE})
		8	IF (UNIX)
		9	SET (CONFIG_OUTPUT_PATH $ENV{HOME}/.config/QtProject)
		10	ELSEIF(WIN32)
		11	SET (CONFIG_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/${CMAKE_BUILD_TYPE}/app/QtProject)
		12	ELSE()
		13	SET (CONFIG_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/${CMAKE_BUILD_TYPE})
		14	ENDIF()
		15
		16	INCLUDE ("cmake/sciqlop_code_coverage.cmake")
1		17
2	if(BUILD_TESTS)	18	if(BUILD_TESTS)
3	INCLUDE ("cmake/sciqlop_code_coverage.cmake")
4	APPEND_COVERAGE_COMPILER_FLAGS()	19	APPEND_COVERAGE_COMPILER_FLAGS()
5	endif(BUILD_TESTS)	20	endif(BUILD_TESTS)
6		21
7	#	22	#
8	# Compile the diffents modules	23	# Compile the diffents modules
9	#	24	#
10	set(sciqlop-plugin_DIR "${CMAKE_SOURCE_DIR}/plugin/cmake")
11	set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${sciqlop-plugin_DIR}")
12	ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/plugin")
13
14	set(sciqlop-core_DIR "${CMAKE_SOURCE_DIR}/core/cmake")	25	set(sciqlop-core_DIR "${CMAKE_SOURCE_DIR}/core/cmake")
15	set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${sciqlop-core_DIR}")	26	set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${sciqlop-core_DIR}")
16	ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/core")	27	ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/core")
@@ -21,25 +32,6 ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/gui")
21		32
22	ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/app")	33	ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/app")
23		34
24	OPTION (BUILD_PLUGINS "Build the plugins" OFF)
25	IF(BUILD_PLUGINS)
26	set(sciqlop-mockplugin_DIR "${CMAKE_SOURCE_DIR}/plugins/mockplugin/cmake")
27	set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${sciqlop-mockplugin_DIR}")
28	ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/plugins/mockplugin")
29
30	set(sciqlop-amda_DIR "${CMAKE_SOURCE_DIR}/plugins/amda/cmake")
31	set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${sciqlop-amda_DIR}")
32	ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/plugins/amda")
33
34	# Temporary target to copy to plugins dir
35	find_package(sciqlop-mockplugin)
36	find_package(sciqlop-amda)
37	ADD_CUSTOM_TARGET(plugins
38	COMMAND ${CMAKE_COMMAND} -E copy ${SCIQLOP-MOCKPLUGIN_LIBRARIES} "${LIBRARY_OUTPUT_PATH}/plugins/${SCIQLOP-MOCKPLUGIN_LIBRARIES_NAME}"
39	COMMAND ${CMAKE_COMMAND} -E copy ${SCIQLOP-AMDA_LIBRARIES} "${LIBRARY_OUTPUT_PATH}/plugins/${SCIQLOP-AMDA_LIBRARIES_NAME}"
40	)
41	ENDIF(BUILD_PLUGINS)
42
43	# LOGGER	35	# LOGGER
44	set(QTLOGGING_INI_FILE "${CMAKE_SOURCE_DIR}/config/QtProject/qtlogging.ini")	36	set(QTLOGGING_INI_FILE "${CMAKE_SOURCE_DIR}/config/QtProject/qtlogging.ini")
45	FILE(COPY ${QTLOGGING_INI_FILE} DESTINATION ${CONFIG_OUTPUT_PATH})	37	FILE(COPY ${QTLOGGING_INI_FILE} DESTINATION ${CONFIG_OUTPUT_PATH})

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 +9 -51

@@ -44,30 +44,6 else()
44	set(libRootDirForceValue)	44	set(libRootDirForceValue)
45	endif()	45	endif()
46		46
47	#
48	# Sciqlop_modules.cmake
49	#
50	# Set ouptut directories
51	#
52	IF (UNIX)
53	# 32 or 64 bits compiler
54	IF( CMAKE_SIZEOF_VOID_P EQUAL 8 )
55	SET(defaultLib "lib64/sciqlop")
56	ELSE()
57	SET(defaultLib "lib/sciqlop")
58	ENDIF()
59	SET (EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/bin)
60	SET (CONFIG_OUTPUT_PATH $ENV{HOME}/.config/QtProject)
61	SET (LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/${defaultLib})
62	ELSEIF(WIN32)
63	SET (EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist)
64	SET (LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist)
65	SET (CONFIG_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/app/QtProject)
66	ELSE()
67	SET (EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist)
68	SET (CONFIG_OUTPUT_PATH $ENV{HOME}/.config/QtProject)
69	SET (LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist)
70	ENDIF()
71		47
72		48
73	#	49	#
@@ -78,51 +54,33 OPTION (BUILD_SHARED_LIBS "Build the shared libraries" ON)
78	# Generate position independant code (-fPIC)	54	# Generate position independant code (-fPIC)
79	SET(CMAKE_POSITION_INDEPENDENT_CODE TRUE)	55	SET(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
80		56
81		57	#
82		58	# Configure installation directories
83	# Configuration for make install	59	#
84
85	set(PROJECT_PLUGIN_PREFIX "SciQlop")
86
87	IF (UNIX)	60	IF (UNIX)
88	SET(CMAKE_INSTALL_PREFIX "/usr/local/${PROJECT_PLUGIN_PREFIX}")
89	SET(defaultBin "bin")	61	SET(defaultBin "bin")
90	SET(defaultInc "include/sciqlop")	62	SET(defaultInc "include/sciqlop")
91		63
92	# 32 or 64 bits compiler	64	# 32 or 64 bits compiler
93	IF( CMAKE_SIZEOF_VOID_P EQUAL 8 )	65	IF( CMAKE_SIZEOF_VOID_P EQUAL 8 )
94	SET(defaultLib "lib64")	66	SET(defaultLib "lib64/sciqlop")
95	SET(defaultPluginsLib "lib64/${PROJECT_PLUGIN_PREFIX}")
96	ELSE()	67	ELSE()
97	SET(defaultLib "lib/")	68	SET(defaultLib "lib/sciqlop")
98	SET(defaultPluginsLib "lib/${PROJECT_PLUGIN_PREFIX}")
99	ENDIF()	69	ENDIF()
100		70
101	SET(defaultDoc "share/docs/~~${PROJECT_PLUGIN_PREFIX}~~")	71	SET(defaultDoc "share/docs/sciqlop")
102	ELSE()	72	ELSE()
103	SET(defaultBin "bin")	73	SET(defaultBin "bin")
104	SET(defaultInc "include/~~${PROJECT_PLUGIN_PREFIX}~~")	74	SET(defaultInc "include/sciqlop")
105	SET(defaultLib "lib")	75	SET(defaultLib "lib/sciqlop")
106	SET(defaultPluginsLib "lib/${PROJECT_PLUGIN_PREFIX}")	76	SET(defaultDoc "docs/sciqlop")
107	SET(defaultDoc "docs/${PROJECT_PLUGIN_PREFIX}")
108	ENDIF()	77	ENDIF()
109		78
110	SET(INSTALL_BINARY_DIR "${defaultBin}" CACHE STRING	79	SET(INSTALL_BINARY_DIR "${defaultBin}" CACHE STRING
111	"Installation directory for binaries")	80	"Installation directory for binaries")
112	SET(INSTALL_LIBRARY_DIR "${defaultLib}" CACHE STRING	81	SET(INSTALL_LIBRARY_DIR "${defaultLib}" CACHE STRING
113	"Installation directory for libraries")	82	"Installation directory for libraries")
114	SET(INSTALL_PLUGINS_LIBRARY_DIR "${defaultPluginsLib}" CACHE STRING
115	"Installation directory for libraries")
116	SET(INSTALL_INCLUDE_DIR "${defaultInc}" CACHE STRING	83	SET(INSTALL_INCLUDE_DIR "${defaultInc}" CACHE STRING
117	"Installation directory for headers")	84	"Installation directory for headers")
118	SET(INSTALL_DOCUMENTATION_DIR "${defaultDoc}" CACHE STRING	85	SET(INSTALL_DOCUMENTATION_DIR "${defaultDoc}" CACHE STRING
119	"Installation directory for documentations")	86	"Installation directory for documentations")
120
121
122	# Set the rpath when installing
123	SET(CMAKE_SKIP_BUILD_RPATH FALSE)
124	SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
125	SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${INSTALL_LIBRARY_DIR}")
126	SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
127
128	message("Install RPATH: ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIBRARY_DIR}")

0

core/CMakeLists.txt +6 -21

                     "${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
             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
                             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})
-                                SETUP_TARGET_FOR_COVERAGE(TARGET ${testName}_coverage OUTPUT ${testFile}-path NAME ${testFile} EXECUTABLE ${testName})
+                            LIST( APPEND TARGETS_COV ${testName}_coverage)
-                                LIST( APPEND TARGETS_COV ${testName}_coverage)
-                            endif(UNIX)
                     ENDFOREACH( testFile )

0

core/include/Common/spimpl.h +14 -12

             template <class T, class D, class C>
             struct is_default_manageable
-                : public std::integral_constant<bool, std::is_same<D, default_deleter_t<T> >::value
+                : public std::integral_constant<bool,
-                                                          && std::is_same<C, default_copier_t<T> >::value> {
+                                                std::is_same<D, default_deleter_t<T> >::value
+                                                    && std::is_same<C, default_copier_t<T> >::value> {
             };
             }
                 }
                 template <class U>
-                impl_ptr(U *u, typename std::enable_if<std::is_convertible<U *, pointer>::value
+                impl_ptr(U *u,
-                                                           && is_default_manageable::value,
+                         typename std::enable_if<std::is_convertible<U *, pointer>::value
-                                                       dummy_t_>::type
+                                                     && is_default_manageable::value,
-                               = dummy_t_()) SPIMPL_NOEXCEPT
+                                                 dummy_t_>::type
+                         = dummy_t_()) SPIMPL_NOEXCEPT
                     : impl_ptr(u, &details::default_delete<T>, &details::default_copy<T>)
                 {
                 }
             #ifdef SPIMPL_HAS_AUTO_PTR
                 template <class U>
-                impl_ptr(std::auto_ptr<U> &&u, typename std::enable_if<std::is_convertible<U *, pointer>::value
+                impl_ptr(std::auto_ptr<U> &&u,
-                                                                           && is_default_manageable::value,
+                         typename std::enable_if<std::is_convertible<U *, pointer>::value
-                                                                       dummy_t_>::type
+                                                     && is_default_manageable::value,
-                                               = dummy_t_()) SPIMPL_NOEXCEPT
+                                                 dummy_t_>::type
-                    : ptr_(u.release(), &details::default_delete<T>),
+                         = dummy_t_()) SPIMPL_NOEXCEPT : ptr_(u.release(), &details::default_delete<T>),
-                      copier_(&details::default_copy<T>)
+                                                         copier_(&details::default_copy<T>)
                 {
                 }
             #endif

0

core/include/DataSource/DataSourceController.h +3 -36

             #ifndef SCIQLOP_DATASOURCECONTROLLER_H
             #define SCIQLOP_DATASOURCECONTROLLER_H
-            #include "CoreGlobal.h"
             #include <QLoggingCategory>
             #include <QObject>
             #include <QUuid>
             Q_DECLARE_LOGGING_CATEGORY(LOG_DataSourceController)
             class DataSourceItem;
-            class IDataProvider;
             /**
              * @brief The DataSourceController class aims to make the link between SciQlop and its plugins. This
              * source) then others specifics method will be able to access it. You can load a data source driver
              * plugin then create a data source.
              */
-            class SCIQLOP_CORE_EXPORT DataSourceController : public QObject {
+            class DataSourceController : public QObject {
                 Q_OBJECT
             public:
                 explicit DataSourceController(QObject *parent = 0);
                  * Sets the structure of a data source. The controller takes ownership of the structure.
                  * @param dataSourceUid the unique id with which the data source has been registered into the
                  * controller. If it is invalid, the method has no effect.
-                 * @param dataSourceItem the structure of the data source. It must be not null to be registered
+                 * @param dataSourceItem the structure of the data source
                  * @sa registerDataSource()
                  */
                 void setDataSourceItem(const QUuid &dataSourceUid,
                                        std::unique_ptr<DataSourceItem> dataSourceItem) noexcept;
-                /**
-                 * Sets the data provider used to retrieve data from of a data source. The controller takes
-                 * ownership of the provider.
-                 * @param dataSourceUid the unique id with which the data source has been registered into the
-                 * controller. If it is invalid, the method has no effect.
-                 * @param dataProvider the provider of the data source
-                 * @sa registerDataSource()
-                 */
-                void setDataProvider(const QUuid &dataSourceUid,
-                                     std::unique_ptr<IDataProvider> dataProvider) noexcept;
-                /**
-                 * Loads an item (product) as a variable in SciQlop
-                 * @param dataSourceUid the unique id of the data source containing the item. It is used to get
-                 * the data provider associated to the data source, and pass it to for the variable creation
-                 * @param productItem the item to load
-                 */
-                void loadProductItem(const QUuid &dataSourceUid, const DataSourceItem &productItem) noexcept;
             public slots:
                 /// Manage init/end of the controller
                 void initialize();
             signals:
                 /// Signal emitted when a structure has been set for a data source
-                void dataSourceItemSet(DataSourceItem *dataSourceItem);
+                void dataSourceItemSet(const DataSourceItem &dataSourceItem);
-                /**
-                 * Signal emitted when a variable creation is asked for a product
-                 * @param variableName the name of the variable
-                 * @param variableMetadata the metadata of the variable
-                 * @param variableProvider the provider that will be used to retrieve the data of the variable
-                 * (can be null)
-                 */
-                void variableCreationRequested(const QString &variableName,
-                                               const QVariantHash &variableMetadata,
-                                               std::shared_ptr<IDataProvider> variableProvider);
             private:
                 void waitForFinish();

0

core/include/DataSource/DataSourceItem.h +6 -56

@@ -1,43 +1,20
1	#ifndef SCIQLOP_DATASOURCEITEM_H	1	#ifndef SCIQLOP_DATASOURCEITEM_H
2	#define SCIQLOP_DATASOURCEITEM_H	2	#define SCIQLOP_DATASOURCEITEM_H
3		3
4	#include "CoreGlobal.h"
5
6	#include <Common/spimpl.h>	4	#include <Common/spimpl.h>
7		5
8	#include <QVariant>	6	#include <QVariant>
9	#include <QVector>	7	#include <QVector>
10		8
11	class DataSourceItemAction;
12
13	/**
14	* Possible types of an item
15	*/
16	enum class DataSourceItemType { NODE, PRODUCT, COMPONENT };
17
18	/**	9	/**
19	* @brief The DataSourceItem class aims to represent a structure element of a data source.	10	* @brief The DataSourceItem class aims to represent a structure element of a data source.
20	* A data source has a tree structure that is made up of a main DataSourceItem object (root)	11	* A data source has a tree structure that is made up of a main DataSourceItem object (root)
21	* containing other DataSourceItem objects (children).	12	* containing other DataSourceItem objects (children).
22	* For each DataSourceItem can be associated a set of data representing it.	13	* For each DataSourceItem can be associated a set of data representing it.
23	*/	14	*/
24	class ~~SCIQLOP_CORE_EXPORT~~ DataSourceItem {	15	class DataSourceItem {
25	public:	16	public:
26	/// Key associated with the name of the item	17	explicit DataSourceItem(QVector<QVariant> data = {});
27	static const QString NAME_DATA_KEY;
28
29	explicit DataSourceItem(DataSourceItemType type, const QString &name);
30	explicit DataSourceItem(DataSourceItemType type, QVariantHash data = {});
31
32	/// @return the actions of the item as a vector
33	QVector<DataSourceItemAction *> actions() const noexcept;
34
35	/**
36	* Adds an action to the item. The item takes ownership of the action, and the action is
37	* automatically associated to the item
38	* @param action the action to add
39	*/
40	void addAction(std::unique_ptr<DataSourceItemAction> action) noexcept;
41		18
42	/**	19	/**
43	* Adds a child to the item. The item takes ownership of the child.	20	* Adds a child to the item. The item takes ownership of the child.
@@ -55,18 +32,11 public:
55	int childCount() const noexcept;	32	int childCount() const noexcept;
56		33
57	/**	34	/**
58	* Get the data associated to a ~~key~~	35	* Get the data associated to an index
59	* @param ~~key the key~~ to search	36	* @param dataIndex the index to search
60	* @return the data found if ~~key~~ is valid, default QVariant otherwise	37	* @return the data found if index is valid, default QVariant otherwise
61	*/	38	*/
62	QVariant data(~~cons~~t ~~QString~~ &~~key~~) const noexcept;	39	QVariant data(int dataIndex) const noexcept;
63
64	/// Gets all data
65	QVariantHash data() const noexcept;
66
67	bool isRoot() const noexcept;
68
69	QString name() const noexcept;
70		40
71	/**	41	/**
72	* Get the item's parent	42	* Get the item's parent
@@ -74,26 +44,6 public:
74	*/	44	*/
75	DataSourceItem *parentItem() const noexcept;	45	DataSourceItem *parentItem() const noexcept;
76		46
77	/**
78	* Gets the item's root
79	* @return the top parent, the item itself if it's the root item
80	*/
81	const DataSourceItem &rootItem() const noexcept;
82
83	/**
84	* Sets or appends a value to a key
85	* @param key the key
86	* @param value the value
87	* @param append if true, the value is added to the values already existing for the key,
88	* otherwise it replaces the existing values
89	*/
90	void setData(const QString &key, const QVariant &value, bool append = false) noexcept;
91
92	DataSourceItemType type() const noexcept;
93
94	bool operator==(const DataSourceItem &other);
95	bool operator!=(const DataSourceItem &other);
96
97	private:	47	private:
98	class DataSourceItemPrivate;	48	class DataSourceItemPrivate;
99	spimpl::unique_impl_ptr<DataSourceItemPrivate> impl;	49	spimpl::unique_impl_ptr<DataSourceItemPrivate> impl;

0

core/src/DataSource/DataSourceController.cpp +9 -74

@@ -1,7 +1,5
1	#include "DataSource/DataSourceController.h"	1	#include <DataSource/DataSourceController.h>
2	#include "DataSource/DataSourceItem.h"	2	#include <DataSource/DataSourceItem.h>
3
4	#include <Data/IDataProvider.h>
5		3
6	#include <QMutex>	4	#include <QMutex>
7	#include <QThread>	5	#include <QThread>
@@ -11,28 +9,6
11		9
12	Q_LOGGING_CATEGORY(LOG_DataSourceController, "DataSourceController")	10	Q_LOGGING_CATEGORY(LOG_DataSourceController, "DataSourceController")
13		11
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 {	12	class DataSourceController::DataSourceControllerPrivate {
37	public:	13	public:
38	QMutex m_WorkingMutex;	14	QMutex m_WorkingMutex;
@@ -40,23 +16,19 public:
40	QHash<QUuid, QString> m_DataSources;	16	QHash<QUuid, QString> m_DataSources;
41	/// Data sources structures	17	/// Data sources structures
42	std::map<QUuid, std::unique_ptr<DataSourceItem> > m_DataSourceItems;	18	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	};	19	};
48		20
49	DataSourceController::DataSourceController(QObject *parent)	21	DataSourceController::DataSourceController(QObject *parent)
50	: impl{spimpl::make_unique_impl<DataSourceControllerPrivate>()}	22	: impl{spimpl::make_unique_impl<DataSourceControllerPrivate>()}
51	{	23	{
52	qCDebug(LOG_DataSourceController()) << tr(~~"DataSourceController construction"~~)	24	qCDebug(LOG_DataSourceController())
53	<< QThread::currentThread();	25	<< tr("DataSourceController construction") << QThread::currentThread();
54	}	26	}
55		27
56	DataSourceController::~DataSourceController()	28	DataSourceController::~DataSourceController()
57	{	29	{
58	qCDebug(LOG_DataSourceController()) << tr(~~"DataSourceController destruction"~~)	30	qCDebug(LOG_DataSourceController())
59	<< QThread::currentThread();	31	<< tr("DataSourceController destruction") << QThread::currentThread();
60	this->waitForFinish();	32	this->waitForFinish();
61	}	33	}
62		34
@@ -71,20 +43,13 QUuid DataSourceController::registerDataSource(const QString &dataSourceName) no
71	void DataSourceController::setDataSourceItem(	43	void DataSourceController::setDataSourceItem(
72	const QUuid &dataSourceUid, std::unique_ptr<DataSourceItem> dataSourceItem) noexcept	44	const QUuid &dataSourceUid, std::unique_ptr<DataSourceItem> dataSourceItem) noexcept
73	{	45	{
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)) {	46	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)));	47	impl->m_DataSourceItems.insert(std::make_pair(dataSourceUid, std::move(dataSourceItem)));
83		48
84	// Retrieves the data source item to emit the signal with it	49	// Retrieves the data source item to emit the signal with it
85	auto it = impl->m_DataSourceItems.find(dataSourceUid);	50	auto it = impl->m_DataSourceItems.find(dataSourceUid);
86	if (it != impl->m_DataSourceItems.end()) {	51	if (it != impl->m_DataSourceItems.end()) {
87	emit dataSourceItemSet(it->second.~~get~~());	52	emit dataSourceItemSet(*it->second);
88	}	53	}
89	}	54	}
90	else {	55	else {
@@ -94,40 +59,10 void DataSourceController::setDataSourceItem(
94	}	59	}
95	}	60	}
96		61
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()	62	void DataSourceController::initialize()
128	{	63	{
129	qCDebug(LOG_DataSourceController()) << tr(~~"DataSourceController init"~~)	64	qCDebug(LOG_DataSourceController())
130	<< QThread::currentThread();	65	<< tr("DataSourceController init") << QThread::currentThread();
131	impl->m_WorkingMutex.lock();	66	impl->m_WorkingMutex.lock();
132	qCDebug(LOG_DataSourceController()) << tr("DataSourceController init END");	67	qCDebug(LOG_DataSourceController()) << tr("DataSourceController init END");
133	}	68	}

0

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

@@ -1,47 +1,21
1	#include <DataSource/DataSourceItem.h>	1	#include <DataSource/DataSourceItem.h>
2	#include <DataSource/DataSourceItemAction.h>
3		2
4	#include <QVector>	3	#include <QVector>
5		4
6	const QString DataSourceItem::NAME_DATA_KEY = QStringLiteral("name");
7
8	struct DataSourceItem::DataSourceItemPrivate {	5	struct DataSourceItem::DataSourceItemPrivate {
9	explicit DataSourceItemPrivate(~~DataSourceItemType~~ ~~type~~, ~~QVariantHash~~ data)	6	explicit DataSourceItemPrivate(QVector<QVariant> data)
10	: m_Parent{nullptr}, m_Children{}, ~~m_Type~~{~~type~~}, m_Data{std::move(data)}, ~~m_Actions~~{}	7	: m_Parent{nullptr}, m_Children{}, m_Data{std::move(data)}
11	{	8	{
12	}	9	}
13		10
14	DataSourceItem *m_Parent;	11	DataSourceItem *m_Parent;
15	std::vector<std::unique_ptr<DataSourceItem> > m_Children;	12	std::vector<std::unique_ptr<DataSourceItem> > m_Children;
16	DataSourceItemType m_Type;	13	QVector<QVariant> m_Data;
17	QVariantHash m_Data;
18	std::vector<std::unique_ptr<DataSourceItemAction> > m_Actions;
19	};	14	};
20		15
21	DataSourceItem::DataSourceItem(DataSourceItemType type, const QString &name)	16	DataSourceItem::DataSourceItem(QVector<QVariant> data)
22	: DataSourceItem{type, QVariantHash{{NAME_DATA_KEY, name}}}	17	: impl{spimpl::make_unique_impl<DataSourceItemPrivate>(data)}
23	{
24	}
25
26	DataSourceItem::DataSourceItem(DataSourceItemType type, QVariantHash data)
27	: impl{spimpl::make_unique_impl<DataSourceItemPrivate>(type, std::move(data))}
28	{
29	}
30
31	QVector<DataSourceItemAction *> DataSourceItem::actions() const noexcept
32	{
33	auto result = QVector<DataSourceItemAction *>{};
34
35	std::transform(std::cbegin(impl->m_Actions), std::cend(impl->m_Actions),
36	std::back_inserter(result), [](const auto &action) { return action.get(); });
37
38	return result;
39	}
40
41	void DataSourceItem::addAction(std::unique_ptr<DataSourceItemAction> action) noexcept
42	{	18	{
43	action->setDataSourceItem(this);
44	impl->m_Actions.push_back(std::move(action));
45	}	19	}
46		20
47	void DataSourceItem::appendChild(std::unique_ptr<DataSourceItem> child) noexcept	21	void DataSourceItem::appendChild(std::unique_ptr<DataSourceItem> child) noexcept
@@ -65,81 +39,12 int DataSourceItem::childCount() const noexcept
65	return impl->m_Children.size();	39	return impl->m_Children.size();
66	}	40	}
67		41
68	QVariant DataSourceItem::data(~~cons~~t ~~QString~~ &~~key~~) const noexcept	42	QVariant DataSourceItem::data(int dataIndex) const noexcept
69	{
70	return impl->m_Data.value(key);
71	}
72
73	QVariantHash DataSourceItem::data() const noexcept
74	{	43	{
75	return impl->m_Data;	44	return impl->m_Data.value(dataIndex);
76	}
77
78	bool DataSourceItem::isRoot() const noexcept
79	{
80	return impl->m_Parent == nullptr;
81	}
82
83	QString DataSourceItem::name() const noexcept
84	{
85	return data(NAME_DATA_KEY).toString();
86	}	45	}
87		46
88	DataSourceItem *DataSourceItem::parentItem() const noexcept	47	DataSourceItem *DataSourceItem::parentItem() const noexcept
89	{	48	{
90	return impl->m_Parent;	49	return impl->m_Parent;
91	}	50	}
92
93	const DataSourceItem &DataSourceItem::rootItem() const noexcept
94	{
95	return isRoot() ? *this : parentItem()->rootItem();
96	}
97
98	void DataSourceItem::setData(const QString &key, const QVariant &value, bool append) noexcept
99	{
100	auto it = impl->m_Data.constFind(key);
101	if (append && it != impl->m_Data.constEnd()) {
102	// Case of an existing value to which we want to add to the new value
103	if (it->canConvert<QVariantList>()) {
104	auto variantList = it->value<QVariantList>();
105	variantList.append(value);
106
107	impl->m_Data.insert(key, variantList);
108	}
109	else {
110	impl->m_Data.insert(key, QVariantList{*it, value});
111	}
112	}
113	else {
114	// Other cases :
115	// - new value in map OR
116	// - replacement of an existing value (not appending)
117	impl->m_Data.insert(key, value);
118	}
119	}
120
121	DataSourceItemType DataSourceItem::type() const noexcept
122	{
123	return impl->m_Type;
124	}
125
126	bool DataSourceItem::operator==(const DataSourceItem &other)
127	{
128	// Compares items' attributes
129	if (std::tie(impl->m_Type, impl->m_Data) == std::tie(other.impl->m_Type, other.impl->m_Data)) {
130	// Compares contents of items' children
131	return std::equal(std::cbegin(impl->m_Children), std::cend(impl->m_Children),
132	std::cbegin(other.impl->m_Children),
133	[](const auto &itemChild, const auto &otherChild) {
134	return itemChild == otherChild;
135	});
136	}
137	else {
138	return false;
139	}
140	}
141
142	bool DataSourceItem::operator!=(const DataSourceItem &other)
143	{
144	return !(*this == other);
145	}

0

core/tests/DataSource/TestDataSourceController.cpp +4 -4

                 DataSourceController dataSourceController{};
                 // Spy to test controllers' signals
-                QSignalSpy signalSpy{&dataSourceController, SIGNAL(dataSourceItemSet(DataSourceItem *))};
+                QSignalSpy signalSpy{&dataSourceController, SIGNAL(dataSourceItemSet(const DataSourceItem &))};
                 // Create a data source item
                 auto source1Name = QStringLiteral("Source1");
-                auto source1Item = std::make_unique<DataSourceItem>(DataSourceItemType::PRODUCT, source1Name);
+                auto source1Values = QVector<QVariant>{source1Name};
+                auto source1Item = std::make_unique<DataSourceItem>(std::move(source1Values));
                 // Add data source item to the controller and check that a signal has been emitted after setting
                 // data source item in the controller
                 // Try to a data source item with an unregistered uid and check that no signal has been emitted
                 auto unregisteredUid = QUuid::createUuid();
-                dataSourceController.setDataSourceItem(
+                dataSourceController.setDataSourceItem(unregisteredUid, std::make_unique<DataSourceItem>());
-                    unregisteredUid, std::make_unique<DataSourceItem>(DataSourceItemType::PRODUCT));
                 QCOMPARE(signalSpy.count(), 1);
             }

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

                     clangformat_incr(i)
                 ENDWHILE()
                 # Retrieve source files to format
                 IF(recurse)
                     FILE(GLOB_RECURSE srcs ${globs})
                 # 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)

0

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

@@ -6,14 +6,3
6	# Ignore false positive relative to 'noexcept' keyword	6	# Ignore false positive relative to 'noexcept' keyword
7	.IPSIS_S04_VARIABLE.found: noexcept	7	.IPSIS_S04_VARIABLE.found: noexcept
8	.IPSIS_S06.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 +3 -12

             #
             # Find Qt modules
             #
-            SCIQLOP_FIND_QT(Core Widgets PrintSupport)
+            SCIQLOP_FIND_QT(Core Widgets)
             #
             # Find dependent libraries
             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.
             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)
             #

0

gui/include/SqpApplication.h +1 -10

             #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
                 virtual ~SqpApplication();
                 void initialize();
-                /// Accessors for the differents sciqlop controllers
+                DataSourceController &dataSourceController() const noexcept;
-                DataSourceController &dataSourceController() noexcept;
-                NetworkController &networkController() noexcept;
-                TimeController &timeController() noexcept;
-                VariableController &variableController() noexcept;
-                VisualizationController &visualizationController() noexcept;
             private:
                 class SqpApplicationPrivate;

0

gui/src/SqpApplication.cpp +4 -103

@@ -1,119 +1,40
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() : m_DataSourceController{std::make_unique<DataSourceController>()}
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	{	11	{
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);	12	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	}	13	}
60		14
61	virtual ~SqpApplicationPrivate()	15	virtual ~SqpApplicationPrivate()
62	{	16	{
		17	qCInfo(LOG_SqpApplication()) << tr("SqpApplicationPrivate destruction");
63	m_DataSourceControllerThread.quit();	18	m_DataSourceControllerThread.quit();
64	m_DataSourceControllerThread.wait();	19	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	}	20	}
75		21
76	std::unique_ptr<DataSourceController> m_DataSourceController;	22	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;	23	QThread m_DataSourceControllerThread;
82	QThread m_NetworkControllerThread;
83	QThread m_VariableControllerThread;
84	QThread m_VisualizationControllerThread;
85	};	24	};
86		25
87		26
88	SqpApplication::SqpApplication(int &argc, char **argv)	27	SqpApplication::SqpApplication(int &argc, char **argv)
89	: QApplication{argc, argv}, impl{spimpl::make_unique_impl<SqpApplicationPrivate>()}	28	: QApplication{argc, argv}, impl{spimpl::make_unique_impl<SqpApplicationPrivate>()}
90	{	29	{
91	qC~~Debug~~(LOG_SqpApplication()) << tr("SqpApplication construction") << ~~QThread~~::~~currentThread~~();	30	qCInfo(LOG_SqpApplication()) << tr("SqpApplication construction");
92		31
93	connect(&impl->m_DataSourceControllerThread, &QThread::started,	32	connect(&impl->m_DataSourceControllerThread, &QThread::started,
94	impl->m_DataSourceController.get(), &DataSourceController::initialize);	33	impl->m_DataSourceController.get(), &DataSourceController::initialize);
95	connect(&impl->m_DataSourceControllerThread, &QThread::finished,	34	connect(&impl->m_DataSourceControllerThread, &QThread::finished,
96	impl->m_DataSourceController.get(), &DataSourceController::finalize);	35	impl->m_DataSourceController.get(), &DataSourceController::finalize);
97		36
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();	37	impl->m_DataSourceControllerThread.start();
114	impl->m_NetworkControllerThread.start();
115	impl->m_VariableControllerThread.start();
116	impl->m_VisualizationControllerThread.start();
117	}	38	}
118		39
119	SqpApplication::~SqpApplication()	40	SqpApplication::~SqpApplication()
@@ -124,27 +45,7 void SqpApplication::initialize()
124	{	45	{
125	}	46	}
126		47
127	DataSourceController &SqpApplication::dataSourceController() noexcept	48	DataSourceController &SqpApplication::dataSourceController() const noexcept
128	{	49	{
129	return *impl->m_DataSourceController;	50	return *impl->m_DataSourceController;
130	}	51	}
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

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_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/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/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/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