Mise à jour terminée. Pour connaître les apports de la version 13.8.4 par rapport à notre ancienne version vous pouvez lire les "Release Notes" suivantes :
https://about.gitlab.com/releases/2021/02/11/security-release-gitlab-13-8-4-released/
https://about.gitlab.com/releases/2021/02/05/gitlab-13-8-3-released/

Commit 7fdd3d20 authored by WINTZ Julien's avatar WINTZ Julien

Merge branch 'monitoring' of github.com:d-tk/dtk into feature/monitoring

parents 611fae62 2cfc854c
......@@ -16,6 +16,7 @@
*.cpp ident
*.tpp ident
*.cmake ident
*.cmake.in ident
######################################################################
### .gitattributes ends here
### .gitignore ---
## Version: $Id$
##
######################################################################
##
### Commentary:
##
######################################################################
##
### Change Log:
##
######################################################################
##
### Code:
*~
......@@ -6,10 +18,6 @@
## Generated files
## ###################################################################
src/dtk/dtkConfig.h
qml/*/qmldir
doc/html
doc/html*
......@@ -41,3 +49,6 @@ build-*
*.user
.cproject
.project
######################################################################
### .gitignore ends here
......@@ -16,6 +16,8 @@ cmake_minimum_required(VERSION 3.2.0)
######################################################################
######################################################################
if(${CMAKE_MAJOR_VERSION} GREATER 2)
cmake_policy(SET CMP0028 NEW)
endif(${CMAKE_MAJOR_VERSION} GREATER 2)
......@@ -44,13 +46,13 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
## #################################################################
## Build type setup
## #################################################################
if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
message(STATUS "Setting build type to 'RelWithDebInfo' as none was specified.")
set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the type of build." FORCE)
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
endif()
set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "" FORCE)
endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
......@@ -68,6 +70,12 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/install" CACHE PATH "${PROJECT_NAME} install prefix" FORCE)
endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
## #################################################################
## Generate compilation database
## #################################################################
set(CMAKE_EXPORT_COMPILE_COMMANDS "ON")
## ###################################################################
## Build setup
## ###################################################################
......@@ -83,11 +91,6 @@ endif(UNIX)
if(NOT APPLE AND NOT MSVC)
include(CheckCXXCompilerFlag)
check_cxx_compiler_flag("-std=c++11" COMPILER_SUPPORTS_CXX11)
check_cxx_compiler_flag("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
if(CMAKE_COMPILER_IS_GNUCXX AND DTK_ENABLE_COVERAGE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
......@@ -111,6 +114,12 @@ if(WIN32)
add_definitions("/wd4068 /wd4244 /wd4996 /wd4005 /wd4305")
endif(WIN32)
## #################################################################
## CMake dependencies
## #################################################################
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
## #################################################################
## Options
## #################################################################
......@@ -241,16 +250,11 @@ if(SWIG_FOUND)
set(${target} ${${target}} ${wrap_output})
add_definitions(-DHAVE_SWIG)
endmacro(dtk_wrap)
else(SWIG_FOUND)
message("DTK_BUILD_WRAPPERS options requires SWIG.")
endif(SWIG_FOUND)
if(SWIG_FOUND)
add_definitions(-DHAVE_SWIG)
endif(SWIG_FOUND)
## #################################################################
......@@ -313,10 +317,10 @@ endif(DTK_BUILD_SUPPORT_DISTRIBUTED)
set(DTK_HAVE_ZLIB "NO")
find_package(ZLIB QUIET)
if (ZLIB_FOUND)
if(ZLIB_FOUND)
include_directories( ${ZLIB_INCLUDE_DIRS} )
set(DTK_HAVE_ZLIB "YES")
endif (ZLIB_FOUND)
endif(ZLIB_FOUND)
set(DTK_HAVE_VRPN "NO")
......@@ -389,6 +393,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/dtk)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/dtkComposer)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/dtkMonitoring)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/dtkCore)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/dtkDistributed)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/dtkLog)
......@@ -446,6 +451,7 @@ mark_as_advanced(dtk_VERSION_MAJOR)
mark_as_advanced(dtk_VERSION_MINOR)
mark_as_advanced(dtk_VERSION_BUILD)
mark_as_advanced(Qt5_DIR)
mark_as_advanced(Qt5Concurrent_DIR)
mark_as_advanced(Qt5Core_DIR)
mark_as_advanced(Qt5Gui_DIR)
......@@ -458,6 +464,7 @@ mark_as_advanced(Qt5Svg_DIR)
mark_as_advanced(Qt5Test_DIR)
mark_as_advanced(Qt5Widgets_DIR)
mark_as_advanced(Qt5Xml_DIR)
mark_as_advanced(Qt5XmlPatterns_DIR)
mark_as_advanced(CMAKE_AR)
mark_as_advanced(CMAKE_BUILD_TYPE)
......
......@@ -20,7 +20,7 @@ if(DTK_BUILD_DISTRIBUTED AND DTK_BUILD_WIDGETS)
add_subdirectory(dtkDistributedServer)
add_subdirectory(dtkDistributedSlave)
add_subdirectory(dtkDistributedDashboard)
endif(DTK_BUILD_DISTRIBUTED AND DTK_BUILD_WIDGETS)
endif(DTK_BUILD_DISTRIBUTED AND DTK_BUILD_WIDGETS)
add_subdirectory(dtkPluginsMetaInfoFetcher)
add_subdirectory(dtkDeploy)
......
......@@ -12,20 +12,25 @@
##
### Code:
find_package(Qt5Core REQUIRED)
find_package(Qt5Concurrent REQUIRED)
find_package(Qt5Network REQUIRED)
find_package(Qt5Quick REQUIRED)
find_package(Qt5Widgets REQUIRED)
find_package(Qt5Test REQUIRED)
find_package(Qt5Xml REQUIRED)
set(DTK_BUILD_32 @DTK_BUILD_32@)
set(DTK_BUILD_64 @DTK_BUILD_64@)
## ###################################################################
## Defines:
## - dtk_INCLUDE_DIRS
## ###################################################################
set(dtk_INCLUDE_DIRS
"@CMAKE_CURRENT_SOURCE_DIR@"
"@CMAKE_CURRENT_SOURCE_DIR@/include"
"@CMAKE_CURRENT_SOURCE_DIR@/src"
"@CMAKE_CURRENT_SOURCE_DIR@/src/dtk"
"@CMAKE_CURRENT_SOURCE_DIR@/src/dtkLog"
"@CMAKE_CURRENT_SOURCE_DIR@/src/dtkComposer"
"@CMAKE_CURRENT_SOURCE_DIR@/src/dtkMonitoring"
"@CMAKE_CURRENT_SOURCE_DIR@/src/dtkCore"
"@CMAKE_CURRENT_SOURCE_DIR@/src/dtkDistributed"
"@CMAKE_CURRENT_SOURCE_DIR@/src/dtkMath"
......@@ -46,11 +51,7 @@ find_package(Qt5 REQUIRED COMPONENTS
Xml)
set(dtk_INSTALL_DOCS @dtk_INSTALL_DOCS@)
set(dtk_CONFIG_DOCS @dtk_CONFIG_DOCS@)
## ###################################################################
## Options
## ###################################################################
set(dtk_CONFIG_DOCS @dtk_CONFIG_DOCS@)
set(DTK_BUILD_DISTRIBUTED @DTK_BUILD_DISTRIBUTED@)
set(DTK_BUILD_COMPOSER @DTK_BUILD_COMPOSER@)
......@@ -65,8 +66,11 @@ set(DTK_BUILD_SUPPORT_GUI @DTK_BUILD_SUPPORT_GUI@)
set(DTK_BUILD_SUPPORT_MATH @DTK_BUILD_SUPPORT_MATH@)
set(DTK_BUILD_SUPPORT_PLOT @DTK_BUILD_SUPPORT_PLOT@)
set(DTK_BUILD_SUPPORT_VR @DTK_BUILD_SUPPORT_VR@)
set(DTK_ENABLE_COVERAGE @DTK_ENABLE_COVERAGE@)
set(DTK_COVERAGE_USE_COBERTURA @DTK_COVERAGE_USE_COBERTURA@)
set(DTK_ENABLE_MEMCHECK @DTK_ENABLE_MEMCHECK@)
set(DTK_HAVE_MPI @DTK_HAVE_MPI@)
......
......@@ -23,6 +23,8 @@ set(DTK_BUILD_64 @DTK_BUILD_64@)
set(dtk_INCLUDE_DIRS
"@CMAKE_INSTALL_PREFIX@/include"
"@CMAKE_INSTALL_PREFIX@/include/dtk"
"@CMAKE_INSTALL_PREFIX@/include/dtkComposer"
"@CMAKE_INSTALL_PREFIX@/include/dtkMonitoring"
"@CMAKE_INSTALL_PREFIX@/include/dtkDistributed"
"@CMAKE_INSTALL_PREFIX@/include/dtkCore"
"@CMAKE_INSTALL_PREFIX@/include/dtkLog"
......
......@@ -21,6 +21,7 @@ add_subdirectory(dtkCore)
if(DTK_BUILD_COMPOSER)
add_subdirectory(dtkComposer)
add_subdirectory(dtkMonitoring)
endif(DTK_BUILD_COMPOSER)
if(DTK_BUILD_DISTRIBUTED)
......@@ -49,6 +50,7 @@ set(DTK_TARGETS ${DTK_TARGETS} dtkCore)
if(DTK_BUILD_COMPOSER)
set(DTK_TARGETS ${DTK_TARGETS} dtkComposer)
set(DTK_TARGETS ${DTK_TARGETS} dtkMonitoring)
endif(DTK_BUILD_COMPOSER)
if(DTK_BUILD_DISTRIBUTED)
......
......@@ -20,8 +20,11 @@ configure_file(
## Install rules
## ###################################################################
install(FILES dtkConfig DESTINATION include/dtk/)
install(FILES "${PROJECT_BINARY_DIR}/dtkConfig.h" DESTINATION include/dtk/)
install(FILES dtkConfig
DESTINATION include/dtk/)
install(FILES "${PROJECT_BINARY_DIR}/dtkConfig.h"
DESTINATION include/dtk/)
######################################################################
### CMakeLists.txt ends here
......@@ -30,17 +30,6 @@ set(${PROJECT_NAME}_HEADERS
dtkComposer
dtkComposer.h
dtkComposerCompass.h
dtkComposerControls.h
dtkComposerControlsDelegate.h
dtkComposerControlsListItem.h
dtkComposerControlsListItemFactory.h
dtkComposerControlsListItemBoolean.h
dtkComposerControlsListItemFile.h
dtkComposerControlsListItemInteger.h
# dtkComposerControlsListItemLeafProcess.h
dtkComposerControlsListItemReal.h
dtkComposerControlsListItemString.h
dtkComposerDefaultExtensions.h
dtkComposerEvaluator.h
dtkComposerEvaluator_p.h
dtkComposerEvaluatorProcess.h
......@@ -87,10 +76,6 @@ set(${PROJECT_NAME}_HEADERS
dtkComposerNodeInteger.h
dtkComposerNodeLeaf.h
dtkComposerNodeRange.h
# dtkComposerNodeLeafActor.h
# dtkComposerNodeLeafData.h
# dtkComposerNodeLeafProcess.h
# dtkComposerNodeLeafView.h
dtkComposerNodeLogger.h
dtkComposerNodeMetaContainer.h
dtkComposerNodeNumberOperator.h
......@@ -157,16 +142,6 @@ set(${PROJECT_NAME}_HEADERS
set(${PROJECT_NAME}_SOURCES
dtkComposer.cpp
dtkComposerCompass.cpp
dtkComposerControls.cpp
dtkComposerControlsDelegate.cpp
dtkComposerControlsListItem.cpp
dtkComposerControlsListItemBoolean.cpp
dtkComposerControlsListItemFactory.cpp
dtkComposerControlsListItemFile.cpp
dtkComposerControlsListItemInteger.cpp
# dtkComposerControlsListItemLeafProcess.cpp
dtkComposerControlsListItemReal.cpp
dtkComposerControlsListItemString.cpp
dtkComposerEvaluator.cpp
dtkComposerEvaluatorProcess.cpp
dtkComposerEvaluatorSlave.cpp
......@@ -204,10 +179,6 @@ set(${PROJECT_NAME}_SOURCES
dtkComposerNodeInteger.cpp
dtkComposerNodeLeaf.cpp
dtkComposerNodeRange.cpp
# dtkComposerNodeLeafActor.cpp
# dtkComposerNodeLeafData.cpp
# dtkComposerNodeLeafProcess.cpp
# dtkComposerNodeLeafView.cpp
dtkComposerNodeLogger.cpp
dtkComposerNodeMetaContainer.cpp
dtkComposerNodeNumberOperator.cpp
......
......@@ -14,8 +14,6 @@
#include "dtkComposer.h"
#include "dtkComposerCompass.h"
#include "dtkComposerControls.h"
#include "dtkComposerControlsDelegate.h"
#include "dtkComposerEvaluator.h"
#include "dtkComposerEvaluatorProcess.h"
#include "dtkComposerEvaluatorSlave.h"
......
#include "dtkComposerControls.h"
\ No newline at end of file
/* dtkComposerControls.cpp ---
*
* Author: Julien Wintz
* Copyright (C) 2008-2011 - Julien Wintz, Inria.
* Created: Tue Nov 20 16:21:59 2012 (+0100)
*/
/* Commentary:
*
*/
/* Change log:
*
*/
#include "dtkComposerControls.h"
#include "dtkComposerControlsDelegate.h"
#include "dtkComposerControlsListItem.h"
#include "dtkComposerControlsListItemFactory.h"
#include "dtkComposerNode.h"
#include "dtkComposerScene.h"
#include "dtkComposerSceneNodeLeaf.h"
#include <dtkWidgets/dtkToolBox.h>
// /////////////////////////////////////////////////////////////////
// Helper functions
// /////////////////////////////////////////////////////////////////
int type(dtkComposerSceneNodeLeaf *node);
// /////////////////////////////////////////////////////////////////
// dtkComposerControlsPrivate
// /////////////////////////////////////////////////////////////////
class dtkComposerControlsPrivate
{
public:
dtkComposerScene *scene;
public:
QComboBox *selector;
QListWidget *list;
dtkToolBox *box;
};
// /////////////////////////////////////////////////////////////////
// dtkComposerControls
// /////////////////////////////////////////////////////////////////
dtkComposerControls::dtkComposerControls(QWidget *parent) : QFrame(parent), d(new dtkComposerControlsPrivate)
{
d->scene = NULL;
// /////////////////////////////////////////////////////////////////
d->selector = new QComboBox(this);
d->selector->addItem(QIcon(":dtkComposer/pixmaps/dtk-composer-node-flag-blue.png"), "Blue flagged nodes");
d->selector->addItem(QIcon(":dtkComposer/pixmaps/dtk-composer-node-flag-gray.png"), "Gray flagged nodes");
d->selector->addItem(QIcon(":dtkComposer/pixmaps/dtk-composer-node-flag-green.png"), "Green flagged nodes");
d->selector->addItem(QIcon(":dtkComposer/pixmaps/dtk-composer-node-flag-orange.png"), "Orange flagged nodes");
d->selector->addItem(QIcon(":dtkComposer/pixmaps/dtk-composer-node-flag-pink.png"), "Pink flagged nodes");
d->selector->addItem(QIcon(":dtkComposer/pixmaps/dtk-composer-node-flag-red.png"), "Red flagged nodes");
d->selector->addItem(QIcon(":dtkComposer/pixmaps/dtk-composer-node-flag-yellow.png"), "Yellow flagged nodes");
// /////////////////////////////////////////////////////////////////
//d->list = new QListWidget(this);
//d->list->setAttribute(Qt::WA_MacShowFocusRect, false);
//d->list->setItemDelegate(new dtkComposerControlsDelegate(this));
// /////////////////////////////////////////////////////////////////
d->box = new dtkToolBox(this);
d->box->setDisplayMode(dtkToolBox::Default);
d->box->setDisplayMode(dtkToolBox::AllItemExpanded);
d->box->setDisplayMode(dtkToolBox::OneItemExpanded);
// /////////////////////////////////////////////////////////////////
QVBoxLayout *layout = new QVBoxLayout(this);
layout->addWidget(d->selector);
layout->addWidget(d->box);
// /////////////////////////////////////////////////////////////////
this->setFixedWidth(300);
// /////////////////////////////////////////////////////////////////
connect(d->selector, SIGNAL(currentIndexChanged(int)), this, SLOT(setup(int)));
}
dtkComposerControls::~dtkComposerControls(void)
{
delete d;
d = NULL;
}
void dtkComposerControls::setScene(dtkComposerScene *scene)
{
if(d->scene)
disconnect(d->scene, SIGNAL(flagged()), this, SLOT(setup()));
d->scene = scene;
if(d->scene)
connect(d->scene, SIGNAL(flagged()), this, SLOT(setup()));
this->setup();
}
void dtkComposerControls::setup(void)
{
this->setup(d->selector->currentIndex());
}
void dtkComposerControls::setup(int index)
{
if(!d->scene)
return;
QList<dtkComposerSceneNodeLeaf *> nodes;
switch(index) {
case 0:
nodes = d->scene->flagged(Qt::blue);
break;
case 1:
nodes = d->scene->flagged(Qt::gray);
break;
case 2:
nodes = d->scene->flagged(Qt::green);
break;
case 3:
nodes = d->scene->flagged(Qt::darkYellow);
break;
case 4:
nodes = d->scene->flagged(Qt::magenta);
break;
case 5:
nodes = d->scene->flagged(Qt::red);
break;
case 6:
nodes = d->scene->flagged(Qt::yellow);
break;
default:
break;
};
//d->list->clear();
d->box->clear();
foreach(dtkComposerSceneNodeLeaf *node, nodes) {
//dtkComposerControlsListItem *item = dtkComposerControlsListItemFactory::instance()->create(d->list, node);
//item->setFlags(Qt::ItemIsEnabled);
// d->list->addItem(item);
// d->list->setItemWidget(item,item->widget());
d->box->addItem(dtkComposerControlsListItemFactory::instance()->create(node));
}
}
// /////////////////////////////////////////////////////////////////
// Helper functions
// /////////////////////////////////////////////////////////////////
// Version: $Id$
//
//
// Commentary:
//
//
// Change Log:
//
//
// Code:
#pragma once
#include "dtkComposerExport.h"
#include <QtWidgets>
class dtkComposerControlsPrivate;
class dtkComposerScene;
class DTKCOMPOSER_EXPORT dtkComposerControls : public QFrame
{
Q_OBJECT
public:
dtkComposerControls(QWidget *parent = 0);
~dtkComposerControls(void);
public:
void setScene(dtkComposerScene *scene);
protected slots:
void setup(void);
void setup(int index);
private:
dtkComposerControlsPrivate *d;
};
//
// dtkComposerControls.h ends here
#include "dtkComposerControlsDelegate.h"
\ No newline at end of file
/* dtkComposerControlsDelegate.cpp ---
*
* Author: Julien Wintz
* Copyright (C) 2008-2011 - Julien Wintz, Inria.
* Created: Wed Nov 28 15:12:23 2012 (+0100)
* Version: $Id$
* Last-Updated: ven. oct. 11 14:29:45 2013 (+0200)
* By: Thibaud Kloczko
* Update #: 183
*/
/* Commentary:
*
*/
/* Change log:
*
*/
#include "dtkComposerControls.h"
#include "dtkComposerControlsDelegate.h"
#include "dtkComposerControlsListItem.h"
class dtkComposerControlsDelegatePrivate
{
public:
};
dtkComposerControlsDelegate::dtkComposerControlsDelegate(QObject *parent) : QStyledItemDelegate(parent), d(new dtkComposerControlsDelegatePrivate)
{
}
dtkComposerControlsDelegate::~dtkComposerControlsDelegate(void)
{
delete d;
d = NULL;
}
void dtkComposerControlsDelegate