Andreas Tille · Andreas Tille · Andreas Tille · Andreas Tille · Andreas Tille · 125cabe6
--- a/.fw4spl
+++ b/.fw4spl
+fw4spl
--- 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/Properties.cmake
+++ b/Apps/VRRender/Properties.cmake
@@ -24,6 +24,7 @@ set( REQUIREMENTS
    uiIO
    uiGenericQt
    uiMedDataQt
+    uiPreferences

    2DVisualizationActivity
    3DVisualizationActivity
@@ -35,6 +36,9 @@ set( REQUIREMENTS
    dicomPacsReaderActivity
    dicomPacsWriterActivity

+    DicomWebReaderActivity
+    DicomWebWriterActivity
+
    media
    style


--- a/Apps/VRRender/rc/configurations/VRRenderBase.xml
+++ b/Apps/VRRender/rc/configurations/VRRenderBase.xml
@@ -16,7 +16,7 @@
            <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" />
@@ -42,11 +42,13 @@
            <gui>
                <layout>
                    <menu name="File" />
+                    <menu name="Preferences" />
                    <menu name="Help" />
                </layout>
            </gui>
            <registry>
                <menu sid="menu_file" start="yes" />
+                <menu sid="menu_preferences" start="yes" />
                <menu sid="menu_help" start="yes" />
            </registry>
        </service>
@@ -66,6 +68,17 @@
            </registry>
        </service>

+        <service uid="menu_preferences" type="::gui::aspect::SDefaultMenu">
+            <gui>
+                <layout>
+                    <menuItem name="Preferences configuration"/>
+                </layout>
+            </gui>
+            <registry>
+                <menuItem sid="action_configuration" start="yes" />
+            </registry>
+        </service>
+
        <service uid="menu_help" type="::gui::aspect::SDefaultMenu">
            <gui>
                <layout>
@@ -84,6 +97,21 @@

        <service uid="action_quit" type="::gui::action::SQuit" />

+        <service uid="action_configuration" type="::uiPreferences::action::SPreferencesConfiguration">
+            <preference>
+                <type>text</type>
+                <name>Pacs Server Hostname</name>
+                <key>PACS_SERVER_HOSTNAME</key>
+                <default_value>127.0.0.1</default_value>
+            </preference>
+            <preference>
+                <type>int</type>
+                <name>Pacs Server Port</name>
+                <key>PACS_SERVER_PORT</key>
+                <default_value>80</default_value>
+             </preference>
+        </service>
+
        <service uid="action_about" type="::uiGenericQt::action::SShowAbout">
            <filename id="VRRender-${appVersion}/about/about.html" />
        </service>
@@ -98,10 +126,10 @@
            <url>http://www.ircad.fr/softwares/vr-render/Software.php</url>
        </service>

-        <service uid="dynamicView" type="::guiQt::editor::SDynamicView" autoConnect="yes">
+        <service uid="dynamicView" type="::guiQt::editor::SDynamicView">
+            <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" />
@@ -119,6 +147,10 @@
            <slot>dynamicView/createTab</slot>
        </connect>

+        <connect channel="parametersChannel">
+            <signal>action_configuration/parametersModified</signal>
+        </connect>
+
        <start uid="mainFrame" />
        <start uid="progress_statusbar" />


--- a/Apps/VRRender/rc/configurations/sdb.xml
+++ b/Apps/VRRender/rc/configurations/sdb.xml
@@ -13,7 +13,7 @@
        <object uid="${SERIESDB}" type="::fwMedData::SeriesDB" src="ref" />
        <object uid="selections" type="::fwData::Vector" />

-        <service uid="mainview" type="::gui::view::SDefaultView" autoConnect="yes">
+        <service uid="mainview" type="::gui::view::SDefaultView" >
            <gui>
                <layout type="::fwGui::CardinalLayoutManager">
                    <view caption="Information" align="center" minWidth="200" />
@@ -46,6 +46,8 @@
                    <menuItem name="DICOM PACS Reader" icon="media-0.1/icons/Pull.svg" />
                    <menuItem name="DICOM PACS Writer" icon="media-0.1/icons/Push.svg" />
                    <menuItem name="DICOM Filtering" icon="media-0.1/icons/icon-DICOM-Filtering.svg" />
+                    <menuItem name="DICOM Web Reader" icon="media-0.1/icons/Pull.svg" />
+                    <menuItem name="DICOM Web Writer" icon="media-0.1/icons/Push.svg" />
                </layout>
            </gui>
            <registry>
@@ -59,11 +61,13 @@
                <menuItem sid="action_dicomPacsReader" start="yes" />
                <menuItem sid="action_dicomPacsWriter" start="yes" />
                <menuItem sid="action_dicomFiltering" start="yes" />
+                <menuItem sid="action_dicomWebReader" start="yes" />
+                <menuItem sid="action_dicomWebWriter" start="yes" />
            </registry>
        </service>

        <service uid="action_import" type="::uiIO::action::SSeriesDBMerger">
-            <in key="seriesDB" uid="${SERIESDB}" />
+            <inout key="seriesDB" uid="${SERIESDB}" />
            <IOSelectorSrvConfig name="SDBReaderIOSelectorConfig" />
        </service>
        <service uid="selector" type="::uiMedDataQt::editor::SSelector" autoConnect="yes">
@@ -73,7 +77,8 @@

        <service uid="activityCreator" type="::uiMedDataQt::editor::SActivityWizard">
            <inout key="seriesDB" uid="${SERIESDB}" />
-            <ioSelectorConfig>FullSDBReaderIOSelectorConfig</ioSelectorConfig>
+            <ioSelectorConfig>SDBReaderIOSelectorConfig</ioSelectorConfig>
+            <sdbIoSelectorConfig>FullSDBReaderIOSelectorConfig</sdbIoSelectorConfig>
            <icons>
                <icon type="::fwMedData::ImageSeries" icon="media-0.1/icons/ImageSeries.svg" />
                <icon type="::fwMedData::ModelSeries" icon="media-0.1/icons/ModelSeries.svg" />
@@ -197,6 +202,36 @@
            </config>
        </service>

+        <service uid="action_dicomWebReader" type="::activities::action::SActivityLauncher">
+            <in key="series" uid="selections" />
+            <config>
+                <parameters>
+                    <parameter replace="SERIESDB" by="${SERIESDB}"  />
+                    <parameter replace="ICON_PATH" by="${ICON_PATH}" />
+                    <parameter replace="APP_NAME" by="VRRender" />
+                </parameters>
+                <filter>
+                    <mode>include</mode>
+                    <id>DicomWebReaderActivity</id>
+                </filter>
+            </config>
+        </service>
+
+        <service uid="action_dicomWebWriter" type="::activities::action::SActivityLauncher">
+            <in key="series" uid="selections" />
+            <config>
+                <parameters>
+                    <parameter replace="ICON_PATH" by="${ICON_PATH}" />
+                    <parameter replace="APP_NAME" by="VRRender" />
+                    <parameter replace="PROGRESS_CHANNEL" by="${PROGRESS_CHANNEL}" />
+                </parameters>
+                <filter>
+                    <mode>include</mode>
+                    <id>DicomWebWriterActivity</id>
+                </filter>
+            </config>
+        </service>
+
        <service uid="action_createActivity" type="::activities::action::SCreateActivity">
            <in key="series" uid="selections" />
            <filter>
@@ -217,7 +252,7 @@
                    <mode>include</mode>
                    <id>ImageSeriesExport</id>
                    <id>ModelSeriesExport</id>
-                    <id>DicomSeriesExport</id>
+                    <id>DicomSegmentationSurfaceExport</id>
                </filter>
            </config>
        </service>
@@ -257,6 +292,8 @@
            <signal>action_dicomPacsReader/activityLaunched</signal>
            <signal>action_dicomPacsWriter/activityLaunched</signal>
            <signal>action_dicomFiltering/activityLaunched</signal>
+            <signal>action_dicomWebReader/activityLaunched</signal>
+            <signal>action_dicomWebWriter/activityLaunched</signal>
        </connect>

        <connect>

--- a/Bundles/activity/2DVisualizationActivity/rc/configurations/2DNegato.xml
+++ b/Bundles/activity/2DVisualizationActivity/rc/configurations/2DNegato.xml
@@ -50,7 +50,7 @@
        <!-- Generic Scene Negato -->
        <!-- *************************** Begin generic scene *************************** -->

-        <service uid="negato" type="::fwRenderVTK::SRender" autoConnect="yes">
+        <service uid="negato" type="::fwRenderVTK::SRender" >
            <scene>
                <picker id="negatodefault" vtkclass="fwVtkCellPicker" />
                <renderer id="default" background="0.0" />
@@ -107,14 +107,14 @@
            <config renderer="default" picker="negatodefault" />
        </service>

-        <service uid="nameAdaptor" type="::visuVTKAdaptor::SText" autoConnect="yes">
+        <service uid="nameAdaptor" type="::visuVTKAdaptor::SText" >
            <config renderer="default" text="${patient_name}" fontSize="15" hAlign="right" vAlign="top" />
        </service>

        <!-- *************************** End generic scene *************************** -->

        <service uid="LockImageSrv" type="::ctrlMemory::LockDumpSrv">
-            <inout key="image" uid="${image}" />
+            <inout key="target" uid="${image}" />
        </service>

        <service uid="slider_negato" type="::uiImageQt::SliceIndexPositionEditor" autoConnect="yes" >
@@ -124,7 +124,6 @@

        <service uid="distanceNegatoEditor" type="::uiMeasurementQt::editor::Distance">
            <inout key="image" uid="${image}" />
-            <placeInScene uid="negato" />
        </service>

        <!-- START AND STOP SERVICES -->

--- a/Bundles/activity/2DVisualizationActivity/rc/configurations/2DNegatoWithTF.xml
+++ b/Bundles/activity/2DVisualizationActivity/rc/configurations/2DNegatoWithTF.xml
@@ -50,7 +50,7 @@
        <!-- Generic Scene Negato -->
        <!-- *************************** Begin generic scene *************************** -->

-        <service uid="negato" type="::fwRenderVTK::SRender" autoConnect="yes">
+        <service uid="negato" type="::fwRenderVTK::SRender" >
            <scene>
                <picker id="negatodefault" vtkclass="fwVtkCellPicker" />
                <renderer id="default" background="0.0" />
@@ -112,17 +112,16 @@
        <!-- *************************** End generic scene *************************** -->

        <service uid="LockImageSrv" type="::ctrlMemory::LockDumpSrv">
-            <in key="image" uid="${image}" />
+            <inout key="target" uid="${image}" />
        </service>

        <service uid="slider_negato" type="::uiImageQt::SliceIndexPositionEditor" autoConnect="yes">
-            <in key="image" uid="${image}" />
+            <inout key="image" uid="${image}" />
            <sliceIndex>${orientation}</sliceIndex>
        </service>

        <service uid="distanceNegatoEditor" type="::uiMeasurementQt::editor::Distance">
-            <in key="image" uid="${image}" />
-            <placeInScene uid="negato" />
+            <inout key="image" uid="${image}" />
        </service>

        <!-- ************************************* Connections ************************************ -->

--- a/Bundles/activity/2DVisualizationActivity/rc/configurations/2DSimpleConfig.xml
+++ b/Bundles/activity/2DVisualizationActivity/rc/configurations/2DSimpleConfig.xml
@@ -25,7 +25,7 @@

        <!-- *************************** Begin generic scene *************************** -->

-        <service uid="gs" type="::fwRenderVTK::SRender" autoConnect="yes">
+        <service uid="gs" type="::fwRenderVTK::SRender">
            <scene>
                <picker id="picker" vtkclass="fwVtkCellPicker" />
                <renderer id="default" background="0.0" />
@@ -68,14 +68,14 @@
        <!-- *************************** End generic scene *************************** -->

        <service uid="imageDumpLocker" type="::ctrlMemory::LockDumpSrv">
-            <in key="image" uid="${imageID}" />
+            <inout key="target" uid="${imageID}" />
        </service>

        <service uid="medicalImgConverter" type="::ctrlSelection::MedicalImageSrv">
            <inout key="image" uid="${imageID}" />
        </service>
        <service uid="sliderIndexEditor" type="::uiImageQt::SliceIndexPositionEditor" autoConnect="yes">
-            <in key="image" uid="${imageID}" />
+            <inout key="image" uid="${imageID}" />
            <sliceIndex>${orientation}</sliceIndex>
        </service>


--- a/Bundles/activity/2DVisualizationActivity/rc/configurations/2DVisualization.xml
+++ b/Bundles/activity/2DVisualizationActivity/rc/configurations/2DVisualization.xml
@@ -150,13 +150,13 @@
            </slots>
        </service>
        <service uid="ActionAddDistance" type="::uiMeasurement::action::AddDistance" >
-            <in key="image" uid="${image}" />
+            <inout key="image" uid="${image}" />
        </service>
        <service uid="ActionRemoveDistance" type="::uiMeasurement::action::RemoveDistance" >
-            <in key="image" uid="${image}" />
+            <inout key="image" uid="${image}" />
        </service>
        <service uid="ActionHideDistance" type="::uiMeasurement::action::ShowDistance" autoConnect="yes" >
-            <in key="image" uid="${image}" />
+            <inout key="image" uid="${image}" />
        </service>

        <!-- The action "previous" and "next" are visible only if the application use a "SActivitySequencer".

--- 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/3DNegatoWithAcq.xml
+++ b/Bundles/activity/3DVisualizationActivity/rc/configurations/3DNegatoWithAcq.xml
@@ -60,23 +60,22 @@
        </service>

        <service uid="LockImageSrv" type="::ctrlMemory::LockDumpSrv">
-            <inout key="imageKey" uid="optionalInputImage" />
+            <inout key="target" uid="optionalInputImage" />
        </service>

        <service uid="sliderNegato" type="::uiImageQt::SliceIndexPositionEditor" autoConnect="yes">
-            <inout key="imageKey" uid="optionalInputImage" />
+            <inout key="image" uid="optionalInputImage" />
            <sliceIndex>${orientation}</sliceIndex>
        </service>

        <service uid="distanceNegatoEditor" type="::uiMeasurementQt::editor::Distance">
            <inout key="image" uid="optionalInputImage" />
-            <placeInScene uid="negato" />
        </service>

        <!-- Generic Scene Negato -->
        <!-- *************************** Begin generic scene *************************** -->

-        <service uid="negato" type="::fwRenderVTK::SRender" autoConnect="yes">
+        <service uid="negato" type="::fwRenderVTK::SRender" >
            <scene>
                <picker id="negatodefault" vtkclass="fwVtkCellPicker" />
                <renderer id="default" background="0.0" />

--- a/Bundles/activity/3DVisualizationActivity/rc/configurations/3DSimpleConfig.xml
+++ b/Bundles/activity/3DVisualizationActivity/rc/configurations/3DSimpleConfig.xml
@@ -8,7 +8,7 @@
        <object uid="${objectID}" type="::fwMedData::ModelSeries" src="ref" />
        <!-- *************************** Begin generic scene *************************** -->

-        <service uid="gs" type="::fwRenderVTK::SRender" autoConnect="yes">
+        <service uid="gs" type="::fwRenderVTK::SRender">
            <registry>
                <parent wid="${WID_PARENT}" />
            </registry>

--- 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>
@@ -167,7 +167,7 @@
        </service>

        <service uid="LockImageSrv" type="::ctrlMemory::LockDumpSrv" >
-            <inout key="image" uid="optionalInputImage" />
+            <inout key="target" uid="optionalInputImage" />
        </service>

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

--- 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/DicomWebReaderActivity/CMakeLists.txt
+++ b/Bundles/activity/DicomWebReaderActivity/CMakeLists.txt
+fwLoadProperties()
+
--- a/Bundles/activity/DicomWebReaderActivity/Properties.cmake
+++ b/Bundles/activity/DicomWebReaderActivity/Properties.cmake
+
+set( NAME DicomWebReaderActivity )
+set( VERSION 0.1 )
+set( TYPE BUNDLE )
+set( DEPENDENCIES)
+set( REQUIREMENTS
+    2DVisualizationActivity
+    activities
+    ctrlMemory
+    ctrlSelection
+    dataReg
+    gui
+    guiQt
+    ioGdcm
+    ioVtkGdcm
+    ioDicomWeb
+    media
+    servicesReg
+    visuVTK
+    visuVTKAdaptor
+    visuVTKQt
+    )
--- a/Bundles/activity/DicomWebReaderActivity/rc/configurations/2DDicomWebPreviewConfig.xml
+++ b/Bundles/activity/DicomWebReaderActivity/rc/configurations/2DDicomWebPreviewConfig.xml
+<extension implements="::fwServices::registry::AppConfig">
+    <id>2DDicomWebPreviewConfig</id>
+    <parameters>
+        <param name="WID_PARENT" />
+        <param name="objectID" />
+    </parameters>
+    <config>
+        <object uid="${objectID}" type="::fwMedData::DicomSeries" src="ref" />
+        <object uid="image" type="::fwData::Image" src="deferred" />
+        <service uid="mainview" type="::gui::view::SDefaultView">
+            <gui>
+                <layout type="::fwGui::CardinalLayoutManager">
+                    <view align="center" />
+                    <view align="bottom" minWidth="200" minHeight="40" resizable="no" />
+                </layout>
+            </gui>
+            <registry>
+                <parent wid="${WID_PARENT}" />
+                <view sid="gs" start="yes" />
+                <view sid="sliderIndexDicomPullerEditor" start="yes" />
+            </registry>
+        </service>
+
+        <!-- *************************** Begin generic scene *************************** -->
+
+        <service uid="gs" type="::fwRenderVTK::SRender" >
+            <scene>
+                <picker id="picker" vtkclass="fwVtkCellPicker" />
+                <vtkObject id="imageBlend" class="vtkImageBlend" />
+                <renderer id="default" background="0.0" />
+                <adaptor uid="interactor4Negato" />
+                <adaptor uid="imageText" />
+                <adaptor uid="seriesAdaptor" />
+                <adaptor uid="nameAdaptor" />
+            </scene>
+        </service>
+
+        <service uid="interactor4Negato" type="::visuVTKAdaptor::SInteractorStyle">
+            <config renderer="default" style="InteractorStyle2DForNegato" />
+        </service>
+
+        <service uid="imageText" type="::visuVTKAdaptor::SImageText" autoConnect="yes">
+            <inout key="image" uid="image" />
+            <config renderer="default" picker="picker" text="" color="#FFFFFF" />
+        </service>
+
+        <service uid="seriesAdaptor" type="::visuVTKAdaptor::SNegatoMPR" autoConnect="yes">
+            <inout key="image" uid="image" />
+            <config renderer="default" picker="picker" mode="2D" slices="1" sliceIndex="axial" />
+        </service>
+
+        <service uid="nameAdaptor" type="::visuVTKAdaptor::SText" autoConnect="yes">
+            <in key="object" uid="${objectID}" />
+            <config renderer="default" text="@patient.name" fontSize="15" hAlign="right" vAlign="top" />
+        </service>
+
+        <!-- *************************** End generic scene *************************** -->
+
+        <service uid="imageDumpLocker" type="::ctrlMemory::LockDumpSrv">
+            <inout key="target" uid="image" />
+        </service>
+
+        <service uid="medicalImgConverter" type="::ctrlSelection::MedicalImageSrv">
+            <inout key="image" uid="image" />
+        </service>
+
+        <service uid="sliderIndexDicomPullerEditor" type="::ioDicomWeb::SSliceIndexDicomPullerEditor">
+            <inout key="series" uid="${objectID}" />
+            <out key="image" uid="image" />
+            <server>%PACS_SERVER_HOSTNAME%:%PACS_SERVER_PORT%</server>
+            <config dicomReader="::ioGdcm::SSeriesDBReader">
+                <dicomReaderConfig>
+                    <config>
+                        <showLogDialog>no</showLogDialog>
+                        <enableBufferRotation>no</enableBufferRotation>
+                        <dicomdirSupport>never</dicomdirSupport>
+                    </config>
+                </dicomReaderConfig>
+            </config>
+        </service>
+
+        <start uid="mainview" />
+        <!-- Deferred start -->
+        <start uid="medicalImgConverter" />
+        <start uid="imageDumpLocker" />
+        <!-- VTK scene 'gs' -->
+        <start uid="interactor4Negato" />
+        <start uid="imageText" />
+        <start uid="seriesAdaptor" />
+        <start uid="nameAdaptor" />
+    </config>
+</extension>
--- a/Bundles/activity/DicomWebReaderActivity/rc/configurations/DicomWebReader.xml
+++ b/Bundles/activity/DicomWebReaderActivity/rc/configurations/DicomWebReader.xml
+<extension implements="::fwServices::registry::AppConfig">
+    <id>DicomWebReaderActivity</id>
+    <parameters>
+        <param name="WID_PARENT" />
+        <param name="SERIESDB" />
+        <param name="AS_UID" />
+        <param name="APP_NAME" />
+    </parameters>
+    <config>
+
+        <!-- ******************************* UI declaration *********************************** -->
+
+        <object uid="${SERIESDB}" type="::fwMedData::SeriesDB" src="ref" />
+        <object uid="previewSeriesDB" type="::fwMedData::SeriesDB" />
+        <object uid="previewSelections" type="::fwData::Vector" />
+
+        <object uid="localSeriesDB" type="::fwMedData::SeriesDB" />
+        <object uid="localSelections" type="::fwData::Vector" />
+
+        <service uid="mainView" type="::gui::view::SDefaultView" >
+            <gui>
+                <layout type="::fwGui::CardinalLayoutManager">
+                    <view align="top"/>
+                    <view align="center" minWidth="200" />
+                    <view align="bottom"/>
+                </layout>
+                <toolBar />
+            </gui>
+            <registry>
+                <parent wid="${WID_PARENT}" />
+                <toolBar sid="toolBar" start="yes" />
+                <view sid="topView" start="yes" />
+                <view sid="centerView" start="yes" />
+                <view sid="bottomView" start="yes" />
+            </registry>
+        </service>
+
+        <service uid="toolBar" type="::gui::aspect::SDefaultToolBar" >
+            <gui>
+                <layout>
+                    <menuItem name="Pull selected series from Pacs" icon="media-0.1/icons/Pull.svg" />
+                    <menuItem name="Push selected series to the main SeriesDB" icon="media-0.1/icons/Push.svg" />
+                </layout>
+            </gui>
+            <registry>
+                <menuItem sid="action_pullSeries" start="yes" />
+                <menuItem sid="action_pushSeries" start="yes" />
+            </registry>
+        </service>
+
+        <service uid="topView" type="::gui::view::SDefaultView" >
+            <gui>
+                <layout type="::fwGui::CardinalLayoutManager">
+                    <orientation value="horizontal" />
+                    <view caption="DICOM Query" align="center" minWidth="200" />
+                </layout>
+            </gui>
+            <registry>
+                <view sid="queryEditor" start="yes" />
+            </registry>
+        </service>
+
+        <service uid="centerView" type="::gui::view::SDefaultView" >
+            <gui>
+                <layout type="::fwGui::CardinalLayoutManager">
+                    <orientation value="horizontal" />
+                    <view caption="Pacs Information" align="center" minWidth="200" />
+                    <view caption="Pacs Preview" align="right" minWidth="200" />
+                </layout>
+            </gui>
+            <registry>
+                <view sid="previewSelector" start="yes" />
+                <view wid="pacsPreview" start="yes" />
+            </registry>
+        </service>
+
+        <service uid="bottomView" type="::gui::view::SDefaultView" >
+            <gui>
+                <layout type="::fwGui::CardinalLayoutManager">
+                    <orientation value="horizontal" />
+                    <view caption="Local Series" align="center" minWidth="200" />
+                    <view caption="Local Preview" align="right" minWidth="200" />
+                </layout>
+            </gui>
+            <registry>
+                <view sid="localSelector" start="yes" />
+                <view wid="localPreview" start="yes" />
+            </registry>
+        </service>
+
+        <!-- ******************************* Actions ****************************************** -->
+
+        <service uid="action_pullSeries" type="::gui::action::SSlotCaller" >
+            <slots>
+                <slot>action_pullSeries/setInexecutable</slot>
+                <slot>pullSeriesController/update</slot>
+            </slots>
+        </service>
+
+        <service uid="action_pushSeries" type="::ioDicom::SSeriesDBMerger">
+            <in key="selectedSeries" uid="localSelections" />
+            <inout key="seriesDB" uid="${SERIESDB}" />
+        </service>
+
+        <!-- ******************************* Services ***************************************** -->
+
+        <!-- PREVIEW -->
+        <service uid="previewSelector" type="::uiMedDataQt::editor::SSelector" autoConnect="yes">
+            <inout key="selection" uid="previewSelections" />
+            <inout key="seriesDB" uid="previewSeriesDB" />
+        </service>
+
+        <service uid="queryEditor" type="::ioDicomWeb::SQueryEditor">
+            <inout key="seriesDB" uid="previewSeriesDB" />
+            <server>%PACS_SERVER_HOSTNAME%:%PACS_SERVER_PORT%</server>
+        </service>
+
+        <service uid="pullSeriesController" type="::ioDicomWeb::SSeriesPuller" >
+            <in key="selectedSeries" uid="previewSelections" />
+            <inout key="seriesDB" uid="localSeriesDB" />
+            <config dicomReader="::ioGdcm::SSeriesDBReader" dicomReaderConfig="DicomWebReaderConfig" />
+            <server>%PACS_SERVER_HOSTNAME%:%PACS_SERVER_PORT%</server>
+        </service>
+
+        <service uid="pacsViewer" type="::uiMedDataQt::SSeriesViewer" autoConnect="yes">
+            <in key="series" uid="previewSelections" />
+            <parentView wid="pacsPreview" />
+            <configs>
+                <config id="2DDicomWebPreviewConfig" type="::fwMedData::DicomSeries" />
+            </configs>
+        </service>
+
+        <!-- LOCAL -->
+        <service uid="localSelector" type="::uiMedDataQt::editor::SSelector" autoConnect="yes">
+            <inout key="seriesDB" uid="localSeriesDB" />
+            <inout key="selection" uid="localSelections" />
+        </service>
+
+        <service uid="localViewer" type="::uiMedDataQt::SSeriesViewer" autoConnect="yes">
+            <in key="series" uid="localSelections" />
+            <parentView wid="localPreview" />
+            <configs>
+                <config id="2DSimpleConfig2" type="::fwMedData::ImageSeries">
+                    <extract path="@image" pattern="imageID" />
+                </config>
+            </configs>
+        </service>
+
+
+        <service uid="seriesDBReader" type="::ioGdcm::SSeriesDBReader" >
+            <inout key="data" uid="localSeriesDB" />
+            <config filterType="::fwDicomIOFilter::sorter::ImagePositionPatientSorter" />
+        </service>
+
+        <!-- ******************************* Connections ************************************** -->
+
+        <connect>
+            <signal>pullSeriesController/updated</signal>
+            <slot>action_pullSeries/setExecutable</slot>
+        </connect>
+
+        <!-- START AND STOP SERVICES -->
+        <start uid="mainView" />
+        <start uid="pullSeriesController" />
+        <start uid="localViewer" />
+        <start uid="pacsViewer" />
+        <start uid="seriesDBReader" />
+
+    </config>
+</extension>
--- a/Bundles/activity/DicomWebReaderActivity/rc/plugin.xml
+++ b/Bundles/activity/DicomWebReaderActivity/rc/plugin.xml
+<plugin id="DicomWebReaderActivity" version="@PROJECT_VERSION@" >
+
+    <requirement id="activities" />
+    <requirement id="dataReg" />
+    <requirement id="guiQt" />
+    <requirement id="visuVTKQt" />
+    <requirement id="ioDicomWeb" />
+
+    <xi:include href="configurations/DicomWebReader.xml" xmlns:xi="http://www.w3.org/2003/XInclude" />
+    <xi:include href="configurations/2DDicomWebPreviewConfig.xml" xmlns:xi="http://www.w3.org/2003/XInclude" />
+
+    <extension implements="::fwActivities::registry::Activities">
+        <id>DicomWebReaderActivity</id>
+        <title>DicomWeb Reader</title>
+        <desc>DicomWeb Reader activity</desc>
+        <icon>media-0.1/icons/Pull.svg</icon>
+        <requirements>
+        </requirements>
+        <builder>::fwActivities::builder::ActivitySeries</builder>
+        <appConfig id="DicomWebReaderActivity">
+        </appConfig>
+        </extension>
+
+    <extension implements="::fwServices::registry::ServiceConfig">
+        <id>DicomWebReaderConfig</id>
+        <desc>Reader configuration to convert retrieved DicomSeries to ImageSeries</desc>
+        <config>
+            <config filterType="::fwDicomIOFilter::custom::DefaultDicomFilter" />
+        </config>
+    </extension>
+
+</plugin>
--- a/Bundles/activity/blendActivity/Properties.cmake
+++ b/Bundles/activity/blendActivity/Properties.cmake
@@ -15,5 +15,6 @@ set( REQUIREMENTS
    scene2D
    uiTF
    media
+    qtSceneConfig
 )