Skip to content
GitLab
Commit 2a42ae2d authored by Flavien BRIDAULT's avatar Flavien BRIDAULT
Browse files

merge(dev): release 13.0.0

parents bcbc3016 a05ba324
Hide whitespace changes
Inline Side-by-side
.gitlab/issue_templates/Bug.md 0 → 100644
View file @ 2a42ae2d
Please read this!
Before opening a new issue, verify the issue you're about to submit isn't a duplicate.
Please remove this notice if you're confident your issue isn't a duplicate.
------
### Summary
(Summarize the bug encountered concisely)
### Steps to reproduce
(How one can reproduce the issue - this is very important)
### Dev environment
* OS: (Linux, Windows, MacOS)
* CMake version: (cmake --version)
* Compiler: (gcc/clang/... & version)
* Build type: (debug/release)
* Commit: (current commit or tag)
* (Any related repository commit/tag e.g fw4spl-deps, fw4spl, fw4spl-ar ...)
### What is the current *bug* behavior?
(What actually happens)
### What is the expected *correct* behavior?
(What you should see instead)
### Relevant logs and/or screenshots
(Paste any relevant logs - please use code blocks (```) to format console output,
logs, and code as it's very hard to read otherwise.)
### Possible fixes
(If you can, link to the line of code that might be responsible for the problem)
/label ~bug
.gitlab/issue_templates/Feature.md 0 → 100644
View file @ 2a42ae2d
Please read this!
Before opening a new issue, verify the issue you're about to submit isn't a duplicate.
Please remove this notice if you're confident your issue isn't a duplicate.
------
### Description
(Include problem, use cases, benefits, and/or goals)
### Proposal
### Links / references
### Documentation blurb
(Write the start of the documentation of this feature here, include:
1. Why should someone use it; what's the underlying problem.
2. What is the solution.
3. How does someone use this
During implementation, this can then be copied and used as a starter for the documentation.)
/label ~feature
.gitlab/merge_request_templates/Merge_Request.md 0 → 100644
View file @ 2a42ae2d
## What does this MR do?
(Briefly describe what this MR is about)
## How to test it?
(Describe how to test this feature step by step)
## Data
(link to the needed data)
## Some results
(Some interesting results, screenshot, perfs, ...)
## Additional tests to run
(If you need some specific test e.g Windows compilation...)
- [ ] Build on Windows
- [ ] ...
Apps/VRRender/Properties.cmake
View file @ 2a42ae2d
......@@ -46,12 +46,12 @@ set( REQUIREMENTS
preferences
)
bundleParam(guiQt
PARAM_LIST
bundleParam(guiQt
PARAM_LIST
resource
stylesheet
PARAM_VALUES
${BUNDLE_PREFIX}/style_0-1/darkstyle.rcc
${BUNDLE_PREFIX}/style_0-1/darkstyle.qss
stylesheet
PARAM_VALUES
style-0.1/darkstyle.rcc
style-0.1/darkstyle.qss
)
bundleParam(appXml PARAM_LIST config parameters PARAM_VALUES VRRenderBase VRRenderAppBase)
Apps/VRRender/rc/configurations/VRRenderBase.xml
View file @ 2a42ae2d
......@@ -85,11 +85,11 @@
<service uid="action_quit" type="::gui::action::SQuit" />
<service uid="action_about" type="::uiGenericQt::action::SShowAbout">
<filename id="@BUNDLE_PREFIX@/VRRender_${appVersion}/about/about.html" />
<filename id="VRRender-${appVersion}/about/about.html" />
</service>
<service uid="action_acknowledgments" type="::uiGenericQt::action::SShowAbout">
<filename id="@BUNDLE_PREFIX@/VRRender_${appVersion}/documentations/ack.html"/>
<filename id="VRRender-${appVersion}/documentations/ack.html"/>
<title>Acknowledgments</title>
<size width="500" height="600" />
</service>
......
Apps/VRRender/rc/configurations/sdb.xml
View file @ 2a42ae2d
......@@ -34,18 +34,18 @@
<service uid="toolBar" type="::gui::aspect::SDefaultToolBar">
<gui>
<layout>
<menuItem name="Import" icon="@BUNDLE_PREFIX@/media_0-1/icons/Import.svg" />
<menuItem name="Export" icon="@BUNDLE_PREFIX@/media_0-1/icons/Export.svg" />
<menuItem name="Launch activity" icon="@BUNDLE_PREFIX@/media_0-1/icons/Launch_activity.svg" />
<menuItem name="Create a new activity" icon="@BUNDLE_PREFIX@/media_0-1/icons/CreateActivity.svg" />
<menuItem name="Import" icon="media-0.1/icons/Import.svg" />
<menuItem name="Export" icon="media-0.1/icons/Export.svg" />
<menuItem name="Launch activity" icon="media-0.1/icons/Launch_activity.svg" />
<menuItem name="Create a new activity" icon="media-0.1/icons/CreateActivity.svg" />
<separator />
<menuItem name="2D visualization" icon="@BUNDLE_PREFIX@/media_0-1/icons/icon-2D.png" />
<menuItem name="3D visualization" icon="@BUNDLE_PREFIX@/media_0-1/icons/icon-3D.png" />
<menuItem name="Volume rendering" icon="@BUNDLE_PREFIX@/media_0-1/icons/icon-VR.png" />
<menuItem name="2D visualization" icon="media-0.1/icons/icon-2D.png" />
<menuItem name="3D visualization" icon="media-0.1/icons/icon-3D.png" />
<menuItem name="Volume rendering" icon="media-0.1/icons/icon-VR.png" />
<separator />
<menuItem name="DICOM PACS Reader" icon="@BUNDLE_PREFIX@/media_0-1/icons/Pull.svg" />
<menuItem name="DICOM PACS Writer" icon="@BUNDLE_PREFIX@/media_0-1/icons/Push.svg" />
<menuItem name="DICOM Filtering" icon="@BUNDLE_PREFIX@/media_0-1/icons/icon-DICOM-Filtering.svg" />
<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" />
</layout>
</gui>
<registry>
......@@ -75,8 +75,8 @@
<inout key="seriesDB" uid="${SERIESDB}" />
<ioSelectorConfig>FullSDBReaderIOSelectorConfig</ioSelectorConfig>
<icons>
<icon type="::fwMedData::ImageSeries" icon="@BUNDLE_PREFIX@/media_0-1/icons/ImageSeries.svg" />
<icon type="::fwMedData::ModelSeries" icon="@BUNDLE_PREFIX@/media_0-1/icons/ModelSeries.svg" />
<icon type="::fwMedData::ImageSeries" icon="media-0.1/icons/ImageSeries.svg" />
<icon type="::fwMedData::ModelSeries" icon="media-0.1/icons/ModelSeries.svg" />
</icons>
</service>
......@@ -102,8 +102,8 @@
</parameters>
<filter>
<mode>exclude</mode>
<id>ImageSeriesExport2</id>
<id>ModelSeriesExport2</id>
<id>ImageSeriesExport</id>
<id>ModelSeriesExport</id>
<id>SDBVRRender</id>
</filter>
</config>
......@@ -201,8 +201,8 @@
<in key="series" uid="selections" />
<filter>
<mode>exclude</mode>
<id>ImageSeriesExport2</id>
<id>ModelSeriesExport2</id>
<id>ImageSeriesExport</id>
<id>ModelSeriesExport</id>
<id>SDBVRRender</id>
</filter>
</service>
......@@ -215,8 +215,9 @@
</parameters>
<filter>
<mode>include</mode>
<id>ImageSeriesExport2</id>
<id>ModelSeriesExport2</id>
<id>ImageSeriesExport</id>
<id>ModelSeriesExport</id>
<id>DicomSeriesExport</id>
</filter>
</config>
</service>
......
Apps/VRRender/rc/plugin.xml
View file @ 2a42ae2d
<plugin id="VRRender" version="@DASH_VERSION@">
<plugin id="VRRender" version="@PROJECT_VERSION@">
<requirement id="servicesReg" />
<requirement id="dataReg" />
......@@ -14,8 +14,8 @@
<id>VRRenderAppBase</id>
<parameters>
<param name="appName" value="VRRender 0.9.7" />
<param name="appIconPath" value="@BUNDLE_PREFIX@/VRRender_0-9/vrrender.ico" />
<param name="appVersion" value="0-9" />
<param name="appIconPath" value="VRRender-@PROJECT_VERSION@/vrrender.ico" />
<param name="appVersion" value="@PROJECT_VERSION@" />
</parameters>
</extension>
......@@ -23,7 +23,7 @@
<id>SDBVRRender</id>
<title>SDB</title>
<desc>Series Selector</desc>
<icon>NONE</icon>
<icon>media-0.1/icons/selector.svg</icon>
<requirements />
<appConfig id="SDBVRRender">
<parameters />
......
Bundles/LeafActivity/2DVisualizationActivity/rc/configurations/2DNegatoWithTF.xml
View file @ 2a42ae2d
......@@ -4,16 +4,16 @@
<param name="WID_PARENT" />
<param name="image" />
<param name="landmarks" />
<param name="selectedTFKey" />
<param name="TFSelections" />
<param name="patient_name" default="" />
<param name="orientation" default="axial" /> <!-- axial, frontal, sagittal -->
<param name="CrossTypeChannel" default="crossTypeChannel"/>
<param name="transferFunctionDeferred" />
</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" />
<object uid="${transferFunctionDeferred}" type="::fwData::TransferFunction" src="deferred" />
<service uid="mainView" type="::gui::view::SDefaultView">
<gui>
<layout type="::fwGui::LineLayoutManager">
......@@ -76,14 +76,14 @@
<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}" />
<inout key="tf" uid="${transferFunctionDeferred}" optional="yes" />
<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}" />
<inout key="tfSelection" uid="${TFSelections}" />
<config renderer="default" picker="negatodefault" text="" selectedTFKey="${selectedTFKey}" />
<inout key="tf" uid="${transferFunctionDeferred}" />
<config renderer="default" picker="negatodefault" text="" />
</service>
<service uid="multiDistances" type="::visuVTKAdaptor::SImageMultiDistances" autoConnect="yes">
......@@ -125,7 +125,8 @@
<placeInScene uid="negato" />
</service>
<!-- START AND STOP SERVICES -->
<!-- ************************************* Connections ************************************ -->
<connect>
<signal>snapshotNegatoEditor/snapped</signal>
<slot>snapshot/snap</slot>
......@@ -140,6 +141,7 @@
<slot>MPRNegato/setCrossScale</slot>
</connect>
<!-- START AND STOP SERVICES -->
<start uid="LockImageSrv" />
<start uid="mainView" />
......@@ -153,5 +155,6 @@
<start uid="nameAdaptor" />
<start uid="imageSliceOrientationText" />
</config>
</extension>
Bundles/LeafActivity/2DVisualizationActivity/rc/configurations/2DVisualization.xml
View file @ 2a42ae2d
......@@ -41,22 +41,22 @@
<service uid="toolBar" type="::gui::aspect::SDefaultToolBar">
<gui>
<layout>
<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="Display Landmarks editor" icon="@BUNDLE_PREFIX@/media_0-1/icons/View-landmark.png" style="check" />
<menuItem name="Previous" icon="media-0.1/icons/Back.svg" />
<menuItem name="Next" icon="media-0.1/icons/Next.svg" />
<menuItem name="Load landmark" icon="media-0.1/icons/Load-landmark.png" />
<menuItem name="Save landmark" icon="media-0.1/icons/Save-landmark.png" />
<menuItem name="Focus landmark" icon="media-0.1/icons/Find-landmark.png" />
<menuItem name="Display Landmarks editor" icon="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" />
<menuItem name="Hide distance" icon="@BUNDLE_PREFIX@/media_0-1/icons/HideDistance.png" style="check" />
<menuItem name="Add distance" icon="media-0.1/icons/distance.png" />
<menuItem name="Remove distance" icon="media-0.1/icons/RemoveDistance.png" />
<menuItem name="Hide distance" icon="media-0.1/icons/HideDistance.png" style="check" />
<separator />
<menuItem name="Hide cross" icon="@BUNDLE_PREFIX@/media_0-1/icons/HideCross.png" style="radio" />
<menuItem name="Show normal cross" icon="@BUNDLE_PREFIX@/media_0-1/icons/NormalCross.png" style="radio" />
<menuItem name="Show full cross" icon="@BUNDLE_PREFIX@/media_0-1/icons/FullCross.png" style="radio" />
<menuItem name="Hide cross" icon="media-0.1/icons/HideCross.png" style="radio" />
<menuItem name="Show normal cross" icon="media-0.1/icons/NormalCross.png" style="radio" />
<menuItem name="Show full cross" icon="media-0.1/icons/FullCross.png" style="radio" />
<separator />
<menuItem name="Export Activity" icon="@BUNDLE_PREFIX@/media_0-1/icons/Export.svg" />
<menuItem name="Export Activity" icon="media-0.1/icons/Export.svg" />
</layout>
</gui>
<registry>
......
Bundles/LeafActivity/2DVisualizationActivity/rc/plugin.xml
View file @ 2a42ae2d
<plugin id="2DVisualizationActivity" version="@DASH_VERSION@" >
<plugin id="2DVisualizationActivity" version="@PROJECT_VERSION@" >
<requirement id="servicesReg" />
<requirement id="gui" />
......@@ -21,7 +21,7 @@
<id>2DVisualization</id>
<title>2D visualization</title>
<desc>Display a medical image in 2D.</desc>
<icon>@BUNDLE_PREFIX@/media_0-1/icons/icon-2D.png</icon>
<icon>media-0.1/icons/icon-2D.png</icon>
<requirements>
<requirement name="imageSeries" type="::fwMedData::ImageSeries" minOccurs="1" maxOccurs="1">
<desc>Image to display.</desc>
......
Bundles/LeafActivity/3DVisualizationActivity/rc/configurations/3DVisualization.xml
View file @ 2a42ae2d
......@@ -62,26 +62,26 @@
<service uid="toolBar" type="::gui::aspect::SDefaultToolBar">
<gui>
<layout>
<menuItem name="3D MPR Axial view" icon="@BUNDLE_PREFIX@/media_0-1/icons/icon-axial.png" />
<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" />
<menuItem name="3D MPR Axial view" icon="media-0.1/icons/icon-axial.png" />
<menuItem name="3D MPR Frontal view" icon="media-0.1/icons/icon-frontal.png" />
<menuItem name="3D MPR Sagittal view" icon="media-0.1/icons/icon-sagittal.png" />
<separator />
<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="Display Landmarks editor" icon="@BUNDLE_PREFIX@/media_0-1/icons/View-landmark.png" style="check" />
<menuItem name="Load landmark" icon="media-0.1/icons/Load-landmark.png" />
<menuItem name="Save landmark" icon="media-0.1/icons/Save-landmark.png" />
<menuItem name="Focus landmark" icon="media-0.1/icons/Find-landmark.png" />
<menuItem name="Display Landmarks editor" icon="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" />
<menuItem name="Hide distance" icon="@BUNDLE_PREFIX@/media_0-1/icons/HideDistance.png" style="check" />
<menuItem name="Add distance" icon="media-0.1/icons/distance.png" />
<menuItem name="Remove distance" icon="media-0.1/icons/RemoveDistance.png" />
<menuItem name="Hide distance" icon="media-0.1/icons/HideDistance.png" style="check" />
<separator />
<menuItem name="Hide cross" icon="@BUNDLE_PREFIX@/media_0-1/icons/HideCross.png" style="radio" />
<menuItem name="Show normal cross" icon="@BUNDLE_PREFIX@/media_0-1/icons/NormalCross.png" style="radio" />
<menuItem name="Show full cross" icon="@BUNDLE_PREFIX@/media_0-1/icons/FullCross.png" style="radio" />
<menuItem name="Hide cross" icon="media-0.1/icons/HideCross.png" style="radio" />
<menuItem name="Show normal cross" icon="media-0.1/icons/NormalCross.png" style="radio" />
<menuItem name="Show full cross" icon="media-0.1/icons/FullCross.png" style="radio" />
<separator />
<menuItem name="Manage organs color" icon="@BUNDLE_PREFIX@/media_0-1/icons/ManageOrgan.png" style="check" />
<menuItem name="Manage organs color" icon="media-0.1/icons/ManageOrgan.png" style="check" />
<separator />
<menuItem name="Export Activity" icon="@BUNDLE_PREFIX@/media_0-1/icons/Export.svg" />
<menuItem name="Export Activity" icon="media-0.1/icons/Export.svg" />
<spacer />
<menu name="Visu 3D" />
</layout>
......@@ -110,11 +110,11 @@
<service uid="menu" type="::gui::aspect::SDefaultMenu">
<gui>
<layout>
<menuItem name="Manage organs colors" style="check" shortcut="F9" icon="@BUNDLE_PREFIX@/media_0-1/icons/ManageOrgan.png" />
<menuItem name="Manage organs colors" style="check" shortcut="F9" icon="media-0.1/icons/ManageOrgan.png" />
<separator />
<menuItem name="Axial view" icon="@BUNDLE_PREFIX@/media_0-1/icons/icon-axial.png" />
<menuItem name="Frontal view" icon="@BUNDLE_PREFIX@/media_0-1/icons/icon-frontal.png" />
<menuItem name="Sagittal view" icon="@BUNDLE_PREFIX@/media_0-1/icons/icon-sagittal.png" />
<menuItem name="Axial view" icon="media-0.1/icons/icon-axial.png" />
<menuItem name="Frontal view" icon="media-0.1/icons/icon-frontal.png" />
<menuItem name="Sagittal view" icon="media-0.1/icons/icon-sagittal.png" />
</layout>
</gui>
<registry>
......
Bundles/LeafActivity/3DVisualizationActivity/rc/plugin.xml
View file @ 2a42ae2d
<plugin id="3DVisualizationActivity" version="@DASH_VERSION@" >
<plugin id="3DVisualizationActivity" version="@PROJECT_VERSION@" >
<requirement id="servicesReg" />
<requirement id="2DVisualizationActivity" />
......@@ -15,7 +15,7 @@
<id>3DVisualization</id>
<title>3D visualization</title>
<desc>Activity to display a 3D model, and optionally its associated image.</desc>
<icon>@BUNDLE_PREFIX@/media_0-1/icons/icon-3D.png</icon>
<icon>media-0.1/icons/icon-3D.png</icon>
<requirements>
<requirement name="modelSeries" type="::fwMedData::ModelSeries" minOccurs="1" maxOccurs="1">
<desc>3D model.</desc>
......
Bundles/LeafActivity/blendActivity/rc/configurations/Blend.xml
View file @ 2a42ae2d
......@@ -15,36 +15,23 @@
<object uid="${AS_UID}" type="::fwMedData::ActivitySeries" src="ref" />
<object uid="${backgroundImageUid}" type="::fwData::Image" src="ref" />
<object uid="${frontImageUid}" type="::fwData::Image" src="ref" />
<object uid="TFComposite" type="::fwData::Composite" />
<object uid="tfBackgroundImage" type="::fwData::TransferFunction" src="deferred" />
<object uid="tfFrontImage" type="::fwData::TransferFunction" src="deferred" />
<service uid="mainView" type="::gui::view::SDefaultView">
<gui>
<layout type="::fwGui::CardinalLayoutManager">
<view align="center" />
<layout type="::fwGui::TabLayoutManager">
<view caption="Blend" selected="yes" />
<view caption="Background image" />
<view caption="Front image" />
</layout>
<toolBar />
</gui>
<registry>
<parent wid="${WID_PARENT}" />
<toolBar sid="toolBar" start="yes" />
<view wid="subView" />
</registry>
</service>
<service uid="toolBar" type="::gui::aspect::SDefaultToolBar">
<gui>
<layout>
<menuItem name="Blend view" style="radio" icon="@BUNDLE_PREFIX@/media_0-1/icons/icon-2D.png" />
<menuItem name="Edit background Image TF" style="radio" icon="@BUNDLE_PREFIX@/media_0-1/icons/icon-tf1.svg" />
<menuItem name="Edit front Image TF" style="radio" icon="@BUNDLE_PREFIX@/media_0-1/icons/icon-tf2.svg" />
<menuItem name="Export Activity" icon="@BUNDLE_PREFIX@/media_0-1/icons/Export.svg" />
</layout>
</gui>
<registry>
<menuItem sid="action_blendView" start="no" />
<menuItem sid="action_bgTFView" start="yes" />
<menuItem sid="action_frontTFView" start="yes" />
<menuItem sid="ActionExportActivity" start="yes" />
<view wid="blendView" />
<view wid="bgImageView" />
<view wid="frontImageView" />
</registry>
</service>
......@@ -61,38 +48,37 @@
<inout key="image" uid="${backgroundImageUid}" />
</service>
<service uid="action_blendView" type="::gui::action::SConfigLauncher">
<service uid="blendViewCtrl" type="::fwServices::SConfigController">
<state active="true" />
<inout key="TF_COMPOSITE_ID" uid="TFComposite" />
<inout key="backgroundImageUid" uid="${backgroundImageUid}" />
<inout key="frontImageUid" uid="${frontImageUid}" />
<appConfig id="ImageMix" />
<parameter replace="WID_PARENT" by="subView" />
<parameter replace="SELECTED_TF_KEYA" by="tfBackgroundImage" />
<parameter replace="SELECTED_TF_KEYB" by="tfFrontImage" />
<parameter replace="WID_PARENT" by="blendView" />
<parameter replace="tfBackgroundImage" by="tfBackgroundImage" />
<parameter replace="tfFrontImage" by="tfFrontImage" />
</service>
<service uid="action_bgTFView" type="::gui::action::SConfigLauncher">
<inout key="myImage" uid="${backgroundImageUid}" />
<inout key="TF_COMPOSITE_ID" uid="TFComposite" />
<service uid="bgTFViewCtrl" type="::fwServices::SConfigController">
<inout key="image" uid="${backgroundImageUid}" />
<appConfig id="TransferFunctionEditor" />
<parameter replace="WID_PARENT" by="subView" />
<parameter replace="SELECTED_TF_KEY" by="tfBackgroundImage" />
<parameter replace="WID_PARENT" by="bgImageView" />
<parameter replace="transferFunction" by="tfBackgroundImage" />
</service>
<service uid="action_frontTFView" type="::gui::action::SConfigLauncher">
<inout key="TF_COMPOSITE_ID" uid="TFComposite" />
<inout key="myImage" uid="${frontImageUid}" />
<service uid="frontTFViewCtrl" type="::fwServices::SConfigController">
<inout key="image" uid="${frontImageUid}" />
<appConfig id="TransferFunctionEditor" />
<parameter replace="WID_PARENT" by="subView" />
<parameter replace="SELECTED_TF_KEY" by="tfFrontImage" />
<parameter replace="WID_PARENT" by="frontImageView" />
<parameter replace="transferFunction" by="tfFrontImage" />
</service>
<!-- START AND STOP SERVICES -->
<start uid="mainView" />
<start uid="medicalImageFrontSrv" />
<start uid="medicalImageBgSrv" />
<start uid="action_blendView" />
<start uid="blendViewCtrl" />
<start uid="bgTFViewCtrl" />
<start uid="frontTFViewCtrl" />
</config>
</extension>
......
Bundles/LeafActivity/blendActivity/rc/configurations/ImageMix.xml
View file @ 2a42ae2d
......@@ -3,17 +3,19 @@
<parameters>
<param name="WID_PARENT" />
<param name="GENERIC_UID" />
<param name="TF_COMPOSITE_ID" />
<param name="SELECTED_TF_KEYA" />
<param name="SELECTED_TF_KEYB" />
<param name="tfBackgroundImage" />
<param name="tfFrontImage" />
<param name="backgroundImageUid" />
<param name="frontImageUid" />
<param name="patient_name" default="" />
</parameters>
<config>
<object uid="${TF_COMPOSITE_ID}" type="::fwData::Composite" src="ref" />
<object uid="${backgroundImageUid}" type="::fwData::Image" src="ref" />
<object uid="${frontImageUid}" type="::fwData::Image" src="ref" />
<object uid="${tfBackgroundImage}" type="::fwData::TransferFunction" src="deferred" />
<object uid="${tfFrontImage}" type="::fwData::TransferFunction" src="deferred" />
<service uid="mainView" type="::gui::view::SDefaultView" autoConnect="no">
<gui>
<layout type="::fwGui::CardinalLayoutManager">
......@@ -79,7 +81,7 @@
</layout>
</gui>
<registry>
<view sid="bg_windowLevel" start="yes" />
<view sid="bg_windowLevel" start="no" />
</registry>
</service>
......@@ -93,12 +95,12 @@
</layout>
</gui>
<registry>
<view sid="front_windowLevel" start="yes" />
<view sid="front_windowLevel" start="no" />
<view sid="front_imageTransparency" start="yes" />
</registry>
</service>
<service uid="snapshot" type="::uiVisuQt::SnapshotEditor" autoConnect="no" />
<service uid="snapshot" type="::uiVisuQt::SnapshotEditor" />
<service type="::ctrlMemory::LockDumpSrv" autoConnect="no">
<in key="image" uid="${backgroundImageUid}" />
......@@ -114,8 +116,7 @@
</service>
<service uid="bg_windowLevel" type="::uiImageQt::WindowLevel">
<inout key="image" uid="${backgroundImageUid}" autoConnect="yes" />
<inout key="TFSelections" uid="${TF_COMPOSITE_ID}" />
<config selectedTFKey="${SELECTED_TF_KEYA}" />
<inout key="tf" uid="${tfBackgroundImage}" />
</service>
<service type="::ctrlMemory::LockDumpSrv" autoConnect="no">
......@@ -134,8 +135,7 @@
<service uid="front_windowLevel" type="::uiImageQt::WindowLevel">
<inout key="image" uid="${frontImageUid}" autoConnect="yes" />
<inout key="TFSelections" uid="${TF_COMPOSITE_ID}" />
<config selectedTFKey="${SELECTED_TF_KEYB}" />
<inout key="tf" uid="${tfFrontImage}" />
</service>
<!-- Generic scene to show merging of backgroung and front images -->
......@@ -159,6 +159,7 @@