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

ver	Time	Author	Commit	Description
`latest`	Tue, 23 May 2017 09:09:05	perrinel	`r15:d6d94ce44ebc`	Mise en commentaire de omp
`latest`	Tue, 23 May 2017 08:58:21	mperrinel	`r14:5bce99742c6f`	Initialisation de la configuration Linux
2 commits hidden, click expand to show them.

0

LICENSE created 644 +1 0

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

0

cmake/compiler/compiler_gnu.cmake created 644 +18 0

@@ -0,0 +1,18
	1	#
	2	# compiler_gnu.cmake : specific configuration for GNU compilers
	3	#
	4
	5	# Set the flag -Wall to activate all warnings
	6	IF (${CMAKE_BUILD_TYPE} STREQUAL Debug)
	7	SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -std=c++14")
	8	SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall")
	9
	10	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}")
	11	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_DEBUG}")
	12	ELSE()
	13	SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wall -O2 -std=c++14")
	14	SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Wall -O2")
	15
	16	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}")
	17	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_RELEASE}")
	18	ENDIF()

0

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

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

@@ -0,0 +1,56
	1	<?xml version="1.0" encoding="UTF-8"?>
	2	<ui version="4.0">
	3	<class>MainWindow</class>
	4	<widget class="QMainWindow" name="MainWindow">
	5	<property name="geometry">
	6	<rect>
	7	<x>0</x>
	8	<y>0</y>
	9	<width>800</width>
	10	<height>600</height>
	11	</rect>
	12	</property>
	13	<property name="windowTitle">
	14	<string>QLop</string>
	15	</property>
	16	<property name="dockNestingEnabled">
	17	<bool>true</bool>
	18	</property>
	19	<widget class="QWidget" name="centralWidget">
	20	<property name="enabled">
	21	<bool>true</bool>
	22	</property>
	23	<property name="sizePolicy">
	24	<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
	25	<horstretch>0</horstretch>
	26	<verstretch>0</verstretch>
	27	</sizepolicy>
	28	</property>
	29	<property name="maximumSize">
	30	<size>
	31	<width>16777215</width>
	32	<height>16777215</height>
	33	</size>
	34	</property>
	35	</widget>
	36	<widget class="QMenuBar" name="menuBar">
	37	<property name="geometry">
	38	<rect>
	39	<x>0</x>
	40	<y>0</y>
	41	<width>800</width>
	42	<height>45</height>
	43	</rect>
	44	</property>
	45	</widget>
	46	<widget class="QStatusBar" name="statusBar"/>
	47	<action name="actionIndex_Viewer">
	48	<property name="text">
	49	<string>Index Viewer</string>
	50	</property>
	51	</action>
	52	</widget>
	53	<layoutdefault spacing="6" margin="11"/>
	54	<resources/>
	55	<connections/>
	56	</ui>

0

.gitignore 0 -2

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

0

README.md +1 -31

@@ -1,31 +1,1
1	![](gui/resources/icones/sciqlop2PNG_1024.png){:.some-css-class style="width: 20%"}	1	TODO No newline at end of file
2
3
4	# Overview
5
6	SciQLOP (SCIentific Qt application for Learning from Observations of Plasmas) aims to be an ergonomic
7	and powerful tool enabling visualization and analysis of in-situ space plasma data. This goal rises some
8	challenges either technical and in the conception and the design.
9	The time resolution allowed by nowadays measurements imply the ability to plot millions of points just for
10	one sensor with no compromise on interactivity. Plots may stay responsive even with millions of points.
11	Being able to scroll, zoom, move and export the plots with the mouse are the minimal interactions expected by the user.
12	SciQLOP may also abstract the manipulation of physic data while providing contextual features such as
13	coordinate transform, physical quantity extraction from data.
14	That said increasing graphical features usually lead to slower software and more complex GUI. Keeping
15	SciQLOP lightweight and intuitive is one of the priorities to make it usable and competitive.
16
17
18	## How to build
19
20	```
21	git clone https://hephaistos.lpp.polytechnique.fr/rhodecode/HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop
22	cd SciQLop
23	mkdir build && cd build
24	cmake ../
25	make
26
27	```
28
29	## How to contribute
30
31	Contact sciqlop@lpp.polytechnique.fr

0

SciQlopEnv.bat +1 -2

             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

cmake/compiler/compiler.cmake +4 -4

             # compiler.cmake : configure the compilation flags
             #
             message("Compiler id: ${CMAKE_CXX_COMPILER_ID}")
             IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-                MESSAGE("Compiler supported")
+            	INCLUDE("cmake/compiler/compiler_gnu.cmake")
             ELSEIF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-                MESSAGE("Compiler supported")
+            	INCLUDE("cmake/compiler/compiler_gnu.cmake")
             ELSEIF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-                    INCLUDE("cmake/compiler/compiler_msvc.cmake")
+            	INCLUDE("cmake/compiler/compiler_msvc.cmake")
             ELSE()
                MESSAGE(FATAL_ERROR "Compiler not supported")
             ENDIF()

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 +17 -43

