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

ver	Time	Author	Commit	Description
`latest`	Mon, 29 May 2017 13:04:07	perrinel	`r22:ac81b58d0bc3`	Ajout de la méthode wait pour éviter de détruire un thread en cours d'éxécution
`latest`	Mon, 29 May 2017 12:25:31	perrinel	`r21:45edf6844d32`	Initialisation de l'application multithread avec le spimpl. Ajout du DataSourceController dans un thread dédié.
`latest`	Wed, 24 May 2017 15:47:28	perrinel	`r20:e794669affc9`	Mise à jour de la config pour plus de fonctionnel Changement de sqpXXX vers XXX Ajout des inclusions de dépendances dans les modules Création de la classe sqpapplication et de la classe DataSourceController dans le but de tester les loggers et QTest
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 +104 0

			@@ -0,0 +1,104
		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
		42	MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow)
		43	{
		44	ui->setupUi(this);
		45	/* QLopGUI::registerMenuBar(menuBar());
		46	this->setWindowIcon(QIcon(":/sciqlopLOGO.svg"));
		47	this->m_progressWidget = new QWidget();
		48	this->m_progressLayout = new QVBoxLayout(this->m_progressWidget);
		49	this->m_progressWidget->setLayout(this->m_progressLayout);
		50	this->m_progressWidget->setWindowModality(Qt::WindowModal);
		51	m_progressThreadIds = (int) malloc(OMP_THREADSsizeof(int));
		52	for(int i=0;i<OMP_THREADS;i++)
		53	{
		54	this->m_progress.append(new QProgressBar(this->m_progressWidget));
		55	this->m_progress.last()->setMinimum(0);
		56	this->m_progress.last()->setMaximum(100);
		57	this->m_progressLayout->addWidget(this->m_progress.last());
		58	this->m_progressWidget->hide();
		59	this->m_progressThreadIds[i] = -1;
		60	}
		61	this->m_progressWidget->setWindowTitle("Loading File");
		62	const QList<QLopService>ServicesToLoad=QList<QLopService>()
		63	<< QLopCore::self()
		64	<< QLopPlotManager::self()
		65	<< QLopCodecManager::self()
		66	<< FileDownloader::self()
		67	<< QLopDataBase::self()
		68	<< SpaceData::self();
		69
		70	CDFCodec::registerToManager();
		71	AMDATXTCodec::registerToManager();
		72
		73
		74	for(int i=0;i<ServicesToLoad.count();i++)
		75	{
		76	qDebug()<<ServicesToLoad.at(i)->serviceName();
		77	ServicesToLoad.at(i)->initialize(); //must be called before getGUI
		78	QDockWidget* wdgt=ServicesToLoad.at(i)->getGUI();
		79	if(wdgt)
		80	{
		81	wdgt->setAllowedAreas(Qt::AllDockWidgetAreas);
		82	this->addDockWidget(Qt::TopDockWidgetArea,wdgt);
		83	}
		84	PythonQt::self()->getMainModule().addObject(ServicesToLoad.at(i)->serviceName(),(QObject*)ServicesToLoad.at(i));
		85	}*/
		86	}
		87
		88	MainWindow::~MainWindow()
		89	{
		90	delete ui;
		91	}
		92
		93
		94	void MainWindow::changeEvent(QEvent *e)
		95	{
		96	QMainWindow::changeEvent(e);
		97	switch (e->type()) {
		98	case QEvent::LanguageChange:
		99	ui->retranslateUi(this);
		100	break;
		101	default:
		102	break;
		103	}
		104	}

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%"}
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
	1	TODO No newline at end of file

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

analyzer/launch-clang-analyzer-linux.sh +3 -1

+             QT_PATH=".../Qt/5.8/gcc_64/lib/cmake/"
              export CC=/usr/libexec/ccc-analyzer
              export CXX=/usr/libexec/c++-analyzer
              export CCC_CC=clang
              mkdir build_clang-analyzer
              cd build_clang-analyzer
