merge(dev): release 16.0.0

21f2efdc · fw4splbot · 6ee4605b · cfff1dce · 21f2efdc · 21f2efdc
Commit 21f2efdc authored Apr 18, 2018 by fw4splbot
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,6 +38,7 @@ before_script:
    - $CMAKE_BIN -DCMAKE_INSTALL_PREFIX:PATH=/tmp $TRAVIS_BUILD_DIR/ -DCMAKE_BUILD_TYPE:STRING=Debug -DBUILD_DOCUMENTATION:BOOL=ON -DBUILD_TESTS:BOOL=OFF -DDOXYGEN_EXECUTABLE:FILEPATH=$DOXYGEN_BIN -DENABLE_PCH:BOOL=OFF
    - cd $TRAVIS_BUILD_DIR
 script:
+    - echo $TRAVIS_COMMIT_RANGE
    - fw4spl-git/hooks/sheldon $TRAVIS_COMMIT_RANGE
    - cd $TRAVIS_BUILD_DIR/build
    - make doc

--- a/Apps/VRRender/rc/configurations/VRRenderBase.xml
+++ b/Apps/VRRender/rc/configurations/VRRenderBase.xml
@@ -9,14 +9,14 @@
        <object uid="seriesDB" type="::fwMedData::SeriesDB" />

        <service uid="action_open" type="::uiIO::action::SSeriesDBMerger">
-            <inout key="seriesDB" uid="seriesDB" />
+            <inout key="data" uid="seriesDB" />
            <IOSelectorSrvConfig name="SDBAtomsReaderIOSelectorConfig" />
        </service>
        <service uid="action_save" type="::gui::action::SStarter">
            <start uid="SDBWriter" />
        </service>
        <service uid="SDBWriter" type="::uiIO::editor::SIOSelector">
-            <in key="seriesDB" uid="seriesDB" />
+            <inout key="data" uid="seriesDB" />
            <type mode="writer" />
            <selection mode="include" />
            <addSelection service="::ioAtoms::SWriter" />
@@ -99,9 +99,9 @@
        </service>

        <service uid="dynamicView" type="::guiQt::editor::SDynamicView" autoConnect="yes">
+            <inout key="SERIESDB" uid="seriesDB" />
            <mainActivity id="SDBVRRender" closable="false" />
            <parameters>
-                <parameter replace="SERIESDB" by="seriesDB" />
                <parameter replace="ICON_PATH" by="${appIconPath}" />
                <parameter replace="DYNAMICVIEW_CHANNEL" by="dynamicViewChannel" />
                <parameter replace="PROGRESS_CHANNEL" by="progressStatus" />

--- a/Bundles/activity/3DVisualizationActivity/Properties.cmake
+++ b/Bundles/activity/3DVisualizationActivity/Properties.cmake
@@ -19,5 +19,6 @@ set( REQUIREMENTS
    uiReconstructionQt
    uiMedDataQt
    media
+    dataManagerConfig
    2DVisualizationActivity
 )
--- a/Bundles/activity/3DVisualizationActivity/rc/configurations/3DVisualization.xml
+++ b/Bundles/activity/3DVisualizationActivity/rc/configurations/3DVisualization.xml
@@ -126,7 +126,7 @@
        </service>

        <service uid="action_organManager" type="::gui::action::SConfigLauncher">
-            <appConfig id="OrganManagerWithSeries" />
+            <appConfig id="ModelSeriesManagerWindow" />
            <inout key="ORGAN_MANAGER_MODELSERIES" uid="${modelSeries}" />
            <parameter replace="ICON_PATH" by="${ICON_PATH}" />
        </service>

--- a/Bundles/activity/3DVisualizationActivity/rc/plugin.xml
+++ b/Bundles/activity/3DVisualizationActivity/rc/plugin.xml
@@ -4,7 +4,6 @@
    <requirement id="visuVTKQt" />

    <xi:include href="configurations/3DVisualization.xml" xmlns:xi="http://www.w3.org/2003/XInclude" />
