Commit 7ef2f0ac authored by Andreas Tille's avatar Andreas Tille
Browse files

New upstream version 17.2.0

parent 45ecf09e

.fw4spl

0 → 100644
+1 −0
Original line number Diff line number Diff line 
fw4spl

.travis.yml

+1 −0
Original line number Diff line number Diff line
@@ -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

Apps/VRRender/Properties.cmake

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ set( REQUIREMENTS 
    uiIO

    uiGenericQt

    uiMedDataQt

    uiPreferences



    2DVisualizationActivity

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

    dicomPacsWriterActivity



    DicomWebReaderActivity

    DicomWebWriterActivity



    media

    style

Apps/VRRender/rc/configurations/VRRenderBase.xml

+35 −3
Original line number Diff line number Diff line
@@ -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" />

Apps/VRRender/rc/configurations/sdb.xml

+41 −4
Original line number Diff line number Diff line
@@ -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>