-             scan-build cmake -DCMAKE_CXX_COMPILER=clazy -DENABLE_ANALYSIS=false -DENABLE_CPPCHECK=false -DENABLE_FORMATTING=false -DENABLE_CHECKSTYLE=false -BUILD_DOCUMENTATION=false -BUILD_TESTS=false -DCMAKE_BUILD_TYPE=Debug ../../SCIQLOP-Initialisation/
+             scan-build cmake -DCMAKE_PREFIX_PATH=$QT_PATH -DCMAKE_CXX_COMPILER=clazy -DENABLE_ANALYSIS=false -DENABLE_CPPCHECK=false -DENABLE_FORMATTING=false -DENABLE_CHECKSTYLE=false -BUILD_DOCUMENTATION=false -BUILD_TESTS=false -DCMAKE_BUILD_TYPE=Debug ../../SCIQLOP-Initialisation/
              scan-build -o clang-analyzer-output make -j2

0

app/CMakeLists.txt +15 -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(UI_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/ui)
+             SET(INCLUDE_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/include)
+             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)
+             message("Librairies inclues dans APP: ${SCIQLOP-GUI_LIBRARIES}")
              SET(LIBRARIES ${SCIQLOP-GUI_LIBRARIES})
              SET(EXTERN_SHARED_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}/*.cpp
-                 ${SOURCES_DIR}/*.h
-                 ${PROJECT_FORMS})
+             	${SOURCES_DIR}/*.h)
+             # 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} )
              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)
              	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)

0

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

              /*-- Author : Alexis Jeandet
              -- Mail : alexis.jeandet@member.fsf.org
              ----------------------------------------------------------------------------*/
-             #include "MainWindow.h"
+             #include "mainwindow.h"
              #include <QProcessEnvironment>
              #include <QThread>
              #include <SqpApplication.h>
+             #include <omp.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};
+                 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
-             -- Copyright (C) 2017, Plasma Physics Laboratory - CNRS
+             -- 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
              /*-- Author : Alexis Jeandet
              -- Mail : alexis.jeandet@member.fsf.org
              ----------------------------------------------------------------------------*/
-             #ifndef SCIQLOP_MAINWINDOW_H
-             #define SCIQLOP_MAINWINDOW_H
+             #ifndef 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;
-                 //    QWidget *m_progressWidget;
-                 //    QVBoxLayout *m_progressLayout;
+                 Ui::MainWindow *ui;
+                 QList<QProgressBar *> m_progress;
+                 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

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

0

cmake/sciqlop_applications.cmake +7 -35

+             #
+             # Sciqlop_modules.cmake
+             #
+             # Set ouptut directories
+             #
+             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(BUILD_TESTS)
-                 INCLUDE ("cmake/sciqlop_code_coverage.cmake")
-                 APPEND_COVERAGE_COMPILER_FLAGS()
-             endif(BUILD_TESTS)
              #
              # 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")
              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)
              INCLUDE ("cmake/sciqlop_formatting.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 +19 -57

              # 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 (DEBUG_SUFFIX "d")
-             ELSE()
-                 MESSAGE (STATUS "Build in Release")
-                 SET (DEBUG_SUFFIX "")
-             ENDIF()
+             #IF(SCIQLOP_BUILD_TYPE MATCHES "Debug")
+             #    MESSAGE (STATUS "Build in Debug")
+             #    SET (CMAKE_BUILD_TYPE "Debug")
+             #    SET (DEBUG_SUFFIX "d")
+             #ELSE()
+             #    MESSAGE (STATUS "Build in Release")
+             #    SET (CMAKE_BUILD_TYPE "Release")
+             #    SET (SCIQLOP_BUILD_TYPE "Release")
+             #    SET (DEBUG_SUFFIX "")
+             #ENDIF()
              #
              # Need to compile tests?
                  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()
              #
              # Generate position independant code (-fPIC)
              SET(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
-             # Configuration for make install
-             set(PROJECT_PLUGIN_PREFIX "SciQlop")
+             #
+             # Configure installation directories
+             #
              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(defaultPluginsLib "lib64/${PROJECT_PLUGIN_PREFIX}")
+                     SET(defaultLib "lib64/sciqlop")
                  ELSE()
-                     SET(defaultLib "lib/")
-                     SET(defaultPluginsLib "lib/${PROJECT_PLUGIN_PREFIX}")
+                     SET(defaultLib "lib/sciqlop")
                  ENDIF()
-                 SET(defaultDoc "share/docs/${PROJECT_PLUGIN_PREFIX}")
+                 SET(defaultDoc "share/docs/sciqlop")
              ELSE()
                  SET(defaultBin "bin")
-                 SET(defaultInc "include/${PROJECT_PLUGIN_PREFIX}")
-                 SET(defaultLib "lib")
-                 SET(defaultPluginsLib "lib/${PROJECT_PLUGIN_PREFIX}")
-                 SET(defaultDoc "docs/${PROJECT_PLUGIN_PREFIX}")
+                 SET(defaultInc "include/sciqlop")
+                 SET(defaultLib "lib/sciqlop")
+                 SET(defaultDoc "docs/sciqlop")
              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 +4 -32

              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)
-             INSTALL(TARGETS ${SQPCORE_LIBRARY_NAME}
-               RUNTIME DESTINATION ${INSTALL_BINARY_DIR}
-               LIBRARY DESTINATION ${INSTALL_LIBRARY_DIR}
-               ARCHIVE DESTINATION ${INSTALL_LIBRARY_DIR}
+             )
+             qt5_use_modules(${SQPCORE_LIBRARY_NAME} Core)
              # 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)
              #
              	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 )
              			${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})

