Commit d8b05b2f authored by Flavien BRIDAULT-LOUCHEZ's avatar Flavien BRIDAULT-LOUCHEZ
Browse files

merge(dev): release 11.0.5

parents e1c0a2df 98107a78
......@@ -13,6 +13,7 @@ addons:
branches:
only:
- dev
- master
compiler:
- gcc
before_script:
......@@ -34,7 +35,7 @@ before_script:
- git reset --hard
- git clean -f -d
- cd $TRAVIS_BUILD_DIR/build
- $CMAKE_BIN -DCMAKE_INSTALL_PREFIX:PATH=/tmp $TRAVIS_BUILD_DIR/ -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
script:
- fw4spl-git/hooks/sheldon $TRAVIS_COMMIT_RANGE
......
......@@ -85,7 +85,7 @@
<config filter="true" renderer="default" picker="negatodefault" />
</adaptor>
<adaptor id="landmarksNegato" class="::visuVTKAdaptor::ImageLandmarks" objectId="imageKey">
<adaptor id="landmarksNegato" class="::visuVTKAdaptor::SLandmarks" objectId="imageKey">
<config renderer="default" picker="negatodefault" />
</adaptor>
......
......@@ -79,7 +79,7 @@
<config filter="true" renderer="default" picker="negatodefault" />
</adaptor>
<adaptor id="landmarksNegato" class="::visuVTKAdaptor::ImageLandmarks" objectId="imageKey">
<adaptor id="landmarksNegato" class="::visuVTKAdaptor::SLandmarks" objectId="imageKey">
<config renderer="default" picker="negatodefault" />
</adaptor>
......
......@@ -8,6 +8,7 @@ set( REQUIREMENTS
guiQt
uiMeasurement
uiMeasurementQt
ctrlCamp
ctrlSelection
uiImageQt
uiVisu
......
......@@ -3,14 +3,17 @@
<parameters>
<param name="WID_PARENT" />
<param name="image" />
<param name="landmarks" />
<param name="orientation" default="axial" /> <!-- axial, frontal, sagittal -->
<param name="patient_name" default="" />
<param name="IMAGE_LOCATIONS" default="" />
<param name="CrossTypeChannel" default="crossTypeChannel" />
<param name="PickingChannel" default="pickingChannel" />
</parameters>
<config>
<object uid="${image}" type="::fwData::Image" src="ref" />
<object uid="${landmarks}" type="::fwData::Landmarks" src="ref" />
<service uid="mainView" type="::gui::view::SDefaultView">
<gui>
......@@ -48,6 +51,7 @@
<!-- Generic Scene Negato -->
<service uid="negato" type="::fwRenderVTK::SRender" autoConnect="yes">
<in key="imageKey" uid="${image}" />
<in key="landmarksKey" uid="${landmarks}" />
<scene>
<picker id="negatodefault" vtkclass="fwVtkCellPicker" />
......@@ -61,6 +65,10 @@
<config renderer="default" style="InteractorStyle2DForNegato" />
</adaptor>
<adaptor id="pickerInteractor" uid="pickerInteractor" class="::visuVTKAdaptor::PickerInteractor" objectId="self" >
<config renderer="default" picker="negatodefault" event="MOUSE_LEFT_UP"/>
</adaptor>
<adaptor id="MPRNegato" uid="MPRNegato" class="::visuVTKAdaptor::NegatoMPR" objectId="imageKey">
<config renderer="default" picker="negatodefault" mode="2d" slices="1" sliceIndex="${orientation}" />
</adaptor>
......@@ -80,7 +88,7 @@
<config filter="true" renderer="default" picker="negatodefault" />
</adaptor>
<adaptor id="landmarksNegato" class="::visuVTKAdaptor::ImageLandmarks" objectId="imageKey">
<adaptor id="landmarksNegato" class="::visuVTKAdaptor::SLandmarks" objectId="landmarksKey">
<config renderer="default" picker="negatodefault" />
</adaptor>
......@@ -101,6 +109,10 @@
<proxy channel="${CrossTypeChannel}" waitForKey="imageKey">
<slot>MPRNegato/setCrossScale</slot>
</proxy>
<proxy channel="${PickingChannel}" >
<signal>pickerInteractor/picked</signal>
</proxy>
</scene>
</service>
......
......@@ -3,6 +3,7 @@
<parameters>
<param name="WID_PARENT" />
<param name="image" />
<param name="landmarks" />
<param name="selectedTFKey" />
<param name="TFSelections" />
<param name="patient_name" default="" />
......@@ -13,6 +14,7 @@
<object uid="${image}" type="::fwData::Image" src="ref" />
<object uid="${TFSelections}" type="::fwData::Composite" src="ref" />
<object uid="${landmarks}" type="::fwData::Landmarks" src="ref" />
<service uid="mainView" type="::gui::view::SDefaultView">
<gui>
......@@ -50,6 +52,7 @@
<!-- Generic Scene Negato -->
<service uid="negato" type="::fwRenderVTK::SRender" autoConnect="yes">
<in key="imageKey" uid="${image}" />
<in key="landmarksKey" uid="${landmarks}" />
<inout key="TFSelections" uid="${TFSelections}" />
<scene>
......@@ -77,7 +80,7 @@
<config filter="true" renderer="default" picker="negatodefault" />
</adaptor>
<adaptor id="landmarksNegato" class="::visuVTKAdaptor::ImageLandmarks" objectId="imageKey">
<adaptor id="landmarksNegato" class="::visuVTKAdaptor::SLandmarks" objectId="landmarksKey">
<config renderer="default" picker="negatodefault" />
</adaptor>
......
......@@ -5,11 +5,18 @@
<param name="SERIESDB" />
<param name="AS_UID" />
<param name="image" />
<param name="landmarks" />
<param name="advancedLandmarksEditor" default="yes" />
<param name="enabledPreviousChannel" default="enabledPreviousChannel" />
<param name="enabledNextChannel" default="enabledNextChannel" />
<param name="previousActivityChannel" default="previousActivityChannel" />
<param name="nextActivityChannel" default="nextActivityChannel" />
</parameters>
<config>
<object uid="${SERIESDB}" type="::fwMedData::SeriesDB" src="ref" />
<object uid="${AS_UID}" type="::fwMedData::ActivitySeries" src="ref" />
<object uid="${image}" type="::fwData::Image" src="ref" />
<object uid="${landmarks}" type="::fwData::Landmarks" src="ref" />
<service uid="mainView" type="::gui::view::SDefaultView">
<gui>
......@@ -17,6 +24,7 @@
<view caption="Negato1" align="center" />
<view caption="Negato2" align="right" />
<view caption="Negato3" align="right" />
<view align="left" visible="false" />
</layout>
<toolBar />
</gui>
......@@ -26,18 +34,19 @@
<view wid="view_negato1" />
<view wid="view_negato2" />
<view wid="view_negato3" />
<view sid="landmarksEditor" start="yes" />
</registry>
</service>
<service uid="toolBar" type="::gui::aspect::SDefaultToolBar">
<gui>
<layout>
<menuItem name="New landmark" icon="@BUNDLE_PREFIX@/media_0-1/icons/Add-landmark.png" />
<menuItem name="Remove landmark" icon="@BUNDLE_PREFIX@/media_0-1/icons/Remove-landmark.png" />
<menuItem name="Previous" icon="@BUNDLE_PREFIX@/media_0-1/icons/Back.svg" />
<menuItem name="Next" icon="@BUNDLE_PREFIX@/media_0-1/icons/Next.svg" />
<menuItem name="Load landmark" icon="@BUNDLE_PREFIX@/media_0-1/icons/Load-landmark.png" />
<menuItem name="Save landmark" icon="@BUNDLE_PREFIX@/media_0-1/icons/Save-landmark.png" />
<menuItem name="Focus landmark" icon="@BUNDLE_PREFIX@/media_0-1/icons/Find-landmark.png" />
<menuItem name="Hide/Show landmark" icon="@BUNDLE_PREFIX@/media_0-1/icons/View-landmark.png" />
<menuItem name="Display Landmarks editor" icon="@BUNDLE_PREFIX@/media_0-1/icons/View-landmark.png" style="check" />
<separator />
<menuItem name="Add distance" icon="@BUNDLE_PREFIX@/media_0-1/icons/distance.png" />
<menuItem name="Remove distance" icon="@BUNDLE_PREFIX@/media_0-1/icons/RemoveDistance.png" />
......@@ -51,12 +60,12 @@
</layout>
</gui>
<registry>
<menuItem sid="ActionNewLandmark" start="yes" />
<menuItem sid="ActionRemoveLandmark" start="yes" />
<menuItem sid="ActionPrevious" start="yes" />
<menuItem sid="ActionNext" start="yes" />
<menuItem sid="ActionLoadLandmark" start="yes" />
<menuItem sid="ActionSaveLandmark" start="yes" />
<menuItem sid="ActionFocusLandmark" start="yes" />
<menuItem sid="ActionHideLandmark" start="yes" />
<menuItem sid="ActionSFocusLandmark" start="yes" />
<menuItem sid="ActionEditLandmark" start="yes" />
<menuItem sid="ActionAddDistance" start="yes" />
<menuItem sid="ActionRemoveDistance" start="yes" />
<menuItem sid="ActionHideDistance" start="yes" />
......@@ -70,53 +79,75 @@
<service uid="cfgNegato1" type="::fwServices::SConfigController">
<appConfig id="2DNegato" />
<inout key="image" uid="${image}" />
<inout key="landmarks" uid="${landmarks}" />
<parameter replace="WID_PARENT" uid="view_negato1" />
<parameter replace="CrossTypeChannel" uid="crossTypeChannel" />
<parameter replace="PickingChannel" uid="pickerChannel" />
<parameter replace="orientation" by="axial" />
</service>
<service uid="cfgNegato2" type="::fwServices::SConfigController">
<appConfig id="2DNegato" />
<inout key="image" uid="${image}" />
<inout key="landmarks" uid="${landmarks}" />
<parameter replace="WID_PARENT" uid="view_negato2" />
<parameter replace="CrossTypeChannel" uid="crossTypeChannel" />
<parameter replace="PickingChannel" uid="pickerChannel" />
<parameter replace="orientation" by="frontal" />
</service>
<service uid="cfgNegato3" type="::fwServices::SConfigController">
<appConfig id="2DNegato" />
<inout key="image" uid="${image}" />
<inout key="landmarks" uid="${landmarks}" />
<parameter replace="WID_PARENT" uid="view_negato3" />
<parameter replace="CrossTypeChannel" uid="crossTypeChannel" />
<parameter replace="PickingChannel" uid="pickerChannel" />
<parameter replace="orientation" by="sagittal" />
</service>
<service uid="extractLandmarks" type="::ctrlCamp::SCopy" >
<in key="source" uid="${image}">
<extract from="@fields.m_landmarksId" />
</in>
<inout key="target" uid="${landmarks}"/>
</service>
<service uid="ActionExportActivity" type="::uiMedData::action::SExportSeries" autoConnect="yes">
<inout key="seriesDB" uid="${SERIESDB}" />
<inout key="series" uid="${AS_UID}" />
</service>
<service uid="landmarksEditor" type="::uiMeasurementQt::editor::SLandmarks" autoConnect="yes">
<inout key="landmarks" uid="${landmarks}" />
<advanced>${advancedLandmarksEditor}</advanced>
</service>
<service uid="MedicalImageSrv" type="::ctrlSelection::MedicalImageSrv" autoConnect="yes">
<inout key="image" uid="${image}" />
</service>
<service uid="ActionFocusLandmark" type="::uiMeasurement::action::FocusLandmark" >
<in key="image" uid="${image}" />
</service>
<service uid="ActionNewLandmark" type="::uiMeasurement::action::AddLandmark" >
<service uid="ActionSFocusLandmark" type="::uiMeasurement::action::SFocusLandmark" >
<in key="landmarks" uid="${landmarks}" autoConnect="yes" />
<inout key="image" uid="${image}" />
</service>
<service uid="ActionRemoveLandmark" type="::uiMeasurement::action::RemoveLandmark" >
<in key="image" uid="${image}" />
</service>
<service uid="ActionLoadLandmark" type="::uiMeasurement::action::LoadLandmark" >
<inout key="image" uid="${image}" />
<service uid="ActionLoadLandmark" type="::gui::action::SSlotCaller" >
<slots>
<slot>LoadLandmark/update</slot>
</slots>
</service>
<service uid="ActionSaveLandmark" type="::uiMeasurement::action::SaveLandmark" >
<in key="image" uid="${image}" />
<service uid="ActionSaveLandmark" type="::gui::action::SSlotCaller" >
<slots>
<slot>SaveLandmark/update</slot>
</slots>
</service>
<service uid="ActionHideLandmark" type="::uiMeasurement::action::ShowLandmark" autoConnect="yes" >
<in key="image" uid="${image}" />
<service uid="ActionEditLandmark" type="::gui::action::SBooleanSlotCaller">
<slots>
<slot>landmarksEditor/setVisible</slot>
</slots>
</service>
<service uid="ActionAddDistance" type="::uiMeasurement::action::AddDistance" >
<in key="image" uid="${image}" />
......@@ -127,6 +158,33 @@
<service uid="ActionHideDistance" type="::uiMeasurement::action::ShowDistance" autoConnect="yes" >
<in key="image" uid="${image}" />
</service>
<!-- The action "previous" and "next" are visible only if the application use a "SActivitySequencer".
This service send signals to enable or not the actions. -->
<service uid="ActionPrevious" type="::gui::action::SSignal">
<state visible="false" />
</service>
<service uid="ActionNext" type="::gui::action::SSignal">
<state visible="false" />
</service>
<service uid="LoadLandmark" type="::uiIO::editor::SIOSelector" >
<inout key="data" uid="${landmarks}" />
<type mode="reader" />
<selection mode="include" />
<addSelection service="::ioAtoms::SReader" />
<config id="LandmarksAtomsConfig" service="::ioAtoms::SReader" />
</service>
<service uid="SaveLandmark" type="::uiIO::editor::SIOSelector" >
<inout key="data" uid="${landmarks}" />
<type mode="writer" />
<selection mode="include" />
<addSelection service="::ioAtoms::SWriter" />
<config id="LandmarksAtomsConfig" service="::ioAtoms::SWriter" />
</service>
<service uid="ActionHideCross" type="::uiVisu::action::CrossTypeAction">
<in key="image" uid="${image}" />
<crossType>hide</crossType>
......@@ -147,6 +205,36 @@
<signal>ActionShowFullCross/crossTypeModified</signal>
</connect>
<connect channel="pickerChannel">
<slot>landmarksEditor/addPickedPoint</slot>
</connect>
<!-- Connection to enable "previous" action. It should be connected to a SActivitySequencer in the application
configuration.-->
<connect channel="${enabledPreviousChannel}">
<slot>ActionExportActivity/hide</slot>
<slot>ActionPrevious/show</slot>
<slot>ActionPrevious/setIsExecutable</slot>
</connect>
<!-- Connection to called 'previous' slot of the application's SActivitySequencer. -->
<connect channel="${previousActivityChannel}">
<signal>ActionPrevious/triggered</signal>
</connect>
<!-- Connection to enable "next" action. It should be connected to a SActivitySequencer in the application
configuration.-->
<connect channel="${enabledNextChannel}">
<slot>ActionExportActivity/hide</slot>
<slot>ActionNext/show</slot>
<slot>ActionNext/setIsExecutable</slot>
</connect>
<!-- Connection to called 'next' slot of the application's SActivitySequencer. -->
<connect channel="${nextActivityChannel}">
<signal>ActionNext/triggered</signal>
</connect>
<!-- START AND STOP SERVICES -->
<start uid="mainView" />
......@@ -156,5 +244,13 @@
<start uid="cfgNegato2" />
<start uid="cfgNegato3" />
<start uid="LoadLandmark" />
<start uid="SaveLandmark" />
<!-- start deferred -->
<start uid="extractLandmarks" />
<update uid="extractLandmarks" />
</config>
</extension>
......@@ -26,11 +26,15 @@
<requirement name="imageSeries" type="::fwMedData::ImageSeries" minOccurs="1" maxOccurs="1">
<desc>Image to display.</desc>
</requirement>
<requirement name="landmarks" type="::fwData::Landmarks" minOccurs="0" maxOccurs="0">
<desc>Landmarks to display.</desc>
</requirement>
</requirements>
<builder>::fwActivities::builder::ActivitySeries</builder>
<builder>::fwActivities::builder::ActivitySeriesInitData</builder>
<appConfig id="2DVisualization">
<parameters>
<parameter replace="image" uid="@values.imageSeries.image" />
<parameter replace="landmarks" uid="@values.landmarks" />
</parameters>
</appConfig>
</extension>
......
......@@ -100,7 +100,7 @@
<config filter="true" renderer="default" picker="negatodefault" />
</adaptor>
<adaptor id="landmarksNegato" class="::visuVTKAdaptor::ImageLandmarks" objectId="imageKey">
<adaptor id="landmarksNegato" class="::visuVTKAdaptor::SLandmarks" objectId="imageKey">
<config renderer="default" picker="negatodefault" />
</adaptor>
......
......@@ -4,16 +4,19 @@
<param name="WID_PARENT" />
<param name="imageComposite" />
<param name="modelSeries" />
<param name="landmarks" />
<param name="patient_name" default="" />
<param name="orientation" default="axial" /> <!-- axial, frontal, sagittal -->
<param name="ModelRepresentationChannel" />
<param name="ModelDisplayChannel" />
<param name="CrossTypeChannel" default="crossTypeChannel" />
<param name="PickingChannel" default="pickingChannel" />
<param name="Medical3DCamera" />
</parameters>
<config>
<object uid="${modelSeries}" type="::fwMedData::ModelSeries" src="ref" />
<object uid="${imageComposite}" type="::fwData::Composite" src="ref" />
<object uid="${landmarks}" type="::fwData::Landmarks" src="ref" />
<object uid="optionalInputImage" type="::fwData::Image" src="deferred" />
<service uid="mainView" type="::gui::view::SDefaultView">
......@@ -42,8 +45,8 @@
</layout>
</gui>
<registry>
<view sid="sliceListNegatoEditor" start="no" />
<view sid="snapshotNegatoEditor" start="yes" />
<view sid="sliceListNegatoEditor" start="no" />
<view sid="sliderNegato" start="no" />
<view sid="distanceNegatoEditor" start="no" />
</registry>
......@@ -75,6 +78,7 @@
<service uid="negato" type="::fwRenderVTK::SRender" autoConnect="yes">
<in key="modelSeriesKey" uid="${modelSeries}" />
<in key="imageKey" uid="optionalInputImage" optional="yes" />
<in key="landmarksKey" uid="${landmarks}" optional="yes" />
<scene>
<picker id="negatodefault" vtkclass="fwVtkCellPicker" />
......@@ -93,6 +97,10 @@
<config renderer="default" style="InteractorStyle3DForNegato" />
</adaptor>
<adaptor id="pickerInteractor" uid="pickerInteractor" class="::visuVTKAdaptor::PickerInteractor" objectId="self" >
<config renderer="default" picker="negatodefault" event="MOUSE_LEFT_UP"/>
</adaptor>
<adaptor id="medicalCamera" uid="${Medical3DCamera}" class="::visuVTKAdaptor::Medical3DCamera" objectId="self">
<config renderer="default" sliceIndex="${orientation}" resetAtStart="yes" />
</adaptor>
......@@ -113,7 +121,7 @@
<config filter="true" renderer="default" picker="negatodefault" />
</adaptor>
<adaptor id="landmarksNegato" class="::visuVTKAdaptor::ImageLandmarks" objectId="imageKey">
<adaptor id="landmarksNegato" class="::visuVTKAdaptor::SLandmarks" objectId="landmarksKey">
<config renderer="default" picker="negatodefault" />
</adaptor>
......@@ -128,6 +136,10 @@
<slot>modelSeries/showReconstructions</slot>
</proxy>
<proxy channel="${PickingChannel}" >
<signal>pickerInteractor/picked</signal>
</proxy>
<connect>
<signal>snapshotNegatoEditor/snapped</signal>
<slot>snapshotUID/snap</slot>
......@@ -150,6 +162,8 @@
</service>
<service uid="sliceListNegatoEditor" type="::guiQt::editor::SSelectionMenuButton">
<!-- This input is only needed to start the service only if the image is present -->
<in key="imageKey" uid="optionalInputImage" />
<toolTip>Manage slice visibility</toolTip>
<selected>3</selected>
<items>
......@@ -171,6 +185,7 @@
<start uid="LockImageSrv" />
<start uid="sliderNegato" />
<start uid="distanceNegatoEditor" />
<start uid="sliceListNegatoEditor" />
<update uid="extractImage" />
......
......@@ -11,7 +11,9 @@
<!-- data -->
<param name="modelSeries" />
<param name="imageComposite" />
<param name="landmarks" />
<param name="patient_name" default="" />
<param name="advancedLandmarksEditor" default="yes" />
</parameters>
<config>
......@@ -20,6 +22,7 @@
<object uid="${AS_UID}" type="::fwMedData::ActivitySeries" src="ref" />
<object uid="${modelSeries}" type="::fwMedData::ModelSeries" src="ref" />
<object uid="${imageComposite}" type="::fwData::Composite" src="ref" />
<object uid="${landmarks}" type="::fwData::Landmarks" src="ref" />
<object uid="optionalInputImage" type="::fwData::Image" src="deferred" />
<service uid="mainView" type="::gui::view::SDefaultView">
......@@ -28,6 +31,7 @@
<orientation value="horizontal" />
<view align="center" />
<view align="right" />
<view align="left" visible="false" />
</layout>
<toolBar />
</gui>
......@@ -36,6 +40,7 @@
<toolBar sid="toolBar" start="yes" />
<view wid="view_negato1" start="yes" />
<view sid="view_negato2_and_3" start="no" />
<view sid="landmarksEditor" start="yes" />
</registry>
</service>
......@@ -61,12 +66,10 @@
<menuItem name="3D MPR Frontal view" icon="@BUNDLE_PREFIX@/media_0-1/icons/icon-frontal.png" />
<menuItem name="3D MPR Sagittal view" icon="@BUNDLE_PREFIX@/media_0-1/icons/icon-sagittal.png" />
<separator />
<menuItem name="New landmark" icon="@BUNDLE_PREFIX@/media_0-1/icons/Add-landmark.png" />
<menuItem name="Remove landmark" icon="@BUNDLE_PREFIX@/media_0-1/icons/Remove-landmark.png" />
<menuItem name="Load landmark" icon="@BUNDLE_PREFIX@/media_0-1/icons/Load-landmark.png" />
<menuItem name="Save landmark" icon="@BUNDLE_PREFIX@/media_0-1/icons/Save-landmark.png" />
<menuItem name="Focus landmark" icon="@BUNDLE_PREFIX@/media_0-1/icons/Find-landmark.png" />
<menuItem name="Hide/Show landmark" icon="@BUNDLE_PREFIX@/media_0-1/icons/View-landmark.png" />
<menuItem name="Display Landmarks editor" icon="@BUNDLE_PREFIX@/media_0-1/icons/View-landmark.png" style="check" />
<separator />
<menuItem name="Add distance" icon="@BUNDLE_PREFIX@/media_0-1/icons/distance.png" />
<menuItem name="Remove distance" icon="@BUNDLE_PREFIX@/media_0-1/icons/RemoveDistance.png" />
......@@ -87,12 +90,10 @@
<menuItem sid="action_AxialViewMPR3D" start="no" />
<menuItem sid="action_FrontalViewMPR3D" start="no" />
<menuItem sid="action_SagittalViewMPR3D" start="no" />
<menuItem sid="ActionNewLandmark" start="no" />
<menuItem sid="ActionRemoveLandmark" start="no" />
<menuItem sid="ActionLoadLandmark" start="no" />
<menuItem sid="ActionSaveLandmark" start="no" />
<menuItem sid="ActionFocusLandmark" start="no" />
<menuItem sid="ActionHideLandmark" start="no" />
<menuItem sid="ActionLoadLandmark" start="yes" />
<menuItem sid="ActionSaveLandmark" start="yes" />
<menuItem sid="ActionSFocusLandmark" start="no" />
<menuItem sid="ActionEditLandmark" start="yes" />
<menuItem sid="ActionAddDistance" start="no" />
<menuItem sid="ActionRemoveDistance" start="no" />
<menuItem sid="ActionHideDistance" start="no" />
......@@ -136,11 +137,13 @@
<appConfig id="3DNegatoWithAcq" />
<inout key="imageComposite" uid="${imageComposite}" />
<inout key="modelSeries" uid="${modelSeries}" />
<inout key="landmarks" uid="${landmarks}" />
<parameter replace="orientation" by="axial" />
<parameter replace="WID_PARENT" uid="view_negato1" />
<parameter replace="patient_name" by="${patient_name}" />
<parameter replace="ModelRepresentationChannel" uid="ModelRepresentationChannel" />
<parameter replace="ModelDisplayChannel" uid="ModelDisplayChannel" />
<parameter replace="PickingChannel" uid="pickerChannel" />
<parameter replace="Medical3DCamera" uid="Medical3DCamera" />
<parameter replace="CrossTypeChannel" uid="crossTypeChannel" />
</service>
......@@ -172,6 +175,13 @@
<push srcKey="OptionalInputImageKey" />
</service>
<service uid="extractLandmarks" type="::ctrlCamp::SCopy" >
<in key="source" uid="optionalInputImage">
<extract from="@fields.m_landmarksId" />
</in>
<inout key="target" uid="${landmarks}"/>
</service>
<service uid="LockImageSrv" type="::ctrlMemory::LockDumpSrv" >
<inout key="image" uid="optionalInputImage" />
</service>
......@@ -179,8 +189,10 @@
<service uid="cfgNegato2" type="::fwServices::SConfigController" >
<appConfig id="2DNegato" />
<inout key="image" uid="optionalInputImage" />
<inout key="landmarks" uid="${landmarks}" />
<parameter replace="WID_PARENT" uid="view_negato2" />
<parameter replace="CrossTypeChannel" uid="crossTypeChannel" />