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

merge(dev): release 12.0.0

parents 91f28dbd 03d42f0d
......@@ -11,9 +11,8 @@ set( REQUIREMENTS
guiQt
activities
appXml2
appXml
memory
ctrlMemory
fwlauncher
io
......@@ -27,9 +26,9 @@ set( REQUIREMENTS
uiGenericQt
uiMedDataQt
2DVisualizationActivity2
3DVisualizationActivity2
volumeRenderingActivity2
2DVisualizationActivity
3DVisualizationActivity
volumeRenderingActivity
blendActivity
ioActivity
......@@ -55,4 +54,4 @@ bundleParam(guiQt
${BUNDLE_PREFIX}/style_0-1/darkstyle.rcc
${BUNDLE_PREFIX}/style_0-1/darkstyle.qss
)
bundleParam(appXml2 PARAM_LIST config parameters PARAM_VALUES VRRenderBase VRRenderAppBase)
bundleParam(appXml PARAM_LIST config parameters PARAM_VALUES VRRenderBase VRRenderAppBase)
<extension implements="::fwServices::registry::AppConfig2">
<extension implements="::fwServices::registry::AppConfig">
<id>VRRenderBase</id>
<parameters>
<param name="appName" />
......@@ -84,27 +84,27 @@
<service uid="action_quit" type="::gui::action::SQuit" />
<service uid="action_about" type="::uiGeneric::action::SShowAbout">
<service uid="action_about" type="::uiGenericQt::action::SShowAbout">
<filename id="@BUNDLE_PREFIX@/VRRender_${appVersion}/about/about.html" />
</service>
<service uid="action_acknowledgments" type="::uiGeneric::action::SShowAbout">
<service uid="action_acknowledgments" type="::uiGenericQt::action::SShowAbout">
<filename id="@BUNDLE_PREFIX@/VRRender_${appVersion}/documentations/ack.html"/>
<title>Acknowledgments</title>
<size width="500" height="600" />
</service>
<service uid="action_openBrowser" type="::uiGeneric::action::LaunchBrowserActionService">
<service uid="action_openBrowser" type="::uiGenericQt::action::LaunchBrowserActionService">
<url>http://www.ircad.fr/softwares/vr-render/Software.php</url>
</service>
<service uid="dynamicView" type="::guiQt::editor::SDynamicView" autoConnect="yes">
<mainActivity id="SDBVRRender" closable="false" />
<parameters>
<parameter replace="SERIESDB" uid="seriesDB" />
<parameter replace="SERIESDB" by="seriesDB" />
<parameter replace="ICON_PATH" by="${appIconPath}" />
<parameter replace="DYNAMICVIEW_CHANNEL" uid="dynamicViewChannel" />
<parameter replace="PROGRESS_CHANNEL" uid="progressStatus" />
<parameter replace="DYNAMICVIEW_CHANNEL" by="dynamicViewChannel" />
<parameter replace="PROGRESS_CHANNEL" by="progressStatus" />
</parameters>
</service>
......
<extension implements="::fwServices::registry::AppConfig2">
<extension implements="::fwServices::registry::AppConfig">
<id>SDBVRRender</id>
<parameters>
<param name="SERIESDB" />
......@@ -66,12 +66,12 @@
<in key="seriesDB" uid="${SERIESDB}" />
<IOSelectorSrvConfig name="SDBReaderIOSelectorConfig" />
</service>
<service uid="selector" type="::uiMedData::editor::SSelector" autoConnect="yes">
<service uid="selector" type="::uiMedDataQt::editor::SSelector" autoConnect="yes">
<inout key="seriesDB" uid="${SERIESDB}" />
<inout key="selection" uid="selections" />
</service>
<service uid="activityCreator" type="::uiMedData::editor::SActivityWizard">
<service uid="activityCreator" type="::uiMedDataQt::editor::SActivityWizard">
<inout key="seriesDB" uid="${SERIESDB}" />
<ioSelectorConfig>FullSDBReaderIOSelectorConfig</ioSelectorConfig>
<icons>
......@@ -80,7 +80,7 @@
</icons>
</service>
<service uid="seriesViewer" type="::uiMedData::SSeriesViewer" autoConnect="yes">
<service uid="seriesViewer" type="::uiMedDataQt::SSeriesViewer" autoConnect="yes">
<in key="series" uid="selections" />
<parentView wid="preview" />
<configs>
......@@ -89,7 +89,7 @@
</config>
<config id="3DSimpleConfig2" type="::fwMedData::ModelSeries" />
<config id="ActivityCreatorConfig" type="::fwMedData::ActivitySeries">
<parameter replace="SERIESDB" uid="${SERIESDB}" />
<parameter replace="SERIESDB" by="${SERIESDB}" />
</config>
</configs>
</service>
......@@ -97,7 +97,7 @@
<in key="series" uid="selections" />
<config>
<parameters>
<parameter replace="SERIESDB" uid="${SERIESDB}" />
<parameter replace="SERIESDB" by="${SERIESDB}" />
<parameter replace="ICON_PATH" by="${ICON_PATH}" />
</parameters>
<filter>
......@@ -113,7 +113,7 @@
<in key="series" uid="selections" />
<config>
<parameters>
<parameter replace="SERIESDB" uid="${SERIESDB}" />
<parameter replace="SERIESDB" by="${SERIESDB}" />
<parameter replace="ICON_PATH" by="${ICON_PATH}" />
</parameters>
<filter>
......@@ -128,7 +128,7 @@
<in key="series" uid="selections" />
<config>
<parameters>
<parameter replace="SERIESDB" uid="${SERIESDB}" />
<parameter replace="SERIESDB" by="${SERIESDB}" />
<parameter replace="ICON_PATH" by="${ICON_PATH}" />
</parameters>
<filter>
......@@ -142,7 +142,7 @@
<in key="series" uid="selections" />
<config>
<parameters>
<parameter replace="SERIESDB" uid="${SERIESDB}" />
<parameter replace="SERIESDB" by="${SERIESDB}" />
<parameter replace="ICON_PATH" by="${ICON_PATH}" />
</parameters>
<filter>
......@@ -173,7 +173,7 @@
<parameters>
<parameter replace="ICON_PATH" by="${ICON_PATH}" />
<parameter replace="APP_NAME" by="VRRender" />
<parameter replace="PROGRESS_CHANNEL" uid="progressStatus" />
<parameter replace="PROGRESS_CHANNEL" by="${PROGRESS_CHANNEL}" />
</parameters>
<filter>
<mode>include</mode>
......@@ -188,7 +188,7 @@
<parameters>
<parameter replace="SERIESDB" by="${SERIESDB}" />
<parameter replace="ICON_PATH" by="${ICON_PATH}" />
<parameter replace="PROGRESS_CHANNEL" uid="progressStatus" />
<parameter replace="PROGRESS_CHANNEL" by="${PROGRESS_CHANNEL}" />
</parameters>
<filter>
<mode>include</mode>
......
......@@ -3,5 +3,18 @@ set( NAME 2DVisualizationActivity )
set( VERSION 0.1 )
set( TYPE BUNDLE )
set( DEPENDENCIES )
set( REQUIREMENTS gui guiQt uiMeasurement uiMeasurementQt ctrlSelection uiImageQt uiVisu uiVisuQt visuVTKAdaptor media )
set( REQUIREMENTS
activities
gui
guiQt
uiMeasurement
uiMeasurementQt
ctrlCamp
ctrlMemory
ctrlSelection
uiImageQt
uiVisu
uiVisuQt
visuVTKAdaptor
visuVTKQt
media )
......@@ -2,137 +2,162 @@
<id>2DNegato</id>
<parameters>
<param name="WID_PARENT" />
<param name="GENERIC_UID" />
<param name="imageUid" />
<param name="orientation" default="axial" /> <!-- axial, frontal, sagittal -->
<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="CrossTypeChannel" default="crossTypeChannel" />
<param name="PickingChannel" default="pickingChannel" />
</parameters>
<config>
<object type="::fwData::Composite">
<service uid="${GENERIC_UID}_mainView" type="::gui::view::IView" impl="::gui::view::SDefaultView" autoConnect="no">
<gui>
<layout type="::fwGui::LineLayoutManager">
<orientation value="vertical" />
<view proportion="1" />
<view proportion="0" minHeight="30" />
</layout>
</gui>
<registry>
<parent wid="${WID_PARENT}" />
<view sid="${GENERIC_UID}_negato" start="yes" />
<view sid="${GENERIC_UID}_multiView_negato_bottom" start="yes" />
</registry>
</service>
<service uid="${GENERIC_UID}_multiView_negato_bottom" type="::gui::view::IView" impl="::gui::view::SDefaultView" autoConnect="no">
<gui>
<layout type="::fwGui::LineLayoutManager">
<orientation value="horizontal" />
<view proportion="0" minWidth="30" />
<view proportion="1" />
<view proportion="0" minWidth="30" />
</layout>
</gui>
<registry>
<view sid="${GENERIC_UID}_snapshotNegatoEditor" start="yes" />
<view sid="${GENERIC_UID}_slider_negato" start="yes" />
<view sid="${GENERIC_UID}_distanceNegatoEditor" start="yes" />
</registry>
</service>
<service uid="${GENERIC_UID}_snapshotNegatoEditor" type="::gui::editor::IEditor" impl="::uiVisu::SnapshotEditor" autoConnect="no" />
<!-- GENERIC SCENE DEFINITION -->
<item key="visuConfig">
<object uid="${GENERIC_UID}_VisuComposite" type="::fwData::Composite">
<!-- Generic Scene Negato -->
<service uid="${GENERIC_UID}_negato" impl="::fwRenderVTK::SRender" type="::fwRender::IRender" autoConnect="yes">
<scene>
<picker id="negatodefault" vtkclass="fwVtkCellPicker" />
<renderer id="default" background="0.0" />
<adaptor id="snapshot" uid="${GENERIC_UID}_snapshotUID" class="::visuVTKAdaptor::Snapshot" objectId="self">
<config renderer="default" />
</adaptor>
<adaptor id="interactor" class="::visuVTKAdaptor::InteractorStyle" objectId="self">
<config renderer="default" style="InteractorStyle2DForNegato" />
</adaptor>
<adaptor id="MPRNegato" uid="${GENERIC_UID}_MPRNegato" class="::visuVTKAdaptor::NegatoMPR" objectId="imageKey">
<config renderer="default" picker="negatodefault" mode="2d" slices="1" sliceIndex="${orientation}" />
</adaptor>
<adaptor id="text" class="::visuVTKAdaptor::ImageText" objectId="imageKey">
<config renderer="default" picker="negatodefault" text="" />
</adaptor>
<adaptor id="imageSliceOrientationText" class="::visuVTKAdaptor::ImageSliceOrientationText" objectId="imageKey">
<config renderer="default">
<locations>${IMAGE_LOCATIONS}</locations>
<initialOrientation>${orientation}</initialOrientation>
</config>
</adaptor>
<adaptor id="multiDistances" uid="${GENERIC_UID}_multiDistancesUID" class="::visuVTKAdaptor::ImageMultiDistances" objectId="imageKey">
<config filter="true" renderer="default" picker="negatodefault" />
</adaptor>
<adaptor id="landmarksNegato" class="::visuVTKAdaptor::SLandmarks" objectId="imageKey">
<config renderer="default" picker="negatodefault" />
</adaptor>
<adaptor id="nameAdaptor" class="::visuVTKAdaptor::Text" objectId="imageKey">
<config renderer="default" text="${patient_name}" fontSize="15" hAlign="right" vAlign="top" />
</adaptor>
<connect>
<signal>${GENERIC_UID}_snapshotNegatoEditor/snapped</signal>
<slot>${GENERIC_UID}_snapshotUID/snap</slot>
</connect>
<connect waitForKey="imageKey">
<signal>${GENERIC_UID}_distanceNegatoEditor/distanceRequested</signal>
<slot>${GENERIC_UID}_multiDistancesUID/createDistance</slot>
</connect>
<proxy channel="${CrossTypeChannel}" waitForKey="imageKey">
<slot>${GENERIC_UID}_MPRNegato/setCrossScale</slot>
</proxy>
</scene>
</service>
<item key="imageKey">
<object uid="${imageUid}" src="ref" type="::fwData::Image">
<service uid="${GENERIC_UID}_LockImageSrv" impl="::ctrlMemory::LockDumpSrv" type="::fwServices::IController" autoConnect="no" />
<service uid="${GENERIC_UID}_slider_negato" impl="::uiImage::SliceIndexPositionEditor" type="::gui::editor::IEditor" autoConnect="yes">
<sliceIndex>${orientation}</sliceIndex>
</service>
<service uid="${GENERIC_UID}_distanceNegatoEditor" type="::gui::editor::IEditor" impl="::uiMeasurement::editor::Distance" autoConnect="no">
<placeInScene uid="${GENERIC_UID}_negato" />
</service>
</object>
</item>
</object>
</item>
<!-- START AND STOP SERVICES -->
<start uid="${GENERIC_UID}_LockImageSrv" />
<start uid="${GENERIC_UID}_mainView" />
</object>
<object uid="${image}" type="::fwData::Image" src="ref" />
<object uid="${landmarks}" type="::fwData::Landmarks" src="ref" />
<service uid="mainView" type="::gui::view::SDefaultView">
<gui>
<layout type="::fwGui::LineLayoutManager">
<orientation value="vertical" />
<view proportion="1" />
<view proportion="0" minHeight="30" />
</layout>
</gui>
<registry>
<parent wid="${WID_PARENT}" />
<view sid="negato" start="yes" />
<view sid="multiView_negato_bottom" start="yes" />
</registry>
</service>
<service uid="multiView_negato_bottom" type="::gui::view::SDefaultView">
<gui>
<layout type="::fwGui::LineLayoutManager">
<orientation value="horizontal" />
<view proportion="0" minWidth="30" />
<view proportion="1" />
<view proportion="0" minWidth="30" />
</layout>
</gui>
<registry>
<view sid="snapshotNegatoEditor" start="yes" />
<view sid="slider_negato" start="yes" />
<view sid="distanceNegatoEditor" start="yes" />
</registry>
</service>
<service uid="snapshotNegatoEditor" type="::uiVisuQt::SnapshotEditor" />
<!-- Generic Scene Negato -->
<!-- *************************** Begin generic scene *************************** -->
<service uid="negato" type="::fwRenderVTK::SRender" autoConnect="yes">
<scene>
<picker id="negatodefault" vtkclass="fwVtkCellPicker" />
<renderer id="default" background="0.0" />
<adaptor uid="snapshot" />
<adaptor uid="interactor" />
<adaptor uid="pickerInteractor" />
<adaptor uid="MPRNegato" />
<adaptor uid="text" />
<adaptor uid="imageSliceOrientationText" />
<adaptor uid="multiDistances" />
<adaptor uid="landmarksNegato" />
<adaptor uid="nameAdaptor" />
</scene>
</service>
<service uid="snapshot" type="::visuVTKAdaptor::SSnapshot">
<config renderer="default" />
</service>
<service uid="interactor" type="::visuVTKAdaptor::SInteractorStyle">
<config renderer="default" style="InteractorStyle2DForNegato" />
</service>
<service uid="pickerInteractor" type="::visuVTKAdaptor::SPickerInteractor">
<config renderer="default" picker="negatodefault" event="MOUSE_LEFT_UP" />
</service>
<service uid="MPRNegato" type="::visuVTKAdaptor::SNegatoMPR" autoConnect="yes">
<inout key="image" uid="${image}" />
<config renderer="default" picker="negatodefault" mode="2d" slices="1" sliceIndex="${orientation}" />
</service>
<service uid="text" type="::visuVTKAdaptor::SImageText" autoConnect="yes">
<inout key="image" uid="${image}" />
<config renderer="default" picker="negatodefault" text="" />
</service>
<service uid="imageSliceOrientationText" type="::visuVTKAdaptor::SImageSliceOrientationText" autoConnect="yes">
<in key="image" uid="${image}" />
<config renderer="default">
<locations>${IMAGE_LOCATIONS}</locations>
<initialOrientation>${orientation}</initialOrientation>
</config>
</service>
<service uid="multiDistances" type="::visuVTKAdaptor::SImageMultiDistances" autoConnect="yes">
<inout key="image" uid="${image}" />
<config filter="true" renderer="default" picker="negatodefault" />
</service>
<service uid="landmarksNegato" type="::visuVTKAdaptor::SLandmarks" autoConnect="yes">
<inout key="landmarks" uid="${landmarks}" />
<config renderer="default" picker="negatodefault" />
</service>
<service uid="nameAdaptor" type="::visuVTKAdaptor::SText" autoConnect="yes">
<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}" />
</service>
<service uid="slider_negato" type="::uiImageQt::SliceIndexPositionEditor" autoConnect="yes" >
<inout key="image" uid="${image}" />
<sliceIndex>${orientation}</sliceIndex>
</service>
<service uid="distanceNegatoEditor" type="::uiMeasurementQt::editor::Distance">
<inout key="image" uid="${image}" />
<placeInScene uid="negato" />
</service>
<!-- START AND STOP SERVICES -->
<connect>
<signal>snapshotNegatoEditor/snapped</signal>
<slot>snapshot/snap</slot>
</connect>
<connect>
<signal>distanceNegatoEditor/distanceRequested</signal>
<slot>multiDistances/createDistance</slot>
</connect>
<connect channel="${CrossTypeChannel}">
<slot>MPRNegato/setCrossScale</slot>
</connect>
<connect channel="${PickingChannel}">
<signal>pickerInteractor/picked</signal>
</connect>
<start uid="LockImageSrv" />
<start uid="mainView" />
<!-- negato adaptors -->
<start uid="snapshot"/>
<start uid="interactor" />
<start uid="pickerInteractor" />
<start uid="MPRNegato" />
<start uid="text" />
<start uid="imageSliceOrientationText" />
<start uid="multiDistances" />
<start uid="landmarksNegato" />
<start uid="nameAdaptor" />
</config>
</extension>
......@@ -2,137 +2,156 @@
<id>2DNegatoWithTF</id>
<parameters>
<param name="WID_PARENT" />
<param name="GENERIC_UID" />
<param name="imageUid" />
<param name="image" />
<param name="landmarks" />
<param name="selectedTFKey" />
<param name="TFSelectionsUid" />
<param name="TFSelections" />
<param name="patient_name" default="" />
<param name="orientation" default="axial" /> <!-- axial, frontal, sagittal -->
<param name="CrossTypeChannel" default="crossTypeChannel"/>
</parameters>
<config>
<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>
<layout type="::fwGui::LineLayoutManager">
<orientation value="vertical" />
<view proportion="1" />
<view proportion="0" minHeight="30" />
</layout>
</gui>
<registry>
<parent wid="${WID_PARENT}" />
<view sid="negato" start="yes" />
<view sid="multiView_negato_bottom" start="yes" />
</registry>
</service>
<service uid="multiView_negato_bottom" type="::gui::view::SDefaultView">
<gui>
<layout type="::fwGui::LineLayoutManager">
<orientation value="horizontal" />
<view proportion="0" minWidth="30" />
<view proportion="1" />
<view proportion="0" minWidth="30" />
</layout>
</gui>
<registry>
<view sid="snapshotNegatoEditor" start="yes" />
<view sid="slider_negato" start="yes" />
<view sid="distanceNegatoEditor" start="yes" />
</registry>
</service>
<service uid="snapshotNegatoEditor" type="::uiVisuQt::SnapshotEditor" />
<!-- Generic Scene Negato -->
<!-- *************************** Begin generic scene *************************** -->
<service uid="negato" type="::fwRenderVTK::SRender" autoConnect="yes">
<scene>
<picker id="negatodefault" vtkclass="fwVtkCellPicker" />
<renderer id="default" background="0.0" />
<adaptor uid="snapshot" />
<adaptor uid="interactor" />
<adaptor uid="MPRNegato" />
<adaptor uid="text" />
<adaptor uid="multiDistances" />
<adaptor uid="landmarksNegato" />
<adaptor uid="nameAdaptor" />
<adaptor uid="imageSliceOrientationText" />
</scene>
</service>
<service uid="snapshot" type="::visuVTKAdaptor::SSnapshot">
<config renderer="default" />
</service>
<service uid="interactor" type="::visuVTKAdaptor::SInteractorStyle">
<config renderer="default" style="InteractorStyle2DForNegato" />
</service>
<service uid="MPRNegato" type="::visuVTKAdaptor::SNegatoMPR" autoConnect="yes">
<inout key="image" uid="${image}" />
<inout key="tfSelection" uid="${TFSelections}" />
<config renderer="default" picker="negatodefault" mode="2d" slices="1" sliceIndex="${orientation}" selectedTFKey="${selectedTFKey}" />
</service>
<service uid="text" type="::visuVTKAdaptor::SImageText" autoConnect="yes">
<inout key="image" uid="${image}" />
<inout key="tfSelection" uid="${TFSelections}" />
<config renderer="default" picker="negatodefault" text="" selectedTFKey="${selectedTFKey}" />
</service>
<service uid="multiDistances" type="::visuVTKAdaptor::SImageMultiDistances" autoConnect="yes">
<inout key="image" uid="${image}" />
<config filter="true" renderer="default" picker="negatodefault" />
</service>
<service uid="landmarksNegato" type="::visuVTKAdaptor::SLandmarks" autoConnect="yes">
<inout key="landmarks" uid="${landmarks}" />
<config renderer="default" picker="negatodefault" />
</service>
<service uid="nameAdaptor" type="::visuVTKAdaptor::SText" autoConnect="yes">
<in key="object" uid="${image}" />
<config renderer="default" text="${patient_name}" fontSize="15" hAlign="right" vAlign="top" />
</service>
<service uid="imageSliceOrientationText" type="::visuVTKAdaptor::SImageSliceOrientationText" autoConnect="yes">
<in key="image" uid="${image}" />
<config renderer="default">
<locations>default</locations>
<initialOrientation>${orientation}</initialOrientation>
</config>
</service&