0

core/include/Common/spimpl.h +1 0

              #include <memory>
              #include <type_traits>
              #if defined _MSC_VER && _MSC_VER < 1900 // MS Visual Studio before VS2015
              #define SPIMPL_NO_CPP11_NOEXCEPT
              #define SPIMPL_NO_CPP11_CONSTEXPR

0

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

              #ifndef SCIQLOP_DATASOURCECONTROLLER_H
              #define SCIQLOP_DATASOURCECONTROLLER_H
-             #include "CoreGlobal.h"
+             #include "DataSourceController.h"
              #include <QLoggingCategory>
              #include <QObject>
-             #include <QUuid>
              #include <Common/spimpl.h>
              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
-              * is the intermediate class that SciQlop has to use in the way to connect a data source. Please
-              * first use register method to initialize a plugin specified by its metadata name (JSON plugin
-              * source) then others specifics method will be able to access it. You can load a data source driver
-              * plugin then create a data source.
+              * @brief The DataSourceController class aims to make the link between SciQlop
+              * 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 intialize
+              * a plugin specified by its metadata name (JSON plugin source) then others specifics
+              * method will ba 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);
                  virtual ~DataSourceController();
-                 /**
-                  * Registers a data source. The method delivers a unique id that can be used afterwards to
-                  * access to the data source properties (structure, connection parameters, data provider, etc.)
-                  * @param dataSourceName the name of the data source
-                  * @return the unique id with which the data source has been registered
-                  */
-                 QUuid registerDataSource(const QString &dataSourceName) noexcept;
-                 /**
-                  * 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
-                  * @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();
                  void finalize();
-             signals:
-                 /// Signal emitted when a structure has been set for a data source
-                 void dataSourceItemSet(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/src/DataSource/DataSourceController.cpp +8 -106

              #include "DataSource/DataSourceController.h"
-             #include "DataSource/DataSourceItem.h"
-             #include <Data/IDataProvider.h>
              #include <QMutex>
              #include <QThread>
-             #include <QDir>
-             #include <QStandardPaths>
-             Q_LOGGING_CATEGORY(LOG_DataSourceController, "DataSourceController")
-             namespace {
-             /**
-              * Builds the metadata of the variable that will be generated from the loading of an item
-              * @param dataSourceItem the data source item from which to generate the metadata
-              * @return the metadata of the variable
-              */
-             QVariantHash variableMetadata(const DataSourceItem &dataSourceItem)
+             {
-                 // Variable metadata contains...
-                 // ... all metadata of the item
-                 auto result = dataSourceItem.data();
-                 // ... and the name of the plugin, recovered from root item
-                 result.insert(QStringLiteral("plugin"), dataSourceItem.rootItem().name());
-                 return result;
+             }
-             } // namespace
+             Q_LOGGING_CATEGORY(LOG_DataSourceController, "dataSourceController")
              class DataSourceController::DataSourceControllerPrivate {
              public:
+                 DataSourceControllerPrivate() {}
                  QMutex m_WorkingMutex;
-                 /// Data sources registered
-                 QHash<QUuid, QString> m_DataSources;
-                 /// Data sources structures
-                 std::map<QUuid, std::unique_ptr<DataSourceItem> > m_DataSourceItems;
-                 /// Data providers registered
-                 /// @remarks Data providers are stored as shared_ptr as they can be sent to a variable and
-                 /// continue to live without necessarily the data source controller
-                 std::map<QUuid, std::shared_ptr<IDataProvider> > m_DataProviders;
              };
              DataSourceController::DataSourceController(QObject *parent)
                      : impl{spimpl::make_unique_impl<DataSourceControllerPrivate>()}
              {
-                 qCDebug(LOG_DataSourceController()) << tr("DataSourceController construction")
+                 qCDebug(LOG_DataSourceController()) << tr("Construction du DataSourceController")
                                                      << QThread::currentThread();
              }
              DataSourceController::~DataSourceController()
              {
-                 qCDebug(LOG_DataSourceController()) << tr("DataSourceController destruction")
+                 qCDebug(LOG_DataSourceController()) << tr("Desctruction du DataSourceController")
                                                      << QThread::currentThread();
                  this->waitForFinish();
              }
