Commit 21f2efdc authored by fw4splbot's avatar fw4splbot
Browse files

merge(dev): release 16.0.0

parents 6ee4605b cfff1dce
{
"bundles": [
@BUNDLES_JSON@
],
"srclibs": [
@SRCLIBS_JSON@
],
"repositories": [
@REPOSITORIES_JSON@
]
}
......@@ -13,10 +13,12 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/CMake/build/plugin_config.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/CMake/install/generic_install.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/CMake/install/helper.cmake)
set(ENABLE_PCH ON CACHE BOOL "Use pre-compiled headers to speedup the compilation")
option(ENABLE_PCH "Use pre-compiled headers to speedup the compilation" ON)
option(VERBOSE_PCH "Display debug messages to help debugging PCH" OFF)
mark_as_advanced(ENABLE_PCH)
mark_as_advanced(VERBOSE_PCH)
include(${CMAKE_CURRENT_SOURCE_DIR}/CMake/modules/PrecompiledHeader.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/CMake/build/PrecompiledHeader.cmake)
if(MSVC)
if(NOT DEFINED CMAKE_PCH_COMPILER_TARGETS)
......@@ -88,9 +90,12 @@ endif()
set(CREATE_SUBPROJECTS OFF CACHE BOOL "Create a project for each subproject")
# Tests build / run options
set(BUILD_TESTS ON CACHE BOOL "Configures projects associated tests (<project>Test projects)")
set(TESTS_XML_OUTPUT OFF CACHE BOOL "Tests will generate an xml output, suitable for CI integration")
mark_as_advanced(TESTS_XML_OUTPUT)
set(TESTS_FILTER "" CACHE STRING "Allows to only build/run tests whose path contains the filter string.")
mark_as_advanced(TESTS_FILTER)
set(ADDITIONAL_PROJECTS CACHE PATH
"Paths to the additional projects"
......@@ -562,10 +567,14 @@ macro(fwLib FWPROJECT_NAME PROJECT_VERSION)
if(${${FWPROJECT_NAME}_PCH_TARGET} STREQUAL ${FWPROJECT_NAME})
add_precompiled_header(${FWPROJECT_NAME} include/${FWPROJECT_NAME}/pch.hpp)
message(STATUS "Use custom precompiled header")
if(VERBOSE_PCH)
message(STATUS "Use custom precompiled header")
endif()
else()
use_precompiled_header(${FWPROJECT_NAME} ${${FWPROJECT_NAME}_PCH_TARGET})
message(STATUS "Use ${${FWPROJECT_NAME}_PCH_TARGET} precompiled header")
if(VERBOSE_PCH)
message(STATUS "Use ${${FWPROJECT_NAME}_PCH_TARGET} precompiled header")
endif()
endif()
endif()
......@@ -646,10 +655,14 @@ macro(fwBundle FWPROJECT_NAME PROJECT_VERSION)
if(${${FWPROJECT_NAME}_PCH_TARGET} STREQUAL ${FWPROJECT_NAME})
add_precompiled_header(${FWPROJECT_NAME} include/${FWPROJECT_NAME}/pch.hpp)
message(STATUS "Use custom precompiled header")
if(VERBOSE_PCH)
message(STATUS "Use custom precompiled header")
endif()
else()
use_precompiled_header(${FWPROJECT_NAME} ${${FWPROJECT_NAME}_PCH_TARGET})
message(STATUS "Use ${${FWPROJECT_NAME}_PCH_TARGET} precompiled header")
if(VERBOSE_PCH)
message(STATUS "Use ${${FWPROJECT_NAME}_PCH_TARGET} precompiled header")
endif()
endif()
endif()
else()
......@@ -826,11 +839,11 @@ function(findAllDependencies FWPROJECT_NAMES RESULT_VAR)
endfunction()
function(findTests FWPROJECTS RESULT_VAR)
function(findTests FWPROJECTS FILTER RESULT_VAR)
set(RESULT "")
foreach(PROJECT ${FWPROJECTS})
if(${PROJECT}Test_DIR)
if(${PROJECT}Test_DIR AND ("${FILTER}" STREQUAL "" OR "${${PROJECT}Test_DIR}" MATCHES "${FILTER}" ))
list(APPEND RESULT ${PROJECT}Test)
endif()
endforeach()
......@@ -1059,14 +1072,16 @@ if(PROJECTS_TO_BUILD)
message(STATUS "Project configuration is restricted to : ${PROJECTS_TO_BUILD}")
endif()
# Clear all previous tests from project list
findTests("${PROJECT_LIST}" "" PROJECT_TESTS)
if(PROJECT_TESTS)
list(REMOVE_ITEM PROJECT_LIST ${PROJECT_TESTS})
endif()
# Append tests to the project list
if(BUILD_TESTS)
findTests("${PROJECT_LIST}" PROJECT_TESTS)
findTests("${PROJECT_LIST}" "${TESTS_FILTER}" PROJECT_TESTS)
list(APPEND PROJECT_LIST ${PROJECT_TESTS})
else()
findTests("${PROJECT_LIST}" PROJECT_TESTS)
if(PROJECT_TESTS)
list(REMOVE_ITEM PROJECT_LIST ${PROJECT_TESTS})
endif()
endif()
if(PROJECTS_TO_INSTALL)
......@@ -1102,8 +1117,14 @@ endif()
# Doxygen documentation
option(BUILD_DOCUMENTATION "Build the doxygen documentation" OFF)
if(BUILD_DOCUMENTATION)
option(BUILD_DOCSET "Build a Dash/Zeal/XCode docset" OFF)
include(${FWCMAKE_RESOURCE_PATH}doxygen/doxygen_generator.cmake)
doxygenGenerator(${PROJECT_LIST})
if(BUILD_DOCSET)
docsetGenerator(${PROJECT_LIST})
endif()
else()
unset(BUILD_DOCSET CACHE)
endif()
# Eclipse project
......
......@@ -11,7 +11,7 @@ set( REQUIREMENTS
fwlauncher
gui
guiQt
imageConfig
dataManagerConfig
ioAtoms
ioVTK
preferences
......
......@@ -179,12 +179,12 @@ Comment: Name inside the drawing are the uid of the service defined below.
<!-- Image reader/writer -->
<service uid="readerPathFile" type="::uiIO::editor::SIOSelector">
<in key="image" uid="imageUID" />
<inout key="data" uid="imageUID" />
<type mode="reader" />
</service>
<service uid="writerPathFile" type="::uiIO::editor::SIOSelector">
<inout key="image" uid="imageUID" />
<inout key="data" uid="imageUID" />
<type mode="writer" />
</service>
......
......@@ -6,9 +6,10 @@
<id>Ex02ImageMix</id>
<config>
<!-- backgroundImage description -->
<object uid="backgroundImage" type="::fwData::Image" />
<object uid="backgroundImage" type="::fwData::Image" src="deferred" />
<!-- frontImage description -->
<object uid="frontImage" type="::fwData::Image" />
<object uid="frontImage" type="::fwData::Image" src="deferred" />
<service uid="mainFrame" type="::gui::frame::SDefaultFrame">
<gui>
<frame>
......@@ -127,20 +128,21 @@
</layout>
</gui>
<registry>
<view sid="sliderIndexEditor" start="yes" />
<view sid="sliderIndexEditor" start="no" />
<view sid="snapshotBlendSceneEditor" start="yes" />
</registry>
</service>
<service uid="snapshotBlendSceneEditor" type="::uiVisuQt::SnapshotEditor" />
<service uid="readerBackgroundImage" type="::uiIO::editor::SIOSelector">
<inout key="target" uid="backgroundImage" />
<type mode="reader" />
<out key="data" uid="backgroundImage" />
<type mode="reader" class="::fwData::Image" />
</service>
<service uid="readerFrontImage" type="::uiIO::editor::SIOSelector">
<inout key="target" uid="frontImage" />
<type mode="reader" />
<out key="data" uid="frontImage" />
<type mode="reader" class="::fwData::Image" />
</service>
<service uid="bgImgEditorsView" type="::gui::view::SDefaultView">
......@@ -152,8 +154,8 @@
</layout>
</gui>
<registry>
<view sid="imageInfo" start="yes" />
<view sid="windowLevel" start="yes" />
<view sid="imageInfo" start="no" />
<view sid="windowLevel" start="no" />
</registry>
</service>
......@@ -186,9 +188,9 @@
</layout>
</gui>
<registry>
<view sid="imageInfo2" start="yes" />
<view sid="imageTransparency2" start="yes" />
<view sid="windowLevel2" start="yes" />
<view sid="imageInfo2" start="no" />
<view sid="imageTransparency2" start="no" />
<view sid="windowLevel2" start="no" />
</registry>
</service>
......@@ -222,7 +224,7 @@
<!-- Generic scene to show merging of backgroung and front images -->
<!-- *************************** Begin generic scene *************************** -->
<service uid="blendGenericScene" type="::fwRenderVTK::SRender" autoConnect="yes">
<service uid="blendGenericScene" type="::fwRenderVTK::SRender">
<scene>
<picker id="picker" vtkclass="fwVtkCellPicker" />
<vtkObject id="imageBlend" class="vtkImageBlend" />
......@@ -283,7 +285,7 @@
<!-- Generic scene for background image -->
<!-- *************************** Begin generic scene *************************** -->
<service uid="bgImgGenericScene" type="::fwRenderVTK::SRender" autoConnect="yes">
<service uid="bgImgGenericScene" type="::fwRenderVTK::SRender">
<scene>
<picker id="picker" vtkclass="fwVtkCellPicker" />
<renderer id="default" background="0.0" />
......@@ -312,7 +314,7 @@
<!-- Generic scene for front image -->
<!-- *************************** Begin generic scene *************************** -->
<service uid="fgImgGenericScene" type="::fwRenderVTK::SRender" autoConnect="yes">
<service uid="fgImgGenericScene" type="::fwRenderVTK::SRender">
<scene>
<picker id="picker" vtkclass="fwVtkCellPicker" />
<renderer id="default" background="0.0" />
......@@ -356,6 +358,13 @@
<start uid="mainFrame" />
<start uid="forwarderMsg" />
<!-- deferred start -->
<start uid="sliderIndexEditor" />
<start uid="imageInfo" />
<start uid="windowLevel" />
<start uid="imageInfo2" />
<start uid="windowLevel2" />
<start uid="imageTransparency2" />
<!-- VTK scene 'blendGenericScene' -->
<start uid="MPRNegato3D" />
<start uid="interactor" />
......
......@@ -329,7 +329,7 @@ Detail of the ToolBar
</service>
<service uid="readerPathFile" type="::uiIO::editor::SIOSelector">
<in key="image" uid="myImage" />
<inout key="data" uid="myImage" />
<type mode="reader" />
<selection mode="exclude" />
<addSelection service="::ioXML::FwXMLGenericReaderService" />
......@@ -342,14 +342,14 @@ Detail of the ToolBar
</service>
<service uid="meshReader1" type="::uiIO::editor::SIOSelector">
<inout key="target" uid="meshOnNegato1" />
<inout key="data" uid="meshOnNegato1" />
<type mode="reader" />
<selection mode="exclude" />
<addSelection service="::ioXML::FwXMLGenericReaderService" />
</service>
<service uid="meshReader2" type="::uiIO::editor::SIOSelector">
<inout key="target" uid="meshOnNegato2" />
<inout key="data" uid="meshOnNegato2" />
<type mode="reader" />
<selection mode="exclude" />
<addSelection service="::ioXML::FwXMLGenericReaderService" />
......
......@@ -252,7 +252,7 @@
</service>
<service uid="readerFile1" type="::uiIO::editor::SIOSelector">
<in key="image" uid="image1" />
<inout key="data" uid="image1" />
<type mode="reader" />
<selection mode="exclude" />
<addSelection service="::ioXML::FwXMLGenericReaderService" />
......@@ -269,7 +269,7 @@
</service>
<service uid="readerFile2" type="::uiIO::editor::SIOSelector">
<in key="image" uid="image2" />
<inout key="data" uid="image2" />
<type mode="reader" />
<selection mode="exclude" />
<addSelection service="::ioXML::FwXMLGenericReaderService" />
......@@ -303,7 +303,7 @@
</service>
<service uid="writerFile" type="::uiIO::editor::SIOSelector">
<in key="target" uid="imageResult" />
<inout key="data" uid="imageResult" />
<type mode="writer" />
</service>
......
......@@ -62,7 +62,7 @@
<!-- ******************************************************************************************************* -->
<service uid="actionOpen" type="::uiIO::editor::SIOSelector" config="ActivityReaderConfig">
<inout key="seriesDB" uid="seriesDB" />
<inout key="data" uid="seriesDB" />
</service>
<service uid="actionSave" type="::gui::action::SStarter">
......@@ -73,7 +73,7 @@
<!-- Service to save the launched activities -->
<service uid="SDBWriter" type="::uiIO::editor::SIOSelector" config="ActivityWriterConfig">
<inout key="seriesDB" uid="seriesDB" />
<inout key="data" uid="seriesDB" />
</service>
<!-- ******************************************************************************************************* -->
......@@ -82,8 +82,8 @@
<!-- Display the activity in the current view -->
<service uid="dynamicView" type="::guiQt::editor::SActivityView">
<inout key="SERIESDB" uid="seriesDB" />
<parameters>
<parameter replace="SERIESDB" by="seriesDB" />
<parameter replace="ICON_PATH" by="${appIconPath}" />
<parameter replace="enabledPreviousChannel" by="enabledPreviousChannel" />
<parameter replace="enabledNextChannel" by="enabledNextChannel" />
......
......@@ -137,7 +137,7 @@
</service>
<service uid="SDBWriter" type="::uiIO::editor::SIOSelector" config="SDBAtomsWriterIOSelectorConfig" >
<inout key="series" uid="seriesDB" />
<inout key="data" uid="seriesDB" />
</service>
<service uid="selector" type="::uiMedDataQt::editor::SSelector" autoConnect="yes">
......
......@@ -46,9 +46,9 @@
</registry>
</service>
<service uid="imageReader" type="::uiIO::editor::SIOSelector" autoConnect="no">
<service uid="imageReader" type="::uiIO::editor::SIOSelector">
<type mode="reader" />
<in key="image" uid="image" />
<inout key="data" uid="image" />
</service>
<service uid="actionOpen" type="::gui::action::SStarter">
......
set( NAME Ex08SParameters )
set( VERSION 0.1 )
set( TYPE APP )
set( DEPENDENCIES )
set( REQUIREMENTS
servicesReg
dataReg
gui
guiQt
appXml
fwlauncher
media
preferences
)
bundleParam(appXml PARAM_LIST config PARAM_VALUES Ex07SParametersConfig)
This diff is collapsed.
......@@ -104,7 +104,7 @@
When the service was chosen, it is started, updated and stopped, so the data is read.
-->
<service uid="myReaderPathFile" type="::uiIO::editor::SIOSelector" >
<inout key="target" uid="image" />
<inout key="data" uid="image" />
</service>
<!--
......
......@@ -82,7 +82,7 @@
<service uid="actionQuit" type="::gui::action::SQuit" />
<service uid="myReaderPathFile" type="::uiIO::editor::SIOSelector">
<inout key="target" uid="mesh" />
<inout key="data" uid="mesh" />
<type mode="reader" /><!-- mode is optional (by default it is "reader") -->
</service>
......
......@@ -132,12 +132,12 @@
</service>
<service uid="readerPathImageFile" type="::uiIO::editor::SIOSelector">
<inout key="target" uid="myImage" />
<inout key="data" uid="myImage" />
<type mode="reader" />
</service>
<service uid="writerImageFile" type="::uiIO::editor::SIOSelector">
<in key="target" uid="myImage" />
<inout key="data" uid="myImage" />
<type mode="writer" />
</service>
......@@ -150,12 +150,12 @@
</service>
<service uid="readerPathMeshFile" type="::uiIO::editor::SIOSelector">
<inout key="target" uid="myMesh" />
<inout key="data" uid="myMesh" />
<type mode="reader" />
</service>
<service uid="writerMeshFile" type="::uiIO::editor::SIOSelector">
<in key="target" uid="myMesh" />
<inout key="data" uid="myMesh" />
<type mode="writer" />
</service>
......
......@@ -107,7 +107,7 @@
</service>
<service uid="readerPathImageFile" type="::uiIO::editor::SIOSelector">
<inout key="target" uid="myImage1" />
<inout key="data" uid="myImage1" />
<type mode="reader" />
</service>
......
......@@ -162,7 +162,7 @@
************************************************* -->
<!-- Image displayed in the scene -->
<service uid="imageReader" type="::uiIO::editor::SIOSelector">
<inout key="target" uid="imageUID" />
<inout key="data" uid="imageUID" />
<type mode="reader" />
</service>
......@@ -206,13 +206,13 @@
<!-- texture reader -->
<service uid="textureReader" type="::uiIO::editor::SIOSelector">
<inout key="target" uid="textureUID" />
<inout key="data" uid="textureUID" />
<type mode="reader" />
</service>
<!-- Mesh reader -->
<service uid="meshReader" type="::uiIO::editor::SIOSelector">
<inout key="target" uid="meshUID" />
<inout key="data" uid="meshUID" />
<type mode="reader" />
</service>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment