Commit 5debb897 authored by fw4splbot's avatar fw4splbot
Browse files

merge(dev): release 17.0.0

parents b0284a85 027d1a8b
fw4spl
......@@ -9,7 +9,7 @@
<object uid="seriesDB" type="::fwMedData::SeriesDB" />
<service uid="action_open" type="::uiIO::action::SSeriesDBMerger">
<inout key="data" uid="seriesDB" />
<inout key="seriesDB" uid="seriesDB" />
<IOSelectorSrvConfig name="SDBAtomsReaderIOSelectorConfig" />
</service>
<service uid="action_save" type="::gui::action::SStarter">
......
......@@ -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">
<service uid="mainview" type="::gui::view::SDefaultView" >
<gui>
<layout type="::fwGui::CardinalLayoutManager">
<view caption="Information" align="center" minWidth="200" />
......@@ -65,7 +65,7 @@
</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">
......@@ -235,7 +235,7 @@
<mode>include</mode>
<id>ImageSeriesExport</id>
<id>ModelSeriesExport</id>
<id>DicomSeriesExport</id>
<id>DicomSegmentationSurfaceExport</id>
</filter>
</config>
</service>
......
......@@ -50,7 +50,7 @@
<!-- Generic Scene Negato -->
<!-- *************************** Begin generic scene *************************** -->
<service uid="negato" type="::fwRenderVTK::SRender" autoConnect="yes">
<service uid="negato" type="::fwRenderVTK::SRender" >
<scene>
<picker id="negatodefault" vtkclass="fwVtkCellPicker" />
<renderer id="default" background="0.0" />
......@@ -107,7 +107,7 @@
<config renderer="default" picker="negatodefault" />
</service>
<service uid="nameAdaptor" type="::visuVTKAdaptor::SText" autoConnect="yes">
<service uid="nameAdaptor" type="::visuVTKAdaptor::SText" >
<config renderer="default" text="${patient_name}" fontSize="15" hAlign="right" vAlign="top" />
</service>
......@@ -124,7 +124,6 @@
<service uid="distanceNegatoEditor" type="::uiMeasurementQt::editor::Distance">
<inout key="image" uid="${image}" />
<placeInScene uid="negato" />
</service>
<!-- START AND STOP SERVICES -->
......
......@@ -50,7 +50,7 @@
<!-- Generic Scene Negato -->
<!-- *************************** Begin generic scene *************************** -->
<service uid="negato" type="::fwRenderVTK::SRender" autoConnect="yes">
<service uid="negato" type="::fwRenderVTK::SRender" >
<scene>
<picker id="negatodefault" vtkclass="fwVtkCellPicker" />
<renderer id="default" background="0.0" />
......@@ -121,8 +121,7 @@
</service>
<service uid="distanceNegatoEditor" type="::uiMeasurementQt::editor::Distance">
<in key="image" uid="${image}" />
<placeInScene uid="negato" />
<inout key="image" uid="${image}" />
</service>
<!-- ************************************* Connections ************************************ -->
......
......@@ -70,13 +70,12 @@
<service uid="distanceNegatoEditor" type="::uiMeasurementQt::editor::Distance">
<inout key="image" uid="optionalInputImage" />
<placeInScene uid="negato" />
</service>
<!-- Generic Scene Negato -->
<!-- *************************** Begin generic scene *************************** -->
<service uid="negato" type="::fwRenderVTK::SRender" autoConnect="yes">
<service uid="negato" type="::fwRenderVTK::SRender" >
<scene>
<picker id="negatodefault" vtkclass="fwVtkCellPicker" />
<renderer id="default" background="0.0" />
......
......@@ -26,7 +26,7 @@
<id>DicomPacsReaderConfig</id>
<desc>Reader configuration to convert retrieved DicomSeries to ImageSeries</desc>
<config>
<config filterType="::fwDicomIOFilter::custom::DefaultDicomFilter" />
<filterType>::fwDicomIOFilter::custom::DefaultDicomFilter</filterType>
</config>
</extension>
......
......@@ -39,18 +39,16 @@
<!-- Activity used to export a model series. -->
<extension implements="::fwActivities::registry::Activities">
<id>DicomSeriesExport</id>
<title>DicomSeries Export</title>
<desc>Activity to export a DicomSeries as a DICOM file, and optionally a ModelSeries.</desc>
<id>DicomSegmentationSurfaceExport</id>
<title>Dicom Segmentation Surface Export</title>
<desc>Activity to export a ModelSeries as a Dicom Segmentation Surface file.</desc>
<icon>media-0.1/icons/Export.svg</icon>
<requirements>
<requirement name="dicomSeries" type="::fwMedData::DicomSeries" minOccurs="1" maxOccurs="1" />
<requirement name="modelSeries" type="::fwMedData::ModelSeries" minOccurs="1" maxOccurs="1" />
</requirements>
<builder>::fwActivities::builder::ActivitySeries</builder>
<appConfig id="ExportDicomSelection">
<parameters>
<parameter replace="dicom" by="@values.dicomSeries" />
<parameter replace="model" by="@values.modelSeries" />
</parameters>
</appConfig>
......@@ -76,50 +74,23 @@
</config>
</extension>
<!-- App config used to export a dicom selected series. -->
<!-- App config used to export a Model to a Dicom Segmentation Surface. -->
<extension implements="::fwServices::registry::AppConfig">
<id>ExportDicomSelection</id>
<parameters>
<param name="dicom" />
<param name="model" />
</parameters>
<config>
<object uid="${dicom}" type="::fwMedData::DicomSeries" src="ref" />
<object uid="${model}" type="::fwMedData::ModelSeries" src="ref" />
<!-- We build a vector with the image and model series. -->
<object uid="vectorToSave" type="::fwData::Vector" />
<service uid="addDicom" type="::ctrlSelection::SManage">
<inout key="object" uid="${dicom}" />
<inout key="vector" uid="vectorToSave" />
</service>
<service uid="addModel" type="::ctrlSelection::SManage">
<inout key="object" uid="${model}" />
<inout key="vector" uid="vectorToSave" />
</service>
<service uid="exportSelection" type="::uiIO::editor::SIOSelector">
<inout key="data" uid="vectorToSave" />
<inout key="data" uid="${model}" />
<type mode="writer" />
<selection mode="include" />
<addSelection service="::ioGdcm::SSurfaceSegmentationWriter" />
</service>
<connect>
<signal>addDicom/started</signal>
<slot>addDicom/add</slot>
</connect>
<connect>
<signal>addModel/started</signal>
<slot>addModel/add</slot>
</connect>
<start uid="addDicom" />
<start uid="addModel" />
<start uid="exportSelection" />
<update uid="exportSelection" />
</config>
</extension>
......@@ -181,7 +152,7 @@
<id>MDAtomsConfig</id>
<desc>Json/Xml Reader/Writer (FW4SPL)</desc>
<config>
<patcher context="MedicalData" version="V10" />
<patcher />
<filter>VRRenderMedicalDataV2</filter>
</config>
</extension>
......@@ -196,7 +167,7 @@
<extensions>
<extension label="Zipped Activity Project">.apz</extension>
</extensions>
<patcher context="MedicalData" version="V10" />
<patcher />
</config>
</extension>
......
......@@ -132,7 +132,7 @@ void SSeriesSignal::updating()
// FIXME hack to support old getObject (with any 'in' or 'inout' key)
if (!this->getInput< ::fwMedData::SeriesDB >("seriesDB"))
{
FW_DEPRECATED_MSG("The input 'seriesDB' is not correct, you must have an 'input' key named 'seriesDB'");
FW_DEPRECATED_KEY("seriesDB", "in", "18.0");
}
else
{
......
......@@ -278,7 +278,7 @@ void SActivityLauncher::updating()
::fwData::Vector::csptr selection = this->getInput< ::fwData::Vector >(s_SERIES_INPUT);
if (!selection)
{
FW_DEPRECATED_MSG("SActivityLauncher should have an 'series' input, using default object");
FW_DEPRECATED_KEY(s_SERIES_INPUT, "in", "18.0");
selection = this->getObject< ::fwData::Vector >();
}
......@@ -321,7 +321,7 @@ void SActivityLauncher::updateState()
::fwData::Vector::csptr selection = this->getInput< ::fwData::Vector >(s_SERIES_INPUT);
if (!selection)
{
FW_DEPRECATED_MSG("SActivityLauncher should have an 'series' input, using default object");
FW_DEPRECATED_KEY(s_SERIES_INPUT, "in", "18.0");
selection = this->getObject< ::fwData::Vector >();
}
......@@ -466,7 +466,7 @@ void SActivityLauncher::sendConfig( const ::fwActivities::registry::ActivityInfo
::fwData::Vector::csptr selection = this->getInput< ::fwData::Vector >(s_SERIES_INPUT);
if (!selection)
{
FW_DEPRECATED_MSG("SActivityLauncher should have an 'series' input, using default object");
FW_DEPRECATED_KEY(s_SERIES_INPUT, "in", "18.0");
selection = this->getObject< ::fwData::Vector >();
}
......@@ -610,7 +610,7 @@ SActivityLauncher::ParametersType SActivityLauncher::translateParameters( const
::fwData::Object::csptr workingObj = this->getInput< ::fwData::Object >(s_SERIES_INPUT);
if (!workingObj)
{
FW_DEPRECATED_MSG("SActivityLauncher should have an 'series' input, using default object");
FW_DEPRECATED_KEY(s_SERIES_INPUT, "in", "18.0");
workingObj = this->getObject();
}
for(ParametersType::value_type& param : transParams)
......
......@@ -215,6 +215,32 @@ SCreateActivity::ActivityInfoContainer SCreateActivity::getEnabledActivities(con
void SCreateActivity::updating()
{
ActivityInfoContainer infos = ::fwActivities::registry::Activities::getDefault()->getInfos();
infos = this->getEnabledActivities(infos);
if ( !infos.empty())
{
::fwActivities::registry::ActivityInfo info;
if((m_keys.size() == 1 && m_filterMode == "include") || (infos.size() == 1))
{
info = infos[0];
}
else
{
info = this->show( infos );
}
if( !info.id.empty() )
{
m_sigActivityIDSelected->asyncEmit(info.id);
}
}
else
{
::fwGui::dialog::MessageDialog::showMessageDialog("Activity launcher",
"No available activity for the current selection.",
::fwGui::dialog::MessageDialog::WARNING);
}
}
//------------------------------------------------------------------------------
......
......@@ -75,8 +75,7 @@ void SPreferences::load()
if (!data)
{
FW_DEPRECATED_MSG("The 'preferences' object is not set correctly, you must define the object as: "
"<inout key=\"preferences\" uid=\"...\".");
FW_DEPRECATED_KEY(::fwPreferences::s_PREFERENCES_KEY, "inout", "18.0");
data = this->getObject< ::fwData::Object >();
}
......@@ -109,8 +108,7 @@ void SPreferences::save()
if (!obj)
{
FW_DEPRECATED_MSG("The 'preferences' object is not set correctly, you must define the object as: "
"<inout key=\"preferences\" uid=\"...\".");
FW_DEPRECATED_KEY(::fwPreferences::s_PREFERENCES_KEY, "inout", "18.0");
obj = this->getObject< ::fwData::Object >();
}
......
......@@ -36,7 +36,7 @@ void LockDumpSrv::starting()
::fwData::Object::sptr object = this->getInOut< ::fwData::Object >(s_TARGET_INOUT);
if (!object)
{
FW_DEPRECATED_MSG("'LockDumpSrv' must have an <inout> 'target'");
FW_DEPRECATED_KEY(s_TARGET_INOUT, "inout", "18.0");
object = this->getObject();
}
m_objLock = ::fwData::ObjectLock( object );
......
......@@ -18,7 +18,7 @@ namespace ctrlSelection
IManagerSrv::IManagerSrv()
{
FW_DEPRECATED_MSG("The IManagerSrv type of service is deprecated and will be removed.");
FW_DEPRECATED_MSG("The IManagerSrv type of service is deprecated.", "18.0.");
}
//-----------------------------------------------------------------------------
......
......@@ -58,7 +58,7 @@ void ImageUpdateAxis::updateSliceType(int from, int to)
void ImageUpdateAxis::starting()
{
FW_DEPRECATED_MSG("This service is deprecated and will be removed");
FW_DEPRECATED_MSG("This service is deprecated.", "18.0");
this->updating();
}
......
......@@ -56,7 +56,7 @@ void SAddField::configuring()
void SAddField::starting()
{
FW_DEPRECATED("::ctrlSelection::SAddField", "::crrlSelection::SManage");
FW_DEPRECATED("::ctrlSelection::SAddField", "::crrlSelection::SManage", "18.0");
}
// ----------------------------------------------------------------------------
......
......@@ -87,7 +87,7 @@ void SObjFromSlot::add(::fwData::Object::sptr obj)
void SObjFromSlot::addOrSwap(::fwData::Object::sptr obj)
{
FW_DEPRECATED("addOrSwap", "add");
FW_DEPRECATED("addOrSwap", "add", "18.0");
this->setOutput(s_OBJECT, obj);
}
......@@ -95,7 +95,7 @@ void SObjFromSlot::addOrSwap(::fwData::Object::sptr obj)
void SObjFromSlot::swap(::fwData::Object::sptr obj)
{
FW_DEPRECATED("addOrSwap", "add");
FW_DEPRECATED("addOrSwap", "add", "18.0");
this->setOutput(s_OBJECT, obj);
}
......@@ -110,7 +110,7 @@ void SObjFromSlot::remove()
void SObjFromSlot::removeIfPresent()
{
FW_DEPRECATED("removeIfPresent", "remove");
FW_DEPRECATED("removeIfPresent", "remove", "18.0");
this->setOutput(s_OBJECT, nullptr);
}
......
......@@ -8,6 +8,7 @@ set( DEPENDENCIES
fwAtomsBoostIO
fwAtomsPatch
fwAtomsFilter
fwMDSemanticPatch
fwTools
fwCore
fwData
......
......@@ -29,45 +29,49 @@ namespace ioAtoms
* @brief Atoms reader. Service to load data from Atoms format
*
* @section Signals Signals
* - \b jobCreated(SPTR(::fwJobs::IJob)): emitted when the image is loading to display a progress bar.
* - \b jobCreated(SPTR(::fwJobs::IJob)): emitted to display a progress bar while the image is loading (it should be
* connected to a SJobBar).
*
* @section XML XML Configuration
*
* @code{.xml}
<service type="::ioAtoms::SReader">
<inout key="data" uid="..." />
<config>
<uuidPolicy>Strict|Change|Reuse</uuidPolicy>
<patcher context="..." version="..." />
<filter>...</filter>
<archive backend="json">
<extension>.j</extension>
</archive>
<archive backend="jsonz">
<extension>.vpz</extension>
</archive>
<extensions>
<extension label="XML">.xml</extension>
<extension label="Zipped XML>.xmlz</extension>
<extension>.f4s</extension>
<extension>.j</extension>
<extension label="Medical workspace">.mw</extension>
<extension>.vpz</extension>
</extensions>
</config>
<out key="data" uid="..." />
<uuidPolicy>Strict|Change</uuidPolicy>
<patcher context="..." version="..." />
<filter>...</filter>
<archive backend="json">
<extension>.j</extension>
</archive>
<archive backend="jsonz">
<extension>.vpz</extension>
</archive>
<extensions>
<extension label="XML">.xml</extension>
<extension label="Zipped XML>.xmlz</extension>
<extension>.f4s</extension>
<extension>.j</extension>
<extension label="Medical workspace">.mw</extension>
<extension>.vpz</extension>
</extensions>
</service>
@endcode
* @subsection In-Out In-Out
* - \b data [::fwData::Object]: object to read. If an 'out' data is set it will be ignored.
* @subsection Output Output
* - \b data [::fwData::Object]: object to read.
* @subsection Configuration Configuration
* - \b uuidPolicy(optional, default ChangePolicy): defines the policy for atoms conversion. 'ChangePolicy' changes the
* object uuid only if it already exists in the application. 'StrictPolicy' keeps the object uuid and throws an
* exception if the loaded uuid already exists. 'ReusePolicy' uses the existing object in the application with the
* uuid.
* - \b patcher defines the atom patcher to use to convert the atoms (see ::fwAtomsPatch::PatchingManager)
* uuid ( only if the reader should be in output mode).
* - \b patcher(optional): defines the atom patcher to use to convert the atoms (see ::fwAtomsPatch::PatchingManager)
* - \b context (optional, default=MedicalData): context of the atom patcher
* - \b version (optional, default=version of MedicalData): version of the atom patcher, by default it uses the
* current version of the MedicalData context.
* - \b filter(optional): filter applied on the read atom before the conversion to the object. (see
* ::fwAtomsFilter::IFilter)
* - \b archive(optional): defines custom file extensions. The file to be read with an extension given in 'archive' tag
......@@ -133,8 +137,8 @@ private:
/// Notify modification on associated object if reading succeeded
void notificationOfUpdate();
/// fwAtomsConversion uuid policy
std::string m_inject;
/// true if the data is set as 'out'
bool m_outputMode;
/// fwAtomsConversion uuid policy
std::string m_uuidPolicy;
......
......@@ -27,7 +27,8 @@ namespace ioAtoms
* @brief Atoms writer. Service to write an fwData medical data converted in fwAtoms.
*
* @section Signals Signals
* - \b jobCreated(SPTR(::fwJobs::IJob)): emitted when the image is loading to display a progress bar.
* - \b jobCreated(SPTR(::fwJobs::IJob)): emitted to display a progress bar while the image is written (it should be
* connected to a SJobBar).
*
* @section XML XML Configuration
*
......@@ -61,6 +62,9 @@ namespace ioAtoms
* - \b data [::fwData::Object]: object to write.
* @subsection Configuration Configuration
* - \b patcher defines the atom patcher to use to convert the atoms (see ::fwAtomsPatch::PatchingManager)
* - \b context (optional, default=MedicalData): context of the atom patcher
* - \b version (optional, default=version of MedicalData): version of the atom patcher, by default it uses the
* current version of the MedicalData context.
* - \b archive(optional): defines custom file extensions. The file to be read with an extension given in 'archive' tag
* will be processed with the given backend in archive tag (the 'backend' attribute is mandatory). Extensions must
* begin with '.'. Available 'backend' values are json, xml, jsonz and xmlz.
......
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