-             QUuid DataSourceController::registerDataSource(const QString &dataSourceName) noexcept
+             {
-                 auto dataSourceUid = QUuid::createUuid();
-                 impl->m_DataSources.insert(dataSourceUid, dataSourceName);
-                 return dataSourceUid;
+             }
-             void DataSourceController::setDataSourceItem(
-                 const QUuid &dataSourceUid, std::unique_ptr<DataSourceItem> dataSourceItem) noexcept
+             {
-                 if (!dataSourceItem) {
-                     qCWarning(LOG_DataSourceController())
-                         << tr("Data source item can't be registered (null item)");
-                     return;
+                 }
-                 if (impl->m_DataSources.contains(dataSourceUid)) {
-                     // The data provider is implicitly converted to a shared_ptr
-                     impl->m_DataSourceItems.insert(std::make_pair(dataSourceUid, std::move(dataSourceItem)));
-                     // Retrieves the data source item to emit the signal with it
-                     auto it = impl->m_DataSourceItems.find(dataSourceUid);
-                     if (it != impl->m_DataSourceItems.end()) {
-                         emit dataSourceItemSet(it->second.get());
+                     }
+                 }
-                 else {
-                     qCWarning(LOG_DataSourceController()) << tr("Can't set data source item for uid %1 : no "
-                                                                 "data source has been registered with the uid")
-                                                                  .arg(dataSourceUid.toString());
+                 }
+             }
-             void DataSourceController::setDataProvider(const QUuid &dataSourceUid,
-                                                        std::unique_ptr<IDataProvider> dataProvider) noexcept
+             {
-                 if (impl->m_DataSources.contains(dataSourceUid)) {
-                     impl->m_DataProviders.insert(std::make_pair(dataSourceUid, std::move(dataProvider)));
+                 }
-                 else {
-                     qCWarning(LOG_DataSourceController()) << tr("Can't set data provider for uid %1 : no data "
-                                                                 "source has been registered with the uid")
-                                                                  .arg(dataSourceUid.toString());
+                 }
+             }
-             void DataSourceController::loadProductItem(const QUuid &dataSourceUid,
-                                                        const DataSourceItem &productItem) noexcept
+             {
-                 if (productItem.type() == DataSourceItemType::PRODUCT
-                     || productItem.type() == DataSourceItemType::COMPONENT) {
-                     /// Retrieves the data provider of the data source (if any)
-                     auto it = impl->m_DataProviders.find(dataSourceUid);
-                     auto dataProvider = (it != impl->m_DataProviders.end()) ? it->second : nullptr;
-                     emit variableCreationRequested(productItem.name(), variableMetadata(productItem),
-                                                    dataProvider);
+                 }
-                 else {
-                     qCWarning(LOG_DataSourceController()) << tr("Can't load an item that is not a product");
+                 }
+             }
              void DataSourceController::initialize()
              {
-                 qCDebug(LOG_DataSourceController()) << tr("DataSourceController init")
+                 qCDebug(LOG_DataSourceController()) << tr("initialize du DataSourceController")
                                                      << QThread::currentThread();
                  impl->m_WorkingMutex.lock();
-                 qCDebug(LOG_DataSourceController()) << tr("DataSourceController init END");
+                 qCDebug(LOG_DataSourceController()) << tr("initialize du DataSourceController END");
              }
              void DataSourceController::finalize()
              void DataSourceController::waitForFinish()
              {
-                 QMutexLocker locker{&impl->m_WorkingMutex};
+                 QMutexLocker locker(&impl->m_WorkingMutex);
              }

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

gui/CMakeLists.txt +5 -15

              #
              # Find Qt modules
              #
-             SCIQLOP_FIND_QT(Core Widgets PrintSupport)
+             SCIQLOP_FIND_QT(Core Widgets)
              #
              # Find dependent libraries
              # ========================
              find_package(sciqlop-core)
+             message("Librairies inclues dans APP: ${SCIQLOP-CORE_LIBRARIES}")
              SET(LIBRARIES ${SCIQLOP-CORE_LIBRARIES})
              INCLUDE_DIRECTORIES(${SCIQLOP-CORE_INCLUDE_DIR})
              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)
-             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})
+             qt5_use_modules(${SQPGUI_LIBRARY_NAME} Core Widgets)
              # 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)
              #
                                      ${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)

0

gui/include/SqpApplication.h +3 -22

              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
-              * in the way to connect a data source. Please first use load method to initialize
+              * 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 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:
                  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;

0

gui/src/SqpApplication.cpp +9 -113

              #include "SqpApplication.h"
-             #include <Data/IDataProvider.h>
              #include <DataSource/DataSourceController.h>
-             #include <Network/NetworkController.h>
              #include <QThread>
-             #include <Time/TimeController.h>
-             #include <Variable/Variable.h>
-             #include <Variable/VariableController.h>
-             #include <Visualization/VisualizationController.h>
              Q_LOGGING_CATEGORY(LOG_SqpApplication, "SqpApplication")
              class SqpApplication::SqpApplicationPrivate {
              public:
-                 SqpApplicationPrivate()
-                         : m_DataSourceController{std::make_unique<DataSourceController>()},
-                           m_NetworkController{std::make_unique<NetworkController>()},
-                           m_TimeController{std::make_unique<TimeController>()},
-                           m_VariableController{std::make_unique<VariableController>()},
-                           m_VisualizationController{std::make_unique<VisualizationController>()}
+                 {
-                     // /////////////////////////////// //
-                     // Connections between controllers //
-                     // /////////////////////////////// //
-                     // VariableController <-> DataSourceController
-                     connect(m_DataSourceController.get(),
-                             SIGNAL(variableCreationRequested(const QString &, const QVariantHash &,
-                                                              std::shared_ptr<IDataProvider>)),
-                             m_VariableController.get(),
-                             SLOT(createVariable(const QString &, const QVariantHash &,
-                                                 std::shared_ptr<IDataProvider>)));
-                     // VariableController <-> VisualizationController
-                     connect(m_VariableController.get(),
-                             SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable>)),
-                             m_VisualizationController.get(),
-                             SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable>)), Qt::DirectConnection);
-                     connect(m_VariableController.get(),
-                             SIGNAL(rangeChanged(std::shared_ptr<Variable>, const SqpRange &)),
-                             m_VisualizationController.get(),
-                             SIGNAL(rangeChanged(std::shared_ptr<Variable>, const SqpRange &)));
-                     m_DataSourceController->moveToThread(&m_DataSourceControllerThread);
-                     m_DataSourceControllerThread.setObjectName("DataSourceControllerThread");
-                     m_NetworkController->moveToThread(&m_NetworkControllerThread);
-                     m_NetworkControllerThread.setObjectName("NetworkControllerThread");
-                     m_VariableController->moveToThread(&m_VariableControllerThread);
-                     m_VariableControllerThread.setObjectName("VariableControllerThread");
-                     m_VisualizationController->moveToThread(&m_VisualizationControllerThread);
-                     m_VisualizationControllerThread.setObjectName("VsualizationControllerThread");
-                     // Additionnal init
-                     m_VariableController->setTimeController(m_TimeController.get());
+                 }
-                 virtual ~SqpApplicationPrivate()
+                 SqpApplicationPrivate() {}
+                 ~SqpApplicationPrivate()
                  {
+                     qCInfo(LOG_SqpApplication()) << tr("Desctruction du SqpApplicationPrivate");
+                     ;
                      m_DataSourceControllerThread.quit();
                      m_DataSourceControllerThread.wait();
-                     m_NetworkControllerThread.quit();
-                     m_NetworkControllerThread.wait();
-                     m_VariableControllerThread.quit();
-                     m_VariableControllerThread.wait();
-                     m_VisualizationControllerThread.quit();
-                     m_VisualizationControllerThread.wait();
                  }
                  std::unique_ptr<DataSourceController> m_DataSourceController;