-    <xi:include href="configurations/ManageOrganWithSeries.xml" xmlns:xi="http://www.w3.org/2003/XInclude" />
    <xi:include href="configurations/3DNegatoWithAcq.xml" xmlns:xi="http://www.w3.org/2003/XInclude" />
    <xi:include href="configurations/3DSimpleConfig.xml" xmlns:xi="http://www.w3.org/2003/XInclude" />


--- a/Bundles/activity/blendActivity/Properties.cmake
+++ b/Bundles/activity/blendActivity/Properties.cmake
@@ -15,5 +15,6 @@ set( REQUIREMENTS
    scene2D
    uiTF
    media
+    qtSceneConfig
 )

--- a/Bundles/activity/dicomFilteringActivity/rc/plugin.xml
+++ b/Bundles/activity/dicomFilteringActivity/rc/plugin.xml
@@ -27,7 +27,6 @@
        <config>
            <type mode="reader" />
            <selection mode="include" />
-            <!-- <addSelection service="::ioDcmtk::SDicomSeriesDBReader" /> -->
            <addSelection service="::ioGdcm::SDicomSeriesDBReader" />
            <config id="DicomReaderConfig" service="::ioGdcm::SDicomSeriesDBReader" />
        </config>

--- a/Bundles/activity/ioActivity/rc/plugin.xml
+++ b/Bundles/activity/ioActivity/rc/plugin.xml
@@ -65,8 +65,8 @@
        <config>
            <object uid="${selection}" src="ref" />

-            <service uid="export_selection" type="::uiIO::editor::SIOSelector" autoConnect="yes">
-                <in key="selection" uid="${selection}" />
+            <service uid="export_selection" type="::uiIO::editor::SIOSelector">
+                <inout key="data" uid="${selection}" />
                <type mode="writer" />
                <selection mode="exclude" />
                <addSelection service="::ioAtoms::SWriter" />
@@ -101,7 +101,7 @@
            </service>

            <service uid="exportSelection" type="::uiIO::editor::SIOSelector">
-                <in key="selection" uid="vectorToSave" />
+                <inout key="data" uid="vectorToSave" />
                <type mode="writer" />
                <selection mode="include" />
                <addSelection service="::ioGdcm::SSurfaceSegmentationWriter" />
@@ -133,6 +133,7 @@
            <type mode="reader" />
            <selection mode="exclude" />
            <addSelection service="::ioAtoms::SReader" />
+            <addSelection service="::ioData::SAttachmentSeriesReader" />
        </config>
    </extension>

@@ -170,6 +171,7 @@
        <config>
            <type mode="reader" />
            <selection mode="exclude" />
+            <addSelection service="::ioData::SAttachmentSeriesReader" />
            <config id="MDAtomsConfig" service="::ioAtoms::SReader" />
        </config>
    </extension>
@@ -177,7 +179,7 @@
    <!-- Service config used for ioAtoms reader and writer. Defines the Data version and filter to use. -->
    <extension implements="::fwServices::registry::ServiceConfig">
        <id>MDAtomsConfig</id>
-        <desc>Reader/Writer for atoms representing a medical data</desc>
+        <desc>Json/Xml Reader/Writer (FW4SPL)</desc>
        <config>
            <patcher context="MedicalData" version="V10" />
            <filter>VRRenderMedicalDataV2</filter>
@@ -225,7 +227,7 @@
    <!-- Service config used for ioAtoms reader and writer to read landmarks -->
    <extension implements="::fwServices::registry::ServiceConfig">
        <id>LandmarksAtomsConfig</id>
-        <desc>Reader/Writer for atoms representing a medical data</desc>
+        <desc>Json/Xml Reader/Writer (FW4SPL)</desc>
        <config>
            <patcher context="Landmark" version="V2" />
        </config>

--- a/Bundles/activity/volumeRenderingActivity/Properties.cmake
+++ b/Bundles/activity/volumeRenderingActivity/Properties.cmake
@@ -20,5 +20,6 @@ set( REQUIREMENTS
    uiIO
    media
    imageConfig
+    dataManagerConfig
 )