@@ -1,56 +1,30
1
2	if(BUILD_TESTS)
3	INCLUDE ("cmake/sciqlop_code_coverage.cmake")
4	APPEND_COVERAGE_COMPILER_FLAGS()
5	endif(BUILD_TESTS)
6
7	#	1	#
8	# Compile the diffents modules	2	# Sciqlop_modules.cmake
9	#	3	#
10	set(sciqlop-plugin_DIR "${CMAKE_SOURCE_DIR}/plugin/cmake")	4	# Set ouptut directories
11	set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${sciqlop-plugin_DIR}")	5	#
12	ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/plugin")	6	SET (EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/${CMAKE_BUILD_TYPE})
13		7	SET (LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/${CMAKE_BUILD_TYPE})
14	set(sciqlop-core_DIR "${CMAKE_SOURCE_DIR}/core/cmake")
15	set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${sciqlop-core_DIR}")
16	ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/core")
17
18	set(sciqlop-gui_DIR "${CMAKE_SOURCE_DIR}/gui/cmake")
19	set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${sciqlop-gui_DIR}")
20	ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/gui")
21
22	ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/app")
23
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		8
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		9
34	# Temporary target to copy to plugins dir	10	#
35	find_package(sciqlop-mockplugin)	11	# Compile the core
36	find_package(sciqlop-amda)	12	#
37	ADD_CUSTOM_TARGET(plugins	13	ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/sqpcore")
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		14
43	# LOGGER	15	#
44	set(QTLOGGING_INI_FILE "${CMAKE_SOURCE_DIR}/config/QtProject/qtlogging.ini")	16	# Compile the gui
45	FILE(COPY ${QTLOGGING_INI_FILE} DESTINATION ${CONFIG_OUTPUT_PATH})	17	#
		18	#ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/sqpgui")
46		19
		20	#
		21	# Compile the app
		22	#
		23	ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/sqpapp")
47		24
48	#	25	#
49	# Code formatting	26	# Code formatting
50	#	27	#
51	# Vera++ exclusion files
52	LIST(APPEND CHECKSTYLE_EXCLUSION_FILES ${CMAKE_CURRENT_SOURCE_DIR}/formatting/vera-exclusions/exclusions.txt)
53	#SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_EXCLUSION_FILES)
54	INCLUDE ("cmake/sciqlop_formatting.cmake")	28	INCLUDE ("cmake/sciqlop_formatting.cmake")
55		29
56	#	30	#

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 +15 -53

             # Debug or release
             #
             # As the "NMake Makefiles" forces by default the CMAKE_BUILD_TYPE variable to Debug, SCIQLOP_BUILD_TYPE variable is used to be sure that the debug mode is a user choice
-            #SET(SCIQLOP_BUILD_TYPE "Release" CACHE STRING "Choose to compile in Debug or Release mode")
+            SET(SCIQLOP_BUILD_TYPE "Release" CACHE STRING "Choose to compile in Debug or Release mode")
-            IF(CMAKE_BUILD_TYPE MATCHES "Debug")
+            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()
                 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)
+            #
+            # Configure installation directories
-            # Configuration for make install
-            set(PROJECT_PLUGIN_PREFIX "SciQlop")
             IF (UNIX)
-                SET(CMAKE_INSTALL_PREFIX "/usr/local/${PROJECT_PLUGIN_PREFIX}")
                 SET(defaultBin "bin")
                 SET(defaultInc "include/sciqlop")
                 # 32 or 64 bits compiler
                 IF( CMAKE_SIZEOF_VOID_P EQUAL 8 )
-                    SET(defaultLib "lib64")
+                    SET(defaultLib "lib64/sciqlop")
-                    SET(defaultPluginsLib "lib64/${PROJECT_PLUGIN_PREFIX}")
                 ELSE()
-                    SET(defaultLib "lib/")
+                    SET(defaultLib "lib/sciqlop")
-                    SET(defaultPluginsLib "lib/${PROJECT_PLUGIN_PREFIX}")
                 ENDIF()
-                SET(defaultDoc "share/docs/${PROJECT_PLUGIN_PREFIX}")
+                SET(defaultDoc "share/docs/sciqlop")
             ELSE()
                 SET(defaultBin "bin")
-                SET(defaultInc "include/${PROJECT_PLUGIN_PREFIX}")
+                SET(defaultInc "include/sciqlop")
-                SET(defaultLib "lib")
+                SET(defaultLib "lib/sciqlop")
-                SET(defaultPluginsLib "lib/${PROJECT_PLUGIN_PREFIX}")
+                SET(defaultDoc "docs/sciqlop")
-                SET(defaultDoc "docs/${PROJECT_PLUGIN_PREFIX}")
             ENDIF()
             SET(INSTALL_BINARY_DIR "${defaultBin}" CACHE STRING
                 "Installation directory for binaries")
             SET(INSTALL_LIBRARY_DIR "${defaultLib}" CACHE STRING
                 "Installation directory for libraries")
-            SET(INSTALL_PLUGINS_LIBRARY_DIR "${defaultPluginsLib}" CACHE STRING
-                "Installation directory for libraries")
             SET(INSTALL_INCLUDE_DIR "${defaultInc}" CACHE STRING
                 "Installation directory for headers")
             SET(INSTALL_DOCUMENTATION_DIR "${defaultDoc}" CACHE STRING
                 "Installation directory for documentations")