-                 std::unique_ptr<VariableController> m_VariableController;
-                 std::unique_ptr<TimeController> m_TimeController;
-                 std::unique_ptr<NetworkController> m_NetworkController;
-                 std::unique_ptr<VisualizationController> m_VisualizationController;
                  QThread m_DataSourceControllerThread;
-                 QThread m_NetworkControllerThread;
-                 QThread m_VariableControllerThread;
-                 QThread m_VisualizationControllerThread;
              };
              SqpApplication::SqpApplication(int &argc, char **argv)
-                     : QApplication{argc, argv}, impl{spimpl::make_unique_impl<SqpApplicationPrivate>()}
+                     : QApplication(argc, argv), impl{spimpl::make_unique_impl<SqpApplicationPrivate>()}
              {
-                 qCDebug(LOG_SqpApplication()) << tr("SqpApplication construction") << QThread::currentThread();
+                 qCInfo(LOG_SqpApplication()) << tr("Construction du SqpApplication");
+                 impl->m_DataSourceController = std::make_unique<DataSourceController>();
+                 impl->m_DataSourceController->moveToThread(&impl->m_DataSourceControllerThread);
                  connect(&impl->m_DataSourceControllerThread, &QThread::started,
                          impl->m_DataSourceController.get(), &DataSourceController::initialize);
                  connect(&impl->m_DataSourceControllerThread, &QThread::finished,
                          impl->m_DataSourceController.get(), &DataSourceController::finalize);
-                 connect(&impl->m_NetworkControllerThread, &QThread::started, impl->m_NetworkController.get(),
-                         &NetworkController::initialize);
-                 connect(&impl->m_NetworkControllerThread, &QThread::finished, impl->m_NetworkController.get(),
-                         &NetworkController::finalize);
-                 connect(&impl->m_VariableControllerThread, &QThread::started, impl->m_VariableController.get(),
-                         &VariableController::initialize);
-                 connect(&impl->m_VariableControllerThread, &QThread::finished, impl->m_VariableController.get(),
-                         &VariableController::finalize);
-                 connect(&impl->m_VisualizationControllerThread, &QThread::started,
-                         impl->m_VisualizationController.get(), &VisualizationController::initialize);
-                 connect(&impl->m_VisualizationControllerThread, &QThread::finished,
-                         impl->m_VisualizationController.get(), &VisualizationController::finalize);
                  impl->m_DataSourceControllerThread.start();
-                 impl->m_NetworkControllerThread.start();
-                 impl->m_VariableControllerThread.start();
-                 impl->m_VisualizationControllerThread.start();
              }
              SqpApplication::~SqpApplication()
              void SqpApplication::initialize()
              {
              }
-             DataSourceController &SqpApplication::dataSourceController() noexcept
+             {
-                 return *impl->m_DataSourceController;
+             }
-             NetworkController &SqpApplication::networkController() noexcept
+             {
-                 return *impl->m_NetworkController;
+             }
-             TimeController &SqpApplication::timeController() noexcept
+             {
-                 return *impl->m_TimeController;
+             }
-             VariableController &SqpApplication::variableController() noexcept
+             {
-                 return *impl->m_VariableController;
+             }
-             VisualizationController &SqpApplication::visualizationController() noexcept
+             {
-                 return *impl->m_VisualizationController;
+             }

0

COPYING removed 0 -674

	1		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

config/QtProject/qtlogging.ini removed 0 -4

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

core/vera-exclusions/exclusions.txt removed 0 -52

1

NO CONTENT: file was removed

0

formatting/vera-exclusions/exclusions.txt removed 0 -19

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

		Pull request merged and closed
		Status change > Approved
		ok
		Auto status change to \|new_status\|...

	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