--- a/Bundles/activity/volumeRenderingActivity/rc/configurations/VolumeRendering.xml
+++ b/Bundles/activity/volumeRenderingActivity/rc/configurations/VolumeRendering.xml
@@ -105,7 +105,7 @@
        </service>

        <service uid="action_organManager" type="::gui::action::SConfigLauncher">
-            <appConfig id="OrganManagerWithSeries" />
+            <appConfig id="ModelSeriesManagerWindow" />
            <inout key="ORGAN_MANAGER_MODELSERIES" uid="optionalModelSeries" />
            <parameter replace="ICON_PATH" by="${ICON_PATH}" />
        </service>

--- a/SrcLib/io/fwCsvIO/CMakeLists.txt
+++ b/SrcLib/io/fwCsvIO/CMakeLists.txt
--- a/Bundles/config/dataManagerConfig/Properties.cmake
+++ b/Bundles/config/dataManagerConfig/Properties.cmake
+
+set( NAME dataManagerConfig )
+set( VERSION 0.1 )
+set( TYPE BUNDLE )
+set( DEPENDENCIES  )
+
+set( REQUIREMENTS
+    gui
+    guiQt
+    uiMedDataQt
+    uiReconstructionQt
+    ctrlSelection
+    media
+)
--- a/Bundles/config/imageConfig/rc/configurations/ImageManager.xml
+++ b/Bundles/config/imageConfig/rc/configurations/ImageManager.xml
 <!--
+This configuration displays editor for image (slice and windowing), and call the service that adds the image's fields
+for slices and transfer function.
+
 Example:

 <service uid="..." type="::fwServices::SConfigController">

--- a/Bundles/activity/3DVisualizationActivity/rc/configurations/ManageOrganWithSeries.xml
+++ b/Bundles/activity/3DVisualizationActivity/rc/configurations/ManageOrganWithSeries.xml
+<!--
+This config displays the editors to manage the ModelSeries: show/hide reconstructions, change the color, ...
+
+Example
+<service uid="..." type="::fwServices::SConfigController">
+    <appConfig id="ModelSeriesManagerView" />
+    <inout key="ORGAN_MANAGER_MODELSERIES" uid="modelSeries" />
+    <parameter replace="WID_PARENT" by="modelManagerView" />
+</service>
+-->
 <extension implements="::fwServices::registry::AppConfig">
-    <id>OrganManagerWithSeries</id>
+    <id>ModelSeriesManagerView</id>
    <parameters>
-        <param name="ORGAN_MANAGER_MODELSERIES" />
-        <param name="CLOSE_CONFIG_CHANNEL" default="DummyChannel" /><!--  defined by SConfigLauncher -->
-        <param name="ICON_PATH" />
-        <param name="WindowTitle" default="Organs Manager"/>
+        <param name="WID_PARENT" />
+        <param name="ORGAN_MANAGER_MODELSERIES" /><!-- model series to manage -->
    </parameters>
+    <desc>Display the editors to manage the ModelSeries: show/hide reconstructions, change the color, ... </desc>
    <config>
-
        <object uid="${ORGAN_MANAGER_MODELSERIES}" type="::fwMedData::ModelSeries" src="ref" />
        <object uid="reconstruction" type="::fwData::Reconstruction" src="deferred" />

-        <!-- MAIN FRAME -->
-        <service uid="organManagerFrame" type="::gui::frame::SDefaultFrame">
-            <window onclose="notify" />
-            <gui>
-                <frame>
-                    <name>${WindowTitle}</name>
-                    <icon>${ICON_PATH}</icon>
-                    <style mode="STAY_ON_TOP" />
-                </frame>
-            </gui>
-            <registry>
-                <view sid="multiViewOrgans" start="yes" />
-            </registry>
-        </service>
-
-        <service uid="multiViewOrgans" type="::gui::view::SDefaultView">
+        <service uid="multiViewOrgans" type="::gui::view::SDefaultView" >
            <gui>
                <layout type="::fwGui::ToolboxLayoutManager">