-            # Set the rpath when installing
-            SET(CMAKE_SKIP_BUILD_RPATH FALSE)
-            SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-            SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${INSTALL_LIBRARY_DIR}")
-            SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-            message("Install RPATH: ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIBRARY_DIR}")

0

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

sqpapp/CMakeLists.txt ~~app/CMakeLists.txt~~ renamed +25 -41

             ## sciqlop - CMakeLists.txt
             SET(EXECUTABLE_NAME "sciqlop")
-            SCIQLOP_SET_TO_PARENT_SCOPE(EXECUTABLE_NAME)
             SET(SOURCES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/)
-            SET(INCLUDES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include")
+            SET(INCLUDE_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/include)
-            SET(UI_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/ui)
+            SET(UI_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/src)
             SET(RES_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/resources)
-            # Include gui directory
-            include_directories("${INCLUDES_DIR}")
             #
             # Find Qt modules
             #
             SCIQLOP_FIND_QT(Core Widgets)
             #
             # Find dependent libraries
             # ========================
-            find_package(sciqlop-gui)
+            SET(LIBRARIES)
+            SET(EXTERN_LIBRARIES)
-            SET(LIBRARIES ${SCIQLOP-GUI_LIBRARIES})
             SET(EXTERN_SHARED_LIBRARIES)
-            INCLUDE_DIRECTORIES(${SCIQLOP-GUI_INCLUDE_DIR})
             # Add sqpcore to the list of libraries to use
             list(APPEND LIBRARIES ${SQPCORE_LIBRARY_NAME})
-            # Include core directory
+            # Include sqpcore directory
-            include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../core/include")
+            include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../sqpcore/src")
             # Add dependent shared libraries
             list(APPEND SHARED_LIBRARIES ${SQPCORE_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}/*.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} )
             ADD_EXECUTABLE(${EXECUTABLE_NAME} ${APPLICATION_SOURCES} ${RCC_HDRS} ${UIS_HDRS})
-            set_property(TARGET ${EXECUTABLE_NAME} PROPERTY CXX_STANDARD 14)
-            set_property(TARGET ${EXECUTABLE_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
             target_link_libraries(${EXECUTABLE_NAME}
                 ${LIBRARIES})
-            INSTALL(TARGETS ${EXECUTABLE_NAME}
-              RUNTIME DESTINATION ${INSTALL_BINARY_DIR}
-              LIBRARY DESTINATION ${INSTALL_BINARY_DIR}
-              ARCHIVE DESTINATION ${INSTALL_BINARY_DIR}
             # Link with Qt5 modules
             qt5_use_modules(${EXECUTABLE_NAME} Core Widgets)
-            add_dependencies(${EXECUTABLE_NAME} ${SQPGUI_LIBRARY_NAME} ${SQPCORE_LIBRARY_NAME})
             # Add the files to the list of files to be analyzed
             LIST(APPEND CHECKSTYLE_INPUT_FILES ${APPLICATION_SOURCES})
             SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_INPUT_FILES)
             # Vera++ exclusion files
-            LIST(APPEND CHECKSTYLE_EXCLUSION_FILES ${CMAKE_CURRENT_SOURCE_DIR}/vera-exclusions/exclusions.txt)
+            #LIST(APPEND CHECKSTYLE_EXCLUSION_FILES ${CMAKE_CURRENT_SOURCE_DIR}/path/to/exclusionFiles.tcl)
             SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_EXCLUSION_FILES)
             #
             # Compile the tests
             #
             IF(BUILD_TESTS)
             	INCLUDE_DIRECTORIES(${SOURCES_DIR})
             	FILE (GLOB_RECURSE TESTS_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Test*.cpp)
             	FILE (GLOB_RECURSE TESTS_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/Test*.h)
-                    SET( TEST_LIBRARIES ${LIBRARIES})
+            	SET( TEST_LIBRARIES ${LIBRARIES} ${EXTERN_LIBRARIES})
             	FOREACH( testFile ${TESTS_SOURCES} )
             		GET_FILENAME_COMPONENT( testDirectory ${testFile} DIRECTORY )
-                            GET_FILENAME_COMPONENT( testName ${testFile} NAME_WE )
+            		GET_FILENAME_COMPONENT( testName ${testFile} NAME_WE )
             		# Add to the list of sources files all the sources in the same
             		# directory that aren't another test
             		LIST (REMOVE_ITEM currentTestSources ${TESTS_HEADERS})
             		ADD_EXECUTABLE(${testName} ${testFile} ${currentTestSources})
-                            TARGET_LINK_LIBRARIES( ${testName} ${TEST_LIBRARIES})
+            		TARGET_LINK_LIBRARIES( ${testName} ${TEST_LIBRARIES} )
             		qt5_use_modules(${testName} Test)
             		ADD_TEST( NAME ${testName} COMMAND ${testName} )
-                            SCIQLOP_COPY_TO_TARGET(RUNTIME ${testName})
+                            SCIQLOP_COPY_TO_TARGET(RUNTIME ${testName} ${EXTERN_SHARED_LIBRARIES})
             	ENDFOREACH( testFile )
             	LIST(APPEND testFilesToFormat ${TESTS_SOURCES})
             	LIST(APPEND testFilesToFormat ${TESTS_HEADERS})
             	LIST(APPEND FORMATTING_INPUT_FILES ${testFilesToFormat})
                     SCIQLOP_SET_TO_PARENT_SCOPE(FORMATTING_INPUT_FILES)
             ENDIF(BUILD_TESTS)

0

sqpapp/resources/qlopapp.qrc ~~app/resources/qlopapp.qrc~~ renamed 0 0

1

NO CONTENT: file renamed from app/resources/qlopapp.qrc to sqpapp/resources/qlopapp.qrc

0

sqpapp/resources/sciqlopLOGO.svg ~~app/resources/sciqlopLOGO.svg~~ renamed 0 0

1

NO CONTENT: file renamed from app/resources/sciqlopLOGO.svg to sqpapp/resources/sciqlopLOGO.svg

0

sqpapp/src/main.cpp ~~app/src/Main.cpp~~ renamed +7 -48

@@ -19,62 +19,21
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 <QApplication>
23	#include <QProcessEnvironment>	24	#include <QProcessEnvironment>
24	#include <QThread>	25	#include <QThread>
25	#include <~~SqpApplication~~.h>	26	//#include <omp.h>
26	#include <qglobal.h>	27	#include <qglobal.h>
27		28
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[])	29	int main(int argc, char *argv[])
43	{	30	{
44	~~Sqp~~Application a{argc, argv};	31	QApplication a(argc, argv);
45	~~Sqp~~Application::setOrganizationName("LPP");	32	QApplication::setOrganizationName("LPP");
46	~~Sqp~~Application::setOrganizationDomain("lpp.fr");	33	QApplication::setOrganizationDomain("lpp.fr");
47	~~Sqp~~Application::setApplicationName("SciQLop");	34	QApplication::setApplicationName("SciQLop");
48	MainWindow w;	35	MainWindow w;
49	w.show();	36	w.show();
50		37
51	// Loads plugins
52	auto pluginDir = QDir{a.applicationDirPath()};
53	auto pluginLookupPath = {
54	a.applicationDirPath(),
55	a.applicationDirPath() + "/" + PLUGIN_DIRECTORY_NAME,
56	a.applicationDirPath() + "/../lib64/SciQlop",
57	a.applicationDirPath() + "/../lib64/sciqlop",
58	a.applicationDirPath() + "/../lib/SciQlop",
59	a.applicationDirPath() + "/../lib/sciqlop",
60	a.applicationDirPath() + "/../plugins",
61	};
62
63	#if _WIN32 \|\| _WIN64
64	pluginDir.mkdir(PLUGIN_DIRECTORY_NAME);
65	pluginDir.cd(PLUGIN_DIRECTORY_NAME);
66	#endif
67
68	PluginManager pluginManager{};
69
70	for (auto &&path : pluginLookupPath) {
71	QDir directory{path};
72	if (directory.exists()) {
73	qCDebug(LOG_Main())
74	<< QObject::tr("Plugin directory: %1").arg(directory.absolutePath());
75	pluginManager.loadPlugins(directory);
76	}
77	}
78
79	return a.exec();	38	return a.exec();
80	}	39	}

0

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

sqpcore/CMakeLists.txt ~~core/CMakeLists.txt~~ renamed +21 -56

-            ## core - CMakeLists.txt
+            ## sqpcore - CMakeLists.txt
             STRING(TOLOWER ${CMAKE_PROJECT_NAME} LIBRARY_PREFFIX)
-            SET(SQPCORE_LIBRARY_NAME "${LIBRARY_PREFFIX}_core${DEBUG_SUFFIX}")
+            SET(SQPCORE_LIBRARY_NAME "${LIBRARY_PREFFIX}_sqpcore${DEBUG_SUFFIX}")
             SET(SOURCES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/")
-            SET(INCLUDES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include/")
-            # Include core directory
-            include_directories("${INCLUDES_DIR}")
             # Set a variable to display a warning in the version files.
             SET(SCIQLOP_CMAKE_GENERATION_WARNING "DON'T CHANGE THIS FILE. AUTOGENERATED BY CMAKE.")
             # Generate the version file from the cmake version variables. The version
             # variables are defined in the cmake/sciqlop_version.cmake file.
             CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/resources/Version.h.in"
-                    "${INCLUDES_DIR}/Version.h")
+            	"${SOURCES_DIR}/Version.h")
             CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/resources/Version.cpp.in"
             	"${SOURCES_DIR}/Version.cpp")
-            # Find dependent modules
-            find_package(sciqlop-plugin)
-            INCLUDE_DIRECTORIES(${SCIQLOP-PLUGIN_INCLUDE_DIR})
             #
             # Find Qt modules
             #
-            SCIQLOP_FIND_QT(Core Network)
+            SCIQLOP_FIND_QT(Core)
             #
             # Compile the library library
             #
-            ADD_DEFINITIONS(-DCORE_LIB)
             FILE (GLOB_RECURSE MODULE_SOURCES
-                    ${INCLUDES_DIR}/*.h
+            	${SOURCES_DIR}/*.c
-                    ${SOURCES_DIR}/*.c
+            	${SOURCES_DIR}/*.cpp
-                    ${SOURCES_DIR}/*.cpp
             	${SOURCES_DIR}/*.h)
             ADD_LIBRARY(${SQPCORE_LIBRARY_NAME} ${MODULE_SOURCES})
-            set_property(TARGET ${SQPCORE_LIBRARY_NAME} PROPERTY CXX_STANDARD 14)
+            TARGET_LINK_LIBRARIES(${SQPCORE_LIBRARY_NAME} ${EXTERN_LIBRARIES})
-            set_property(TARGET ${SQPCORE_LIBRARY_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
+            qt5_use_modules(${SQPCORE_LIBRARY_NAME} Core)
-            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}
             # 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
             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)
             #
             	INCLUDE_DIRECTORIES(${SOURCES_DIR})
             	FILE (GLOB_RECURSE TESTS_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Test*.cpp)
             	FILE (GLOB_RECURSE TESTS_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/Test*.h)
-                    SET( TEST_LIBRARIES ${SQPCORE_LIBRARY_NAME})
+                    SET( TEST_LIBRARIES ${SQPCORE_LIBRARY_NAME} ${EXTERN_LIBRARIES})
-                    SET(TARGETS_COV)
             	FOREACH( testFile ${TESTS_SOURCES} )
-                            GET_FILENAME_COMPONENT( testDirectory ${testFile} DIRECTORY )
+            		GET_FILENAME_COMPONENT( testDirectory ${testFile} DIRECTORY )
             		GET_FILENAME_COMPONENT( testName ${testFile} NAME_WE )
             		# Add to the list of sources files all the sources in the same
             		FILE (GLOB currentTestSources
             			${testDirectory}/*.c
             			${testDirectory}/*.cpp
-                                    ${testDirectory}/*.h)
+            			${testDirectory}/*.h)
-                            LIST (REMOVE_ITEM currentTestSources ${TESTS_SOURCES})
+            		LIST (REMOVE_ITEM currentTestSources ${TESTS_SOURCES})
-                            # LIST (REMOVE_ITEM currentTestSources ${TESTS_HEADERS})
+            		LIST (REMOVE_ITEM currentTestSources ${TESTS_HEADERS})
-                            ADD_EXECUTABLE(${testName} ${testFile} ${currentTestSources})
+            		ADD_EXECUTABLE(${testName} ${testFile} ${currentTestSources})
-                            set_property(TARGET ${testName} PROPERTY CXX_STANDARD 14)
+            		TARGET_LINK_LIBRARIES( ${testName} ${TEST_LIBRARIES} )
-                            set_property(TARGET ${testName} PROPERTY CXX_STANDARD_REQUIRED ON)
+            		qt5_use_modules(${testName} Test)
-                            TARGET_LINK_LIBRARIES( ${testName} ${TEST_LIBRARIES} )
-                            qt5_use_modules(${testName} Test)
-                            ADD_TEST( NAME ${testName} COMMAND ${testName} )
+            		ADD_TEST( NAME ${testName} COMMAND ${testName} )
                             SCIQLOP_COPY_TO_TARGET(RUNTIME ${testName} ${EXTERN_SHARED_LIBRARIES})
-                            set(Coverage_NAME ${testName})
+            	ENDFOREACH( testFile )
-                            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})

0

sqpcore/resources/Version.cpp.in ~~core/resources/Version.cpp.in~~ renamed 0 0

1

NO CONTENT: file renamed from core/resources/Version.cpp.in to sqpcore/resources/Version.cpp.in

0

sqpcore/resources/Version.h.in ~~core/resources/Version.h.in~~ renamed 0 0

1

NO CONTENT: file renamed from core/resources/Version.h.in to sqpcore/resources/Version.h.in

0

sqpgui/CMakeLists.txt ~~gui/CMakeLists.txt~~ renamed +59 -90

@@ -1,39 +1,30
1		1
2	## gui - CMakeLists.txt	2	## sqpgui - CMakeLists.txt
3	STRING(TOLOWER ${CMAKE_PROJECT_NAME} LIBRARY_PREFFIX)	3	STRING(TOLOWER ${CMAKE_PROJECT_NAME} LIBRARY_PREFFIX)
4	SET(SQPGUI_LIBRARY_NAME "${LIBRARY_PREFFIX}_gui${DEBUG_SUFFIX}")	4	SET(SQPGUI_LIBRARY_NAME "${LIBRARY_PREFFIX}_sqpgui${DEBUG_SUFFIX}")
5	SET(SOURCES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src")	5	SET(SOURCES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src")
6	SET(INCLUDE~~S_DIR "~~${CMAKE_CURRENT_SOURCE_DIR}/include")	6	SET(INCLUDE_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/include)
7	SET(UI_FOLDER "${CMAKE_CURRENT_SOURCE_DIR}/ui")	7	SET(UI_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/ui)
8	SET(RES_FOLDER "${CMAKE_CURRENT_SOURCE_DIR}/resources")	8	SET(RES_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/resources)
9
10	# Include gui directory
11	include_directories("${INCLUDES_DIR}")
12	include_directories("${CMAKE_CURRENT_BINARY_DIR}")
13		9
14	# Set a variable to display a warning in the version files.	10	# Set a variable to display a warning in the version files.
15	SET(SCIQLOP_CMAKE_GENERATION_WARNING "DON'T CHANGE THIS FILE. AUTOGENERATED BY CMAKE.")	11	SET(SCIQLOP_CMAKE_GENERATION_WARNING "DON'T CHANGE THIS FILE. AUTOGENERATED BY CMAKE.")
16		12
17	#	13	#
18	# Find Qt modules	14	# Find Qt modules
19	#	15	#
20	SCIQLOP_FIND_QT(Core Widgets ~~PrintSupport~~)	16	SCIQLOP_FIND_QT(Core Widgets)
21		17
22	#	18	#
23	# Find dependent libraries	19	# Compile the library library
24	# ========================	20	#
25	find_package(sciqlop-core)	21	FILE (GLOB_RECURSE MODULE_SOURCES
26		22	${SOURCES_DIR}/*.c
27	SET(LIBRARIES ${SCIQLOP-CORE_LIBRARIES})	23	${SOURCES_DIR}/*.cpp
28		24	${SOURCES_DIR}/*.h)
29	INCLUDE_DIRECTORIES(${SCIQLOP-CORE_INCLUDE_DIR})
30
31	# Add sqpcore to the list of libraries to use
32	list(APPEND LIBRARIES ${SQPCORE_LIBRARY_NAME})
33
34	# Add dependent shared libraries
35	list(APPEND SHARED_LIBRARIES ${SQPCORE_SHARED_LIBRARIES})
36		25
		26	# Headers files (.h)
		27	FILE (GLOB_RECURSE PROJECT_HEADERS ${INCLUDE_FOLDER}/*.h)
37		28
38	# Ui files	29	# Ui files
39	FILE (GLOB_RECURSE PROJECT_FORMS ${UI_FOLDER}/*.ui)	30	FILE (GLOB_RECURSE PROJECT_FORMS ${UI_FOLDER}/*.ui)
@@ -41,16 +32,6 FILE (GLOB_RECURSE PROJECT_FORMS ${UI_FOLDER}/*.ui)
41	# Resources files	32	# Resources files
42	FILE (GLOB_RECURSE PROJECT_RESOURCES ${RES_FOLDER}/*.qrc)	33	FILE (GLOB_RECURSE PROJECT_RESOURCES ${RES_FOLDER}/*.qrc)
43		34
44	#
45	# Compile the library library
46	#
47	FILE (GLOB_RECURSE MODULE_SOURCES
48	${INCLUDES_DIR}/*.h
49	${SOURCES_DIR}/*.c
50	${SOURCES_DIR}/*.cpp
51	${SOURCES_DIR}/*.h
52	${PROJECT_FORMS})
53
54	QT5_ADD_RESOURCES(RCC_HDRS	35	QT5_ADD_RESOURCES(RCC_HDRS
55	${PROJECT_RESOURCES}	36	${PROJECT_RESOURCES}
56	)	37	)
@@ -59,23 +40,13 QT5_WRAP_UI(UIS_HDRS
59	${PROJECT_FORMS}	40	${PROJECT_FORMS}
60	)	41	)
61		42
		43	include_directories("${CMAKE_CURRENT_BINARY_DIR}")
		44	message(CURRENT INCLUDE : ${CMAKE_CURRENT_BINARY_DIR})
62		45
63	ADD_LIBRARY(${SQPGUI_LIBRARY_NAME} ${MODULE_SOURCES} ${UIS_HDRS} ~~${RCC_HDRS}~~)	46	ADD_LIBRARY(${SQPGUI_LIBRARY_NAME} ${MODULE_SOURCES} ${UIS_HDRS})
64	set_property(TARGET ${SQPGUI_LIBRARY_NAME} PROPERTY CXX_STANDARD 14)	47	TARGET_LINK_LIBRARIES(${SQPGUI_LIBRARY_NAME} ${EXTERN_LIBRARIES})
65	set_property(TARGET ${SQPGUI_LIBRARY_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)	48	qt5_use_modules(${SQPGUI_LIBRARY_NAME} Core Widgets)
66		49
67	TARGET_LINK_LIBRARIES(${SQPGUI_LIBRARY_NAME} ${LIBRARIES})
68	qt5_use_modules(${SQPGUI_LIBRARY_NAME} Core Widgets PrintSupport)
69
70
71	INSTALL(TARGETS ${SQPGUI_LIBRARY_NAME}
72	RUNTIME DESTINATION ${INSTALL_BINARY_DIR}
73	LIBRARY DESTINATION ${INSTALL_LIBRARY_DIR}
74	ARCHIVE DESTINATION ${INSTALL_LIBRARY_DIR}
75	)
76	add_dependencies(${SQPGUI_LIBRARY_NAME} ${SQPCORE_LIBRARY_NAME})
77
78
79	# From cmake documentation: http://www.cmake.org/cmake/help/v3.0/manual/cmake-buildsystem.7.html	50	# From cmake documentation: http://www.cmake.org/cmake/help/v3.0/manual/cmake-buildsystem.7.html
80	# Entries in the COMPILE_DEFINITIONS are prefixed with -D or /D and added to the compile line in an unspecified order.	51	# Entries in the COMPILE_DEFINITIONS are prefixed with -D or /D and added to the compile line in an unspecified order.
81	# The DEFINE_SYMBOL target property is also added as a compile definition as a special convenience case for SHARED and MODULE library targets	52	# The DEFINE_SYMBOL target property is also added as a compile definition as a special convenience case for SHARED and MODULE library targets
@@ -90,64 +61,62 ENDIF()
90	SCIQLOP_SET_TO_PARENT_SCOPE(SQPGUI_LIBRARY_NAME)	61	SCIQLOP_SET_TO_PARENT_SCOPE(SQPGUI_LIBRARY_NAME)
91		62
92	# Copy extern shared libraries to the lib folder	63	# Copy extern shared libraries to the lib folder
93	SCIQLOP_COPY_TO_TARGET(LIBRARY ${SQPGUI_LIBRARY_NAME})	64	SCIQLOP_COPY_TO_TARGET(LIBRARY ${SQPGUI_LIBRARY_NAME} ${EXTERN_SHARED_LIBRARIES})
94		65
95	# Add the files to the list of files to be analyzed	66	# Add the files to the list of files to be analyzed
96	LIST(APPEND CHECKSTYLE_INPUT_FILES ${MODULE_SOURCES})	67	LIST(APPEND CHECKSTYLE_INPUT_FILES ${MODULE_SOURCES})
97	SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_INPUT_FILES)	68	SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_INPUT_FILES)
98	# Vera++ exclusion files	69	# Vera++ exclusion files
99	LIST(APPEND CHECKSTYLE_EXCLUSION_FILES ${CMAKE_CURRENT_SOURCE_DIR}/~~vera-exclusions/exclusions.txt~~)	70	#LIST(APPEND CHECKSTYLE_EXCLUSION_FILES ${CMAKE_CURRENT_SOURCE_DIR}/path/to/exclusionFiles.tcl)
100	SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_EXCLUSION_FILES)	71	SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_EXCLUSION_FILES)
101		72
102	#	73	#
103	# Compile the tests	74	# Compile the tests
104	#	75	#
105	IF(BUILD_TESTS)	76	IF(BUILD_TESTS)
106	INCLUDE_DIRECTORIES(${SOURCES_DIR})	77	INCLUDE_DIRECTORIES(${SOURCES_DIR})
107	FILE (GLOB_RECURSE TESTS_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Test*.cpp)	78	FILE (GLOB_RECURSE TESTS_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Test*.cpp)
108	FILE (GLOB_RECURSE TESTS_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/Test*.h)	79	FILE (GLOB_RECURSE TESTS_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/Test*.h)
109	SET( TEST_LIBRARIES ${SQPGUI_LIBRARY_NAME})	80	SET( TEST_LIBRARIES ${SQPGUI_LIBRARY_NAME} ${EXTERN_LIBRARIES})
110		81
111	FOREACH( testFile ${TESTS_SOURCES} )	82	FOREACH( testFile ${TESTS_SOURCES} )
112	GET_FILENAME_COMPONENT( testDirectory ${testFile} DIRECTORY )	83	GET_FILENAME_COMPONENT( testDirectory ${testFile} DIRECTORY )
113	GET_FILENAME_COMPONENT( testName ${testFile} NAME_WE )	84	GET_FILENAME_COMPONENT( testName ${testFile} NAME_WE )
114		85
115	# Add to the list of sources files all the sources in the same	86	# Add to the list of sources files all the sources in the same
116	# directory that aren't another test	87	# directory that aren't another test
117	FILE (GLOB currentTestSources	88	FILE (GLOB currentTestSources
118	${testDirectory}/*.c	89	${testDirectory}/*.c
119	${testDirectory}/*.cpp	90	${testDirectory}/*.cpp
120	${testDirectory}/*.h)	91	${testDirectory}/*.h)
121	LIST (REMOVE_ITEM currentTestSources ${TESTS_SOURCES})	92	LIST (REMOVE_ITEM currentTestSources ${TESTS_SOURCES})
122	# LIST (REMOVE_ITEM currentTestSources ${TESTS_HEADERS})	93	LIST (REMOVE_ITEM currentTestSources ${TESTS_HEADERS})
123		94
124	ADD_EXECUTABLE(${testName} ${testFile} ${currentTestSources})	95	ADD_EXECUTABLE(${testName} ${testFile} ${currentTestSources})
125	set_property(TARGET ${testName} PROPERTY CXX_STANDARD 14)	96	TARGET_LINK_LIBRARIES( ${testName} ${TEST_LIBRARIES} )
126	set_property(TARGET ${testName} PROPERTY CXX_STANDARD_REQUIRED ON)	97	qt5_use_modules(${testName} Test)
127	TARGET_LINK_LIBRARIES( ${testName} ${TEST_LIBRARIES} )	98
128	qt5_use_modules(${testName} Test)	99	ADD_TEST( NAME ${testName} COMMAND ${testName} )
129
130	ADD_TEST( NAME ${testName} COMMAND ${testName} )
131		100
132	SCIQLOP_COPY_TO_TARGET(RUNTIME ${testName} ${EXTERN_SHARED_LIBRARIES})	101	SCIQLOP_COPY_TO_TARGET(RUNTIME ${testName} ${EXTERN_SHARED_LIBRARIES})
133	ENDFOREACH( testFile )	102	ENDFOREACH( testFile )
134		103
135	LIST(APPEND testFilesToFormat ${TESTS_SOURCES})	104	LIST(APPEND testFilesToFormat ${TESTS_SOURCES})
136	LIST(APPEND testFilesToFormat ${TESTS_HEADERS})	105	LIST(APPEND testFilesToFormat ${TESTS_HEADERS})
137	LIST(APPEND FORMATTING_INPUT_FILES ${testFilesToFormat})	106	LIST(APPEND FORMATTING_INPUT_FILES ${testFilesToFormat})
138	SCIQLOP_SET_TO_PARENT_SCOPE(FORMATTING_INPUT_FILES)	107	SCIQLOP_SET_TO_PARENT_SCOPE(FORMATTING_INPUT_FILES)
139	ENDIF(BUILD_TESTS)	108	ENDIF(BUILD_TESTS)
140		109
141	#	110	#
142	# Set the files that must be formatted by clang-format.	111	# Set the files that must be formatted by clang-format.
143	#	112	#
144	LIST (APPEND FORMATTING_INPUT_FILES ${MODULE_SOURCES})	113	LIST (APPEND FORMATTING_INPUT_FILES ${MODULE_SOURCES})
145	SCIQLOP_SET_TO_PARENT_SCOPE(FORMATTING_INPUT_FILES)	114	SCIQLOP_SET_TO_PARENT_SCOPE(FORMATTING_INPUT_FILES)
146		115
147	#	116	#
148	# Set the directories that doxygen must browse to generate the	117	# Set the directories that doxygen must browse to generate the
149	# documentation.	118	# documentation.
150	#	119	#
151	# Source directories:	120	# Source directories:
152	LIST (APPEND DOXYGEN_INPUT_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/docs")	121	LIST (APPEND DOXYGEN_INPUT_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/docs")
153	LIST (APPEND DOXYGEN_INPUT_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/src")	122	LIST (APPEND DOXYGEN_INPUT_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/src")
@@ -156,11 +125,11 SCIQLOP_SET_TO_PARENT_SCOPE(DOXYGEN_INPUT_DIRS)
156	#LIST (APPEND DOXYGEN_EXCLUDE_PATTERNS "${CMAKE_CURRENT_SOURCE_DIR}/path/to/subdir/*")	125	#LIST (APPEND DOXYGEN_EXCLUDE_PATTERNS "${CMAKE_CURRENT_SOURCE_DIR}/path/to/subdir/*")
157	SCIQLOP_SET_TO_PARENT_SCOPE(DOXYGEN_EXCLUDE_PATTERNS)	126	SCIQLOP_SET_TO_PARENT_SCOPE(DOXYGEN_EXCLUDE_PATTERNS)
158		127
159	#	128	#
160	# Set the directories with the sources to analyze and propagate the	129	# Set the directories with the sources to analyze and propagate the
161	# modification to the parent scope	130	# modification to the parent scope
162	#	131	#
163	# Source directories to analyze:	132	# Source directories to analyze:
164	LIST (APPEND ANALYSIS_INPUT_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/src")	133	LIST (APPEND ANALYSIS_INPUT_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/src")
165	LIST (APPEND ANALYSIS_INPUT_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/tests")	134	LIST (APPEND ANALYSIS_INPUT_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/tests")
166	SCIQLOP_SET_TO_PARENT_SCOPE(ANALYSIS_INPUT_DIRS)	135	SCIQLOP_SET_TO_PARENT_SCOPE(ANALYSIS_INPUT_DIRS)

0

COPYING removed 0 -674

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

0

app/meson.build removed 0 -38

1

NO CONTENT: file was removed

0

app/resources/qlopapp.rc removed 0 -1

1

NO CONTENT: file was removed

0

app/resources/sciqlop.ico removed binary 0 0

1

NO CONTENT: file was removed, binary diff hidden

0

app/src/MainWindow.cpp removed 0 -254

1

NO CONTENT: file was removed

0

app/ui/MainWindow.ui removed 0 -164

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

build_cfg/mac/Info.plist removed 0 -22

1

NO CONTENT: file was removed

0

build_cfg/mac/build.sh removed 0 -8

1

NO CONTENT: file was removed

0

build_cfg/mac/install_script.sh removed 0 -12

1

NO CONTENT: file was removed

0

build_cfg/mac/sciqlopLOGO.icns removed binary 0 0

1

NO CONTENT: file was removed, binary diff hidden

0

build_cfg/windows/build.sh removed 0 -8

1

NO CONTENT: file was removed

0

build_cfg/windows/cross_fedora_win64.txt removed 0 -18

1

NO CONTENT: file was removed

0

build_cfg/windows/install_script.sh removed 0 -26

1

NO CONTENT: file was removed

0

cmake/sciqlop_code_coverage.cmake removed 0 -191

1

NO CONTENT: file was removed

0

cmake/sciqlop_package_qt.cmake removed 0 -36

1

NO CONTENT: file was removed

0

config/QtProject/qtlogging.ini removed 0 -4

1

NO CONTENT: file was removed

0

core/cmake/Findsciqlop-core.cmake removed 0 -21

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/Common/spimpl.h removed 0 -460

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/DataSourceController.h removed 0 -94

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/DataSourceController.cpp removed 0 -143

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

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

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

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

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

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

1

NO CONTENT: file was removed

0

core/tests/meson.build removed 0 -20

1

NO CONTENT: file was removed

0

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/cmake/Findsciqlop-gui.cmake removed 0 -21

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/SqpApplication.h removed 0 -52

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/SqpApplication.cpp removed 0 -150

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