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

merge(dev): release 16.0.0

parents 6ee4605b cfff1dce
...@@ -38,6 +38,7 @@ before_script: ...@@ -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 - $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 - cd $TRAVIS_BUILD_DIR
script: script:
- echo $TRAVIS_COMMIT_RANGE
- fw4spl-git/hooks/sheldon $TRAVIS_COMMIT_RANGE - fw4spl-git/hooks/sheldon $TRAVIS_COMMIT_RANGE
- cd $TRAVIS_BUILD_DIR/build - cd $TRAVIS_BUILD_DIR/build
- make doc - make doc
......
...@@ -9,14 +9,14 @@ ...@@ -9,14 +9,14 @@
<object uid="seriesDB" type="::fwMedData::SeriesDB" /> <object uid="seriesDB" type="::fwMedData::SeriesDB" />
<service uid="action_open" type="::uiIO::action::SSeriesDBMerger"> <service uid="action_open" type="::uiIO::action::SSeriesDBMerger">
<inout key="seriesDB" uid="seriesDB" /> <inout key="data" uid="seriesDB" />
<IOSelectorSrvConfig name="SDBAtomsReaderIOSelectorConfig" /> <IOSelectorSrvConfig name="SDBAtomsReaderIOSelectorConfig" />
</service> </service>
<service uid="action_save" type="::gui::action::SStarter"> <service uid="action_save" type="::gui::action::SStarter">
<start uid="SDBWriter" /> <start uid="SDBWriter" />
</service> </service>
<service uid="SDBWriter" type="::uiIO::editor::SIOSelector"> <service uid="SDBWriter" type="::uiIO::editor::SIOSelector">
<in key="seriesDB" uid="seriesDB" /> <inout key="data" uid="seriesDB" />
<type mode="writer" /> <type mode="writer" />
<selection mode="include" /> <selection mode="include" />
<addSelection service="::ioAtoms::SWriter" /> <addSelection service="::ioAtoms::SWriter" />
...@@ -99,9 +99,9 @@ ...@@ -99,9 +99,9 @@
</service> </service>
<service uid="dynamicView" type="::guiQt::editor::SDynamicView" autoConnect="yes"> <service uid="dynamicView" type="::guiQt::editor::SDynamicView" autoConnect="yes">
<inout key="SERIESDB" uid="seriesDB" />
<mainActivity id="SDBVRRender" closable="false" /> <mainActivity id="SDBVRRender" closable="false" />
<parameters> <parameters>
<parameter replace="SERIESDB" by="seriesDB" />
<parameter replace="ICON_PATH" by="${appIconPath}" /> <parameter replace="ICON_PATH" by="${appIconPath}" />
<parameter replace="DYNAMICVIEW_CHANNEL" by="dynamicViewChannel" /> <parameter replace="DYNAMICVIEW_CHANNEL" by="dynamicViewChannel" />
<parameter replace="PROGRESS_CHANNEL" by="progressStatus" /> <parameter replace="PROGRESS_CHANNEL" by="progressStatus" />
......
...@@ -19,5 +19,6 @@ set( REQUIREMENTS ...@@ -19,5 +19,6 @@ set( REQUIREMENTS
uiReconstructionQt uiReconstructionQt
uiMedDataQt uiMedDataQt
media media
dataManagerConfig
2DVisualizationActivity 2DVisualizationActivity
) )
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
</service> </service>
<service uid="action_organManager" type="::gui::action::SConfigLauncher"> <service uid="action_organManager" type="::gui::action::SConfigLauncher">
<appConfig id="OrganManagerWithSeries" /> <appConfig id="ModelSeriesManagerWindow" />
<inout key="ORGAN_MANAGER_MODELSERIES" uid="${modelSeries}" /> <inout key="ORGAN_MANAGER_MODELSERIES" uid="${modelSeries}" />
<parameter replace="ICON_PATH" by="${ICON_PATH}" /> <parameter replace="ICON_PATH" by="${ICON_PATH}" />
</service> </service>
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
<requirement id="visuVTKQt" /> <requirement id="visuVTKQt" />
<xi:include href="configurations/3DVisualization.xml" xmlns:xi="http://www.w3.org/2003/XInclude" /> <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/3DNegatoWithAcq.xml" xmlns:xi="http://www.w3.org/2003/XInclude" />
<xi:include href="configurations/3DSimpleConfig.xml" xmlns:xi="http://www.w3.org/2003/XInclude" /> <xi:include href="configurations/3DSimpleConfig.xml" xmlns:xi="http://www.w3.org/2003/XInclude" />
......
...@@ -15,5 +15,6 @@ set( REQUIREMENTS ...@@ -15,5 +15,6 @@ set( REQUIREMENTS
scene2D scene2D
uiTF uiTF
media media
qtSceneConfig
) )
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
<config> <config>
<type mode="reader" /> <type mode="reader" />
<selection mode="include" /> <selection mode="include" />
<!-- <addSelection service="::ioDcmtk::SDicomSeriesDBReader" /> -->
<addSelection service="::ioGdcm::SDicomSeriesDBReader" /> <addSelection service="::ioGdcm::SDicomSeriesDBReader" />
<config id="DicomReaderConfig" service="::ioGdcm::SDicomSeriesDBReader" /> <config id="DicomReaderConfig" service="::ioGdcm::SDicomSeriesDBReader" />
</config> </config>
......
...@@ -65,8 +65,8 @@ ...@@ -65,8 +65,8 @@
<config> <config>
<object uid="${selection}" src="ref" /> <object uid="${selection}" src="ref" />
<service uid="export_selection" type="::uiIO::editor::SIOSelector" autoConnect="yes"> <service uid="export_selection" type="::uiIO::editor::SIOSelector">
<in key="selection" uid="${selection}" /> <inout key="data" uid="${selection}" />
<type mode="writer" /> <type mode="writer" />
<selection mode="exclude" /> <selection mode="exclude" />
<addSelection service="::ioAtoms::SWriter" /> <addSelection service="::ioAtoms::SWriter" />
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
</service> </service>
<service uid="exportSelection" type="::uiIO::editor::SIOSelector"> <service uid="exportSelection" type="::uiIO::editor::SIOSelector">
<in key="selection" uid="vectorToSave" /> <inout key="data" uid="vectorToSave" />
<type mode="writer" /> <type mode="writer" />
<selection mode="include" /> <selection mode="include" />
<addSelection service="::ioGdcm::SSurfaceSegmentationWriter" /> <addSelection service="::ioGdcm::SSurfaceSegmentationWriter" />
...@@ -133,6 +133,7 @@ ...@@ -133,6 +133,7 @@
<type mode="reader" /> <type mode="reader" />
<selection mode="exclude" /> <selection mode="exclude" />
<addSelection service="::ioAtoms::SReader" /> <addSelection service="::ioAtoms::SReader" />
<addSelection service="::ioData::SAttachmentSeriesReader" />
</config> </config>
</extension> </extension>
...@@ -170,6 +171,7 @@ ...@@ -170,6 +171,7 @@
<config> <config>
<type mode="reader" /> <type mode="reader" />
<selection mode="exclude" /> <selection mode="exclude" />
<addSelection service="::ioData::SAttachmentSeriesReader" />
<config id="MDAtomsConfig" service="::ioAtoms::SReader" /> <config id="MDAtomsConfig" service="::ioAtoms::SReader" />
</config> </config>
</extension> </extension>
...@@ -177,7 +179,7 @@ ...@@ -177,7 +179,7 @@
<!-- Service config used for ioAtoms reader and writer. Defines the Data version and filter to use. --> <!-- Service config used for ioAtoms reader and writer. Defines the Data version and filter to use. -->
<extension implements="::fwServices::registry::ServiceConfig"> <extension implements="::fwServices::registry::ServiceConfig">
<id>MDAtomsConfig</id> <id>MDAtomsConfig</id>
<desc>Reader/Writer for atoms representing a medical data</desc> <desc>Json/Xml Reader/Writer (FW4SPL)</desc>
<config> <config>
<patcher context="MedicalData" version="V10" /> <patcher context="MedicalData" version="V10" />
<filter>VRRenderMedicalDataV2</filter> <filter>VRRenderMedicalDataV2</filter>
...@@ -225,7 +227,7 @@ ...@@ -225,7 +227,7 @@
<!-- Service config used for ioAtoms reader and writer to read landmarks --> <!-- Service config used for ioAtoms reader and writer to read landmarks -->
<extension implements="::fwServices::registry::ServiceConfig"> <extension implements="::fwServices::registry::ServiceConfig">
<id>LandmarksAtomsConfig</id> <id>LandmarksAtomsConfig</id>
<desc>Reader/Writer for atoms representing a medical data</desc> <desc>Json/Xml Reader/Writer (FW4SPL)</desc>
<config> <config>
<patcher context="Landmark" version="V2" /> <patcher context="Landmark" version="V2" />
</config> </config>
......
...@@ -20,5 +20,6 @@ set( REQUIREMENTS ...@@ -20,5 +20,6 @@ set( REQUIREMENTS
uiIO uiIO
media media
imageConfig imageConfig
dataManagerConfig
) )
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
</service> </service>
<service uid="action_organManager" type="::gui::action::SConfigLauncher"> <service uid="action_organManager" type="::gui::action::SConfigLauncher">
<appConfig id="OrganManagerWithSeries" /> <appConfig id="ModelSeriesManagerWindow" />
<inout key="ORGAN_MANAGER_MODELSERIES" uid="optionalModelSeries" /> <inout key="ORGAN_MANAGER_MODELSERIES" uid="optionalModelSeries" />
<parameter replace="ICON_PATH" by="${ICON_PATH}" /> <parameter replace="ICON_PATH" by="${ICON_PATH}" />
</service> </service>
......
set( NAME dataManagerConfig )
set( VERSION 0.1 )
set( TYPE BUNDLE )
set( DEPENDENCIES )
set( REQUIREMENTS
gui
guiQt
uiMedDataQt
uiReconstructionQt
ctrlSelection
media
)
<!-- <!--
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: Example:
<service uid="..." type="::fwServices::SConfigController"> <service uid="..." type="::fwServices::SConfigController">
......
<!--
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"> <extension implements="::fwServices::registry::AppConfig">
<id>OrganManagerWithSeries</id> <id>ModelSeriesManagerView</id>
<parameters> <parameters>
<param name="ORGAN_MANAGER_MODELSERIES" /> <param name="WID_PARENT" />
<param name="CLOSE_CONFIG_CHANNEL" default="DummyChannel" /><!-- defined by SConfigLauncher --> <param name="ORGAN_MANAGER_MODELSERIES" /><!-- model series to manage -->
<param name="ICON_PATH" />
<param name="WindowTitle" default="Organs Manager"/>
</parameters> </parameters>
<desc>Display the editors to manage the ModelSeries: show/hide reconstructions, change the color, ... </desc>
<config> <config>
<object uid="${ORGAN_MANAGER_MODELSERIES}" type="::fwMedData::ModelSeries" src="ref" /> <object uid="${ORGAN_MANAGER_MODELSERIES}" type="::fwMedData::ModelSeries" src="ref" />
<object uid="reconstruction" type="::fwData::Reconstruction" src="deferred" /> <object uid="reconstruction" type="::fwData::Reconstruction" src="deferred" />
<!-- MAIN FRAME --> <service uid="multiViewOrgans" type="::gui::view::SDefaultView" >
<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">
<gui> <gui>
<layout type="::fwGui::ToolboxLayoutManager"> <layout type="::fwGui::ToolboxLayoutManager">
<orientation value="vertical" />
<view caption="Organs" expanded="true" /> <view caption="Organs" expanded="true" />
<view caption="Material" expanded="true" /> <view caption="Material" expanded="true" />
<view caption="Representation" /> <view caption="Representation" />
</layout> </layout>
</gui> </gui>
<registry> <registry>
<parent wid="${WID_PARENT}" />
<view sid="listOrganEditor" start="yes" /> <view sid="listOrganEditor" start="yes" />
<view sid="organMaterialEditor" start="no" /> <view sid="organMaterialEditor" start="no" />
<view sid="representationEditor" start="no" /> <view sid="representationEditor" start="no" />
</registry> </registry>
</service> </service>
<service uid="myUpdaterReconst" type="::ctrlSelection::updater::SObjFromSlot"> <service uid="updaterReconst" type="::ctrlSelection::updater::SObjFromSlot">
<out key="object" uid="reconstruction" /> <out key="object" uid="reconstruction" />
</service> </service>
<service uid="organMaterialEditor" type="::uiReconstructionQt::OrganMaterialEditor" autoConnect="yes"> <service uid="organMaterialEditor" type="::uiReconstructionQt::OrganMaterialEditor" >
<inout key="reconstruction" uid="reconstruction" /> <inout key="reconstruction" uid="reconstruction" />
</service> </service>
<service uid="representationEditor" type="::uiReconstructionQt::RepresentationEditor" autoConnect="yes"> <service uid="representationEditor" type="::uiReconstructionQt::RepresentationEditor" >
<inout key="reconstruction" uid="reconstruction" /> <inout key="reconstruction" uid="reconstruction" />
</service> </service>
...@@ -58,26 +51,21 @@ ...@@ -58,26 +51,21 @@
<inout key="modelSeries" uid="${ORGAN_MANAGER_MODELSERIES}" /> <inout key="modelSeries" uid="${ORGAN_MANAGER_MODELSERIES}" />
<columns> <columns>
<organ_name>@organ_name</organ_name> <organ_name>@organ_name</organ_name>
<volume_cc view="positive">@volume</volume_cc> <structure_type>@structure_type</structure_type>
</columns> </columns>
</service> </service>
<connect> <connect>
<signal>listOrganEditor/reconstructionSelected</signal> <signal>listOrganEditor/reconstructionSelected</signal>
<slot>myUpdaterReconst/addOrSwap</slot> <slot>updaterReconst/addOrSwap</slot>
</connect>
<connect channel="${CLOSE_CONFIG_CHANNEL}">
<signal>organManagerFrame/closed</signal>
</connect> </connect>
<!-- START AND STOP SERVICES --> <start uid="multiViewOrgans" />
<start uid="organManagerFrame" /> <start uid="updaterReconst" />
<start uid="myUpdaterReconst" />
<!-- Deferred start --> <!-- Deferred start -->
<start uid="organMaterialEditor" />
<start uid="representationEditor" /> <start uid="representationEditor" />
<start uid="organMaterialEditor" />
</config> </config>
</extension> </extension>
<!--
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>
<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>
...@@ -4,8 +4,9 @@ set( VERSION 0.1 ) ...@@ -4,8 +4,9 @@ set( VERSION 0.1 )
set( TYPE BUNDLE ) set( TYPE BUNDLE )
set( DEPENDENCIES ) set( DEPENDENCIES )
set( REQUIREMENTS set( REQUIREMENTS
2DVisualizationActivity 2DVisualizationActivity
qtSceneConfig
dataReg dataReg
servicesReg servicesReg
gui gui
...@@ -20,4 +21,3 @@ set( REQUIREMENTS ...@@ -20,4 +21,3 @@ set( REQUIREMENTS
scene2D scene2D
media media
) )
<plugin id="imageConfig" version="@PROJECT_VERSION@" > <plugin id="imageConfig" version="@PROJECT_VERSION@" >
<xi:include href="configurations/ImageManager.xml" xmlns:xi="http://www.w3.org/2003/XInclude" /> <requirement id="dataReg" />
<xi:include href="configurations/TransferFunctionWidget.xml" xmlns:xi="http://www.w3.org/2003/XInclude" /> <requirement id="servicesReg" />
<xi:include href="configurations/TransferFunctionWithNegatoEditor.xml" xmlns:xi="http://www.w3.org/2003/XInclude" /> <xi:include href="configurations/TransferFunctionWithNegatoEditor.xml" xmlns:xi="http://www.w3.org/2003/XInclude" />
</plugin> </plugin>
set( NAME qtSceneConfig )
set( VERSION 0.1 )
set( TYPE BUNDLE )
set( DEPENDENCIES )
set( REQUIREMENTS
dataReg
servicesReg
gui
guiQt
uiTF
scene2D
media
)
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