-                    <orientation value="vertical" />
                    <view caption="Organs" expanded="true" />
                    <view caption="Material" expanded="true" />
                    <view caption="Representation" />
                </layout>
            </gui>
            <registry>
+                <parent wid="${WID_PARENT}" />
                <view sid="listOrganEditor" start="yes" />
                <view sid="organMaterialEditor" start="no" />
                <view sid="representationEditor" start="no" />
            </registry>
        </service>

-        <service uid="myUpdaterReconst" type="::ctrlSelection::updater::SObjFromSlot">
+        <service uid="updaterReconst" type="::ctrlSelection::updater::SObjFromSlot">
            <out key="object" uid="reconstruction" />
        </service>

-        <service uid="organMaterialEditor" type="::uiReconstructionQt::OrganMaterialEditor" autoConnect="yes">
+        <service uid="organMaterialEditor" type="::uiReconstructionQt::OrganMaterialEditor" >
            <inout key="reconstruction" uid="reconstruction" />
        </service>

-        <service uid="representationEditor" type="::uiReconstructionQt::RepresentationEditor" autoConnect="yes">
+        <service uid="representationEditor" type="::uiReconstructionQt::RepresentationEditor" >
            <inout key="reconstruction" uid="reconstruction" />
        </service>

@@ -58,26 +51,21 @@
            <inout key="modelSeries" uid="${ORGAN_MANAGER_MODELSERIES}" />
            <columns>
                <organ_name>@organ_name</organ_name>
-                <volume_cc view="positive">@volume</volume_cc>
+                <structure_type>@structure_type</structure_type>
            </columns>
        </service>

        <connect>
            <signal>listOrganEditor/reconstructionSelected</signal>
-            <slot>myUpdaterReconst/addOrSwap</slot>
-        </connect>
-
-        <connect channel="${CLOSE_CONFIG_CHANNEL}">
-            <signal>organManagerFrame/closed</signal>
+            <slot>updaterReconst/addOrSwap</slot>
        </connect>

-        <!-- START AND STOP SERVICES -->
-        <start uid="organManagerFrame" />
-        <start uid="myUpdaterReconst" />
+        <start uid="multiViewOrgans" />
+        <start uid="updaterReconst" />

        <!-- Deferred start -->
-        <start uid="organMaterialEditor" />
        <start uid="representationEditor" />
+        <start uid="organMaterialEditor" />

    </config>
 </extension>
--- a/Bundles/config/dataManagerConfig/rc/configurations/ModelSeriesManagerWindow.xml
+++ b/Bundles/config/dataManagerConfig/rc/configurations/ModelSeriesManagerWindow.xml
+<!--
+This config open a windows containing the editors to manage the ModelSeries: show/hide reconstructions, change the
+color, ...
+
+Example:
+<service uid="..." type="::fwServices::SConfigController">
+    <appConfig id="ModelSeriesManagerWindow" />
+    <inout key="ORGAN_MANAGER_MODELSERIES" uid="modelSeries" />
+    <parameter replace="ICON_PATH" by="my/icon/path.ico" />
+    <parameter name="WindowTitle"  by="" />
+</service>
+With:
+- ORGAN_MANAGER_MODELSERIES (mandatory): uid of the ModelSeries to manage
+- ICON_PATH (mandatory): icon of the window
+- WindowTitle(optional): title of the window
+-->
+<extension implements="::fwServices::registry::AppConfig">
+    <id>ModelSeriesManagerWindow</id>
+    <parameters>
+        <param name="ORGAN_MANAGER_MODELSERIES" />
+        <param name="CLOSE_CONFIG_CHANNEL" default="DummyChannel" /><!--  defined by SConfigLauncher -->
+        <param name="ICON_PATH" />
+        <param name="WindowTitle" default="Organs Manager"/>
+    </parameters>
+    <desc>Open a windows containing the editors to manage the ModelSeries: show/hide reconstructions, change the color.</desc>
+    <config>
+
+        <object uid="${ORGAN_MANAGER_MODELSERIES}" type="::fwMedData::ModelSeries" src="ref" />
+        <object uid="reconstruction" type="::fwData::Reconstruction" src="deferred" />
+
+        <!-- MAIN FRAME -->
+        <service uid="organManagerFrame" type="::gui::frame::SDefaultFrame">
+            <window onclose="notify" />
+            <gui>
+                <frame>
+                    <name>${WindowTitle}</name>
+                    <icon>${ICON_PATH}</icon>
+                    <style mode="STAY_ON_TOP" />
+                </frame>
+            </gui>
+            <registry>
+                <view wid="OrganManagerView" />
+            </registry>
+        </service>
+
+        <service uid="modelManager" type="::fwServices::SConfigController">
+            <appConfig id="ModelSeriesManagerView" />
+            <inout key="ORGAN_MANAGER_MODELSERIES" uid="${ORGAN_MANAGER_MODELSERIES}" />
+            <parameter replace="WID_PARENT" uid="OrganManagerView" />
+        </service>
+
+        <connect channel="${CLOSE_CONFIG_CHANNEL}">
+            <signal>organManagerFrame/closed</signal>
+        </connect>
+
+        <!-- START AND STOP SERVICES -->
+        <start uid="organManagerFrame" />
+        <start uid="modelManager" />
+
+    </config>
+</extension>
--- a/Bundles/config/dataManagerConfig/rc/plugin.xml
+++ b/Bundles/config/dataManagerConfig/rc/plugin.xml
+<plugin id="dataManagerConfig" version="@PROJECT_VERSION@" >
+
+    <requirement id="dataReg" />
+    <requirement id="servicesReg" />
+
+    <xi:include href="configurations/ModelSeriesManagerWindow.xml" xmlns:xi="http://www.w3.org/2003/XInclude" />
+    <xi:include href="configurations/ImageManager.xml" xmlns:xi="http://www.w3.org/2003/XInclude" />
+    <xi:include href="configurations/ModelSeriesManagerView.xml" xmlns:xi="http://www.w3.org/2003/XInclude" />
+
+</plugin>
--- a/Bundles/config/imageConfig/Properties.cmake
+++ b/Bundles/config/imageConfig/Properties.cmake
@@ -4,8 +4,9 @@ set( VERSION 0.1 )
 set( TYPE BUNDLE )
 set( DEPENDENCIES  )

-set( REQUIREMENTS 
+set( REQUIREMENTS
        2DVisualizationActivity
+        qtSceneConfig
        dataReg
        servicesReg
        gui
@@ -20,4 +21,3 @@ set( REQUIREMENTS
        scene2D
        media
        )
-
--- a/Bundles/config/imageConfig/rc/plugin.xml
+++ b/Bundles/config/imageConfig/rc/plugin.xml
 <plugin id="imageConfig" version="@PROJECT_VERSION@" >

-    <xi:include href="configurations/ImageManager.xml" xmlns:xi="http://www.w3.org/2003/XInclude" />
-    <xi:include href="configurations/TransferFunctionWidget.xml" xmlns:xi="http://www.w3.org/2003/XInclude" />
+    <requirement id="dataReg" />
+    <requirement id="servicesReg" />
+
    <xi:include href="configurations/TransferFunctionWithNegatoEditor.xml" xmlns:xi="http://www.w3.org/2003/XInclude" />
-        
+
 </plugin>
--- a/Bundles/config/qtSceneConfig/CMakeLists.txt
+++ b/Bundles/config/qtSceneConfig/CMakeLists.txt
+fwLoadProperties()
--- a/Bundles/config/qtSceneConfig/Properties.cmake
+++ b/Bundles/config/qtSceneConfig/Properties.cmake
+
+set( NAME qtSceneConfig )
+set( VERSION 0.1 )
+set( TYPE BUNDLE )
+set( DEPENDENCIES  )
+
+set( REQUIREMENTS
+    dataReg
+    servicesReg
+    gui
+    guiQt
+    uiTF
+    scene2D
+    media
+)