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

merge(dev): 11.0.4

parents d59ee751 cca0e49f
# use glob syntax.
syntax: glob
# vim swap file
*.swp
# eclipse stuff
*.cproject
*.project
*.pyc
*.pyo
# qt creator
*.user
# reject and backup file
*.rej
*.orig
8b2fab86afa36b6be67b95c40d9580e7efb9842a fw4spl_0.4
f3dad8e5c26f18c1ed450b73e829a6e4b86f4b27 fw4spl_0.5.0
f3dad8e5c26f18c1ed450b73e829a6e4b86f4b27 fw4spl_0.5.0
0000000000000000000000000000000000000000 fw4spl_0.5.0
0000000000000000000000000000000000000000 fw4spl_0.5.0
a2c98d22c36d6997b1b191a1610af97b41a4677a fw4spl_0.5.0
f293a4a4fc6c976beeca6afd4f6280baab2f2e29 experimental_0.1.0
7ecb860582b3d6a7f7b72d6464b27f88827f1f16 fw4spl_0.5.1
cab8f119d12758e8e2463e6644e88b73203ce76a fw4spl_0.5.2
cab8f119d12758e8e2463e6644e88b73203ce76a fw4spl_0.5.2
0000000000000000000000000000000000000000 fw4spl_0.5.2
0000000000000000000000000000000000000000 fw4spl_0.5.2
5fb2251fcd8fc54b893d8712fcffba948cd828c7 fw4spl_0.5.2
c9e6b411509616545ccbc77a89c984bcc0be9d3e fw4spl_0.6.0.1
609b8ee1efb1ec9cd81c908618638ce0e3ea4d8d fw4spl_0.6.0.2
ebaabb5ee69cf9102e02fd5b9e8360f4dc5431b0 fw4spl_0.6.0.3
e77bb50c682d1d16b561664c59f708273fa0ac1a fw4spl_0.6.1.0
ccf798d2db242d3cdce789eca8d01a983c15e5bf fw4spl_0.6.0.4
e5a1535ef50b9a3612d4f9bd99f97075044c9aed fw4spl_0.6.2.0
6a82531491adb0497b5c1e7ee79830acb1cbed7a experimentalFwServices_0.1.0
f1f79477e215f19b36a2f541a5fe10f686bf5819 fw4spl_0.6.3.0
6a24af6f58cf43f2e841c1c573010ae589815c17 fw4spl_0.6.2.1
def4b0536a1d5185802fcc41bdd50cdb4d2aedea multiGui_0
2e75de46941fe3a174c9c989012f908a0cede8df fw4spl_0.7.0.1
ad546fca30f7b909ece47370b09f985d96a47d93 fw4spl_0.7.0.2
6e58fe91fc96b22046cd540a6dd943899e240876 fw4spl_0.7.0.3
e8368078bbe002be374084bcefa5c77fe90e53d4 fw4spl_0.7.0.4
3442b53e2597c61f7d9bc6db83a2e72d2124f217 fw4spl_0.6.2.2
2a3461ccce6894b20cc0f97779351ad9d015036b fw4spl_0.6.3.1
1382cac10cadf93c0ce076947b86a38ec64281ca multiGui_1
008d8f10cfffb38dc45a5e98d2a06c62169fa6e8 fw4spl_0.7.0.5
0000000000000000000000000000000000000000 fw4spl_0.7.2
ee7c147c1129220550c242ab3025d94f83126e22 fw4spl_0.7.2
ee7c147c1129220550c242ab3025d94f83126e22 fw4spl_0.7.2
0000000000000000000000000000000000000000 fw4spl_0.7.2
ee7c147c1129220550c242ab3025d94f83126e22 fw4spl_0.7.1.0
bf0d810ec11a8029092f0eb2fd2bd82683fc8c76 fw4spl_0.7.0.6
4db7221bdcc70102cf47a76339b4722bc8ae8fed fw4spl_0.7.1.1
6ab46e87343a2e8b0cabe503555849eadfc8f1d9 workshop-tw-2010.0
16a7298093989a9098532eacff8c1b9137a3bebf fw4spl_0.7.1.2
bd63b3f2a358532f3125ecd81e251c43577ef2fc fw4spl_0.7.2.0
2a406b961c1d19f72576c28cb3387f015691826c fw4spl_0.7.3.0
2652be53eebb509e7038f189e888f49429871033 fw4spl_0.7.3.1
092e63003b56f33553ff9e1f179e3fcde68dead7 fw4spl_0.7.2.1
c395bf56eb88c86d3bc907ed8d3c156c68082be0 fw4spl_0.7.3.2
1c2286f1f945334bd8dfeb1e6dcb11ee2643cc28 fw4spl_0.7.3.3
764af7bd3feae6c56044a8f3e363fbd86487c86a fw4spl_0.7.4.0
e5e23c1f1eed3e6bb8f5db4611537715ecad603f fw4spl_0.7.4.1
ba4dc4b00464e871bc759ec6f9fd4ca6d00189d7 fw4spl_0.7.2.2
8d54571bdebfb585c03980a05a3cc6bad3ff240e fw4spl_0.7.3.4
000bcce040f45262bb02af97b7e026af0c024c95 fw4spl_0.7.4.2
a671d3636b2ecccfdd698eac65b0ed5c70bce131 fw4spl_0.7.5.0
2e68938b619d1955ae1a1bc03a8e50eb2d735998 fw4spl_0.7.6.0
35b4bbfc7842e9d270238fb2623a5f07a5370545 fw4spl_0.7.5.1
35880468ccaedb2ebc2d48f50b5bccd0177a9697 fw4spl_0.7.6.1
4622bc6b6eae64876406af4b3778394c6c2b5708 fw4spl_0.7.4.3
640135ac2d04cf7424a61c21dea082cfa2ebaf7a fw4spl_0.7.6.2
507b0dcd6d29e3d71f73035c6c5c47c34aa77c14 fw4spl_0.7.6.3
fbd10e84e11fc322b0b723231f071da01bd76c66 fw4spl_0.7.7.0
ff9578023e08c339d572acc3c1f4ec93705fdd03 fw4spl_0.7.7.1
149e15137145f73be4834afca24f28e9a00164db fw4spl_0.7.7.2
66c56c74973493d8ec436396cb096d123dde5620 fw4spl_0.7.8.0
226ce8a2bd53b8dfd2cf99f0a3c16fdb13a100c5 fw4spl_0.7.8.1
3d7f87f1a902299bafdc5ee6368378b318fe6ff6 fw4spl_0.7.9.0
7580521d31d1dfdcc24d381051dd8102e17f500b fw4spl_0.8.0.0
9fb39a40f2af066df4caf9ab70fb7ea68d37e336 fw4spl_0.7.9.1
8f8aa49d1ed6f2f087b36a5d93f3f34c8cb5db30 fw4spl_0.7.7.3
252086a2aa3b6db977144149859d6429cb0c7173 fw4spl_0.7.9.2
252086a2aa3b6db977144149859d6429cb0c7173 fw4spl_0.7.9.2
0000000000000000000000000000000000000000 fw4spl_0.7.9.2
0000000000000000000000000000000000000000 fw4spl_0.7.9.2
0afad68f7cd18077fcdb918eeb9dc60058ec9919 fw4spl_0.7.9.2
e3d9b6ebc65a64dac70913bcf04db2ff0b4abb98 fw4spl_0.7.9.3
e3d9b6ebc65a64dac70913bcf04db2ff0b4abb98 fw4spl_0.7.9.3
1eceb79a30a48e1e2b1c407396a21529e8c9f67e fw4spl_0.7.9.3
7240b1b6caeef6495e0aef0804b2be90564df949 fw4spl_0.7.9.4
b819a6c88f10179257c4925a52aed2beec4eea67 fw4spl_0.8.1.0
464981214c828dca362904e441fb89bf0bf3d7c4 fw4spl_0.8.1.1
b5624619302209b9b537aed32a00ea960f764785 fw4spl_0.8.2.0
024e68b31b72a99954fce6aca69bf8e0e8cf66cd fw4spl_0.7.9.5
c98ad90e5a50adb86715bed8492d8ad79487ca17 fw4spl_0.8.1.2
adff1ce9402e557a42d62d14d11b9b74c20d2c63 fw4spl_0.8.2.1
e4ce8e4de1a22c18065f695cf2497a686b35e29a fw4spl_0.8.3.0
9683c5f861cd3cec20b0e2b36c37a8ee88ac2825 fw4spl_0.7.9.6
88be7514f2a36babe5a09462439a222030c1a690 fw4spl_0.8.2.2
3b1e8e0811584b4d7b8190c54b3b14431582c134 fw4spl_0.8.3.1
d5c427efd66d0f6675e298c86715e3fe9248cc0a fw4spl_0.8.2.3
9683c5f861cd3cec20b0e2b36c37a8ee88ac2825 fw4spl_0.7.9.6
488f8d22d7ba07fcd3c01b96bdbcb83cad130aec fw4spl_0.7.9.6
d5c427efd66d0f6675e298c86715e3fe9248cc0a fw4spl_0.8.2.3
cb23e8679d949f9c2ccd7982bfc954ba831ad219 fw4spl_0.8.2.3
d465b66e24b7cb16b7cb5768923d9fac86fe8791 fw4spl_0.8.3.2
efeff33fc51015bd0c4d67297b1fed95e84ffaa5 fw4spl_0.8.3.3
51dbe3c236ba4872f3e5bf96d0be8347c923de32 fw4spl_0.8.3.4
d9af0ca9f36318f171eb14a37fdafbda004f6f38 fw4spl_0.8.3.5
4ad2f51919edefdd1c29ea7f1ac6ffb86d6d9212 fw4spl_0.8.3.6
763792dc39524bc3e3176c8e5f9274f32ec15aed fw4spl_0.9.0.0
f77e935bf8671ff0b640f5bb54b4f17b0feb735f fw4spl_0.9.0.1
ea74370f192cc30174825919b9fb56622aa196e6 fw4spl_0.9.0.2
aeda84c6e8dee47d2b565b00555556258db09df2 fw4spl_0.9.0.3
8d7bb282b6aff640d86a655eabc8eb146de9388a fw4spl_0.9.1.0
80cd238bf0b128e89cce1d54edbaf0eb16e54481 fw4spl_0.9.1.1
800d983e47e99282769fd4aaab07cc8f01b265a8 fw4spl_0.9.1.2
31603bebba81901fb97a03cdfcd0ddc59b23e9e2 fw4spl_0.9.1.3
703c9bb53338123eee50bab5b04338789d9c2170 fw4spl_0.9.1.4
f825bebbb87aee1359828367c3cd1ad62d146c1f fw4spl_0.9.2.0
8bb2e274c775054c05da99ef0c7ef7b16d21dcc9 fw4spl_0.9.2.1
5e86a1491c1c2f060c9a33a1bdd850515c3eecaf fw4spl_0.9.2.2
d9b8287c5b8887b0d4eef905120257e598b0bbe1 fw4spl_0.9.2.3
96b2b2f909378758a79e31b9a4a189bd93f7d5be fw4spl_0.10.0.1
e16301bb61e283c798dadeb38983585d24a41c6e fw4spl_0.10.0.2
e65964a071d30f1a7d2c23eb25f0a81ee5c66b6f fw4spl_0.10.0.3
a5f08d0fc019f918e5f162298e1ea592d07d0df6 fw4spl_0.10.0.4
3114d8dddb46e3022cdeb11decc09daeceb81921 fw4spl_0.10.0.5
feb9c2cde4e221c3ae74d83411342eaef200ffc1 fw4spl_0.10.0.6
e6bc1fc3cfd6579a5c971b17036057c9e8882693 fw4spl_0.9.2.4
ef171b6be026e27ad7d67abe0f696856bd878c18 fw4spl_0.10.1.0
8faf89940da49d79a8024c92bb3abec0aabaf9a2 fw4spl_0.10.0.7
5c5622207db3057750d17add25031ae02da27bd4 fw4spl_0.10.1.1
16a8a7298b6ea7bc3f4a28f960df6671ea3fb92e fw4spl_0.10.2.1
51b154b40b05dae489c3a3a0ed6bd09f5cf5afb3 fw4spl_0.10.2.2
dcee64c4097d1a0eaea7df6214b2d725d900b0bb fw4spl_0.10.2.3
1d6ff2abce566ef77e03de930b2dd00642cc0717 fw4spl_0.11.0.1
e60f88d2bfe15ad1d162b906e522130a9dc0e00d fw4spl_0.11.0.2
......@@ -12,7 +12,7 @@ addons:
- gnuplot
branches:
only:
- fw4spl_0.11.0
- dev
compiler:
- gcc
before_script:
......@@ -34,7 +34,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
- $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
- cd $TRAVIS_BUILD_DIR
script:
- fw4spl-git/hooks/sheldon $TRAVIS_COMMIT_RANGE
......
......@@ -3,6 +3,7 @@ set( VERSION 0.1 )
set( TYPE BUNDLE )
set( DEPENDENCIES )
set( REQUIREMENTS
activities
io
uiIO
media
......
......@@ -4,6 +4,7 @@
<requirement id="uiIO" />
<requirement id="media" />
<requirement id="filterVRRender" />
<requirement id="activities" />
<!-- Activity used to export an image series. -->
<extension implements="::fwActivities::registry::Activities">
......@@ -136,7 +137,7 @@
<config id="MDAtomsConfig" service="::ioAtoms::SReader" />
</config>
</extension>
<!-- Service config used to write a seriesDB using ioAtoms. -->
<extension implements="::fwServices::registry::ServiceConfig">
<id>SDBAtomsWriterIOSelectorConfig</id>
......@@ -149,7 +150,7 @@
<config id="MDAtomsConfig" service="::ioAtoms::SWriter" />
</config>
</extension>
<!-- Service config used to read SeriesDB with all the available reader for SeriesDB. -->
<extension implements="::fwServices::registry::ServiceConfig">
<id>FullSDBReaderIOSelectorConfig</id>
......@@ -185,7 +186,7 @@
<patcher context="MedicalData" version="V09ALA" />
</config>
</extension>
<extension implements="::fwServices::registry::ServiceConfig">
<id>ActivityReaderConfig</id>
<service>::uiIO::editor::SIOSelector</service>
......@@ -209,5 +210,5 @@
<config id="ActivityMDAtomsConfig" service="::ioAtoms::SWriter" />
</config>
</extension>
</plugin>
fwLoadProperties()
target_compile_definitions(${FWPROJECT_NAME} PRIVATE "-DCAMP_COMPILATION")
......@@ -12,4 +12,4 @@ set( DEPENDENCIES
)
set( REQUIREMENTS )
set( USE_PCH_FROM_TARGET fwAtomConversion )
/* ***** BEGIN LICENSE BLOCK *****
* FW4SPL - Copyright (C) IRCAD, 2009-2016.
* FW4SPL - Copyright (C) IRCAD, 2009-2017.
* Distributed under the terms of the GNU Lesser General Public License (LGPL) as
* published by the Free Software Foundation.
* ****** END LICENSE BLOCK ****** */
......@@ -11,11 +11,9 @@
#include <fwCom/Signals.hpp>
#include <fwData/mt/ObjectWriteLock.hpp>
#include <fwData/Object.hpp>
#include <fwDataCamp/getObject.hpp>
#include <fwDataCamp/exception/ObjectNotFound.hpp>
#include <fwDataCamp/getObject.hpp>
namespace ctrlCamp
{
......@@ -156,7 +154,7 @@ void SCopy::copy()
}
else
{
if (m_target.substr(0,1) == "@")
if (m_target.substr(0, 1) == "@")
{
target = ::fwDataCamp::getObject(this->getObject(), m_target);
SLM_ASSERT("Invalid seshat path : '" + m_target + "'", target);
......@@ -169,7 +167,7 @@ void SCopy::copy()
SLM_ASSERT("Object '" + m_target + "' is not a fwData::Object (" + obj->getClassname() + ")", target);
}
}
if (m_source.substr(0,1) == "@")
if (m_source.substr(0, 1) == "@")
{
source = ::fwDataCamp::getObject(this->getObject(), m_source);
SLM_ERROR_IF("Invalid seshat path '" + m_source + "' or object does not exist", !source);
......@@ -242,5 +240,4 @@ void SCopy::copy()
//-----------------------------------------------------------------------------
} // namespace ctrlCamp
......@@ -2,6 +2,17 @@
set( NAME ctrlSelection )
set( VERSION 0.1 )
set( TYPE BUNDLE )
set( DEPENDENCIES fwCom fwCore fwData fwDataTools fwRuntime fwServices fwTools fwThread )
set( DEPENDENCIES
fwCom
fwCore
fwThread
fwTools
fwData
fwDataTools
fwMedData
fwMedDataTools
fwRuntime
fwServices
)
set( REQUIREMENTS )
/* ***** BEGIN LICENSE BLOCK *****
* FW4SPL - Copyright (C) IRCAD, 2009-2016.
* FW4SPL - Copyright (C) IRCAD, 2009-2017.
* Distributed under the terms of the GNU Lesser General Public License (LGPL) as
* published by the Free Software Foundation.
* ****** END LICENSE BLOCK ****** */
#ifndef __CTRLSELECTION_UPDATER_SOBJFROMUID_HPP__
#define __CTRLSELECTION_UPDATER_SOBJFROMUID_HPP__
#ifndef __CTRLSELECTION_SMANAGE_HPP__
#define __CTRLSELECTION_SMANAGE_HPP__
#include "ctrlSelection/config.hpp"
#include "ctrlSelection/IUpdaterSrv.hpp"
#include <fwData/Object.hpp>
namespace ctrlSelection
{
#include <fwServices/IController.hpp>
namespace updater
namespace ctrlSelection
{
/**
* @class SObjFromUid
* @brief Updates the composite from object given by uid. The objects is added/swapped/removed from composite when the
* respective slot is called.
* @brief This service manages an object (add/swap/remove) into a container object (composite, vector, seriesDB).
*
* It works on different objects:
* - ::fwData::Composite: the object is added/swapped/removed from composite at the given key when the respective slot
* is called.
* - ::fwData::Vector: the object is added or removed from the container
* - ::fwMedData::SeriesDB: the object is added or removed from the container
*
* @section Slots Slots
* - \b add() : Adds the object into the target (vector, seriesDB, composite), if target is a Composite, it is add at
* the key given by config.
* - \b addOrSwap() : Adds the object if it is not present in the target, else if target is a compsite, the object is
* swapped.
* - \b swapObj() : Only if target is a Composite : swaps the object into the composite with the key given by config.
* - \b remove() : Removes the object.
* - \b removeIfPresent() : Removes the object if it is present.
*
* @section XML XML Configuration
*
* For ::fwData::Composite:
* @code{.xml}
<service type="::ctrlSelection::SManage">
<inout key="object" uid="..." />
<inout key="composite" uid="..." />
<compositeKey>...</compositeKey>
</service>
@endcode
*
* For ::fwData::Vector:
* @code{.xml}
<service type="::ctrlSelection::SManage">
<inout key="object" uid="..." />
<inout key="vector" uid="..." />
</service>
@endcode
*
* For ::fwDMedata::SeriesDB:
* @code{.xml}
<service type="::ctrlSelection::SManage">
<inout key="object" uid="..." />
<inout key="seriesDB" uid="..." />
</service>
@endcode
*
* @subsection In-Out In-Out
* - \b object [::fwData::Object]: object to add/swap/remove.
* - \b composite [::fwData::Composite] (optional): Composite where to add/swap/remove object.
* - \b vector [::fwData::Vector] (optional): Vector where to add/remove object.
* - \b seriesDB [::fwMedData::SeriesDB] (optional): SeriesDB where to add/remove object.
*
* <b>Only one of the target (composite, vector or seriesDB) is allowed.</b>
* For SeriesDB, the object must inherit of Series
* @subsection Configuration Configuration
* - \b compositeKey (optional, only if target object in a Composite) : key of the object in the composite
*/
class CTRLSELECTION_CLASS_API SObjFromUid : public ::ctrlSelection::IUpdaterSrv
class CTRLSELECTION_CLASS_API SManage : public ::fwServices::IController
{
public:
fwCoreServiceClassDefinitionsMacro ( (SObjFromUid)(::ctrlSelection::IUpdaterSrv) );
fwCoreServiceClassDefinitionsMacro( (SManage)(::fwServices::IController) );
/// Constructor. Do nothing.
CTRLSELECTION_API SObjFromUid() throw();
CTRLSELECTION_API SManage() throw();
/// Destructor. Do nothing.
CTRLSELECTION_API virtual ~SObjFromUid() throw();
CTRLSELECTION_API virtual ~SManage() throw();
/**
* @name Slots
......@@ -52,17 +100,7 @@ public:
protected:
/**
* @brief Configures the service.
*
* @code{.xml}
<service impl="::ctrlSelection::updater::SObjFromUid">
<uid>objecUid</uid>
<compositeKey>key</compositeKey>
</service>
@endcode
* - \b compositeKey key of the object to manage into the composite (add/swap/remove)
*/
/// Configures the service.
CTRLSELECTION_API virtual void configuring() throw ( ::fwTools::Failed );
/// Implements starting method derived from IService. Do nothing.
......@@ -74,9 +112,6 @@ protected:
/// Implements updating method derived from IService. Do nothing.
CTRLSELECTION_API virtual void updating() throw ( ::fwTools::Failed );
/// Implements info method derived from IService. Print classname.
CTRLSELECTION_API virtual void info( std::ostream &_sstream );
/**
* @name Slots
* @{
......@@ -94,10 +129,10 @@ protected:
/// Swaps the object into the composite with the key given by config.
void swap();
/// Adds the object from the composite with the key given by config.
/// Removes the object from the composite at the key given by config.
void remove();
/// Adds the object into the composite with the key given by config if it is present.
/// Removes the object from the composite at the key given by config if it is present.
void removeIfPresent();
/**
* @}
......@@ -110,7 +145,6 @@ private:
};
} // updater
} // ctrlSelection
#endif // __CTRLSELECTION_UPDATER_SOBJFROMUID_HPP__
#endif // __CTRLSELECTION_SMANAGE_HPP__
/* ***** BEGIN LICENSE BLOCK *****
* FW4SPL - Copyright (C) IRCAD, 2009-2016.
* FW4SPL - Copyright (C) IRCAD, 2009-2017.
* Distributed under the terms of the GNU Lesser General Public License (LGPL) as
* published by the Free Software Foundation.
* ****** END LICENSE BLOCK ****** */
......@@ -10,8 +10,6 @@
#include "ctrlSelection/IManagerSrv.hpp"
#include "ctrlSelection/config.hpp"
#include <fwData/Object.hpp>
#include <fwRuntime/ConfigurationElement.hpp>
#include <fwServices/IService.hpp>
......@@ -30,7 +28,7 @@ class CTRLSELECTION_CLASS_API SField : public ::ctrlSelection::IManagerSrv
public:
fwCoreServiceClassDefinitionsMacro ( (SField)(::ctrlSelection::IManagerSrv) );
fwCoreServiceClassDefinitionsMacro( (SField)(::ctrlSelection::IManagerSrv) );
/// Constructor. Do nothing.
CTRLSELECTION_API SField() throw();
......@@ -50,8 +48,10 @@ public:
protected:
/// Implements starting method derived from IService. Starts the managed services if their fields are in the composite.
/// If the mode is "dummy", starts the the managed services on dummy fields if their fields are not in the composite.
/// Implements starting method derived from IService. Starts the managed services if their fields are in the
// composite.
/// If the mode is "dummy", starts the the managed services on dummy fields if their fields are not in the
// composite.
CTRLSELECTION_API virtual void starting() throw ( ::fwTools::Failed );
/// Implements stopping method derived from IService. Stops and erases all the managed services.
......@@ -63,7 +63,8 @@ protected:
* Sample of declaration configuration for a simple swapper service
*
* @code{.xml}
<service uid="FieldManager" impl="::ctrlSelection::manager::SField" type="::ctrlSelection::IManagerSrv" autoConnect="yes" >
<service uid="FieldManager" impl="::ctrlSelection::manager::SField" type="::ctrlSelection::IManagerSrv"
* autoConnect="yes" >
<mode type="dummy" />
<config>
<field id="TFSelection" type="::fwData::TransferFunction" >
......@@ -86,7 +87,8 @@ protected:
</service>
@endcode
* With:
* @li mode : must be "stop" or "dummy". The dummy mode doesn't stop the services when its attached field is deleted but swap it on a dummy field.
* @li mode : must be "stop" or "dummy". The dummy mode doesn't stop the services when its attached field is deleted
* but swap it on a dummy field.
* @li the fields, services, connect and proxy tags are defined as same as the configuration of fields and services.
* @li autoConnect: optional (default value = false), if true allows to listen signals from the associated object.
* @li worker: optional, allows to manage the service in another thread.
......@@ -109,7 +111,8 @@ protected:
{
public:
SubService() : m_hasAutoConnection(false)
SubService() :
m_hasAutoConnection(false)
{
}
......@@ -117,7 +120,7 @@ protected:
{
}
SPTR (::fwServices::IService) getService()
SPTR(::fwServices::IService) getService()
{
return m_service.lock();
}
......@@ -132,7 +135,6 @@ protected:
typedef std::vector< SPTR(SubService) > SubServicesVecType;
typedef std::map< FieldNameType, SubServicesVecType > SubServicesMapType;
void initOnDummyObject( const FieldNameType& fieldName );
void addField( const FieldNameType& fieldName, ::fwData::Object::sptr field );
void swapField(const FieldNameType& fieldName, ::fwData::Object::sptr field);
......@@ -150,8 +152,6 @@ protected:
private:
std::string m_mode;
bool m_dummyStopMode;
ConfigurationType m_managerConfiguration;
......
/* ***** BEGIN LICENSE BLOCK *****
* FW4SPL - Copyright (C) IRCAD, 2009-2016.
* FW4SPL - Copyright (C) IRCAD, 2009-2017.
* Distributed under the terms of the GNU Lesser General Public License (LGPL) as
* published by the Free Software Foundation.
* ****** END LICENSE BLOCK ****** */
......@@ -7,10 +7,8 @@
#ifndef __CTRLSELECTION_UPDATER_SOBJFROMSLOT_HPP__
#define __CTRLSELECTION_UPDATER_SOBJFROMSLOT_HPP__
#include "ctrlSelection/config.hpp"
#include "ctrlSelection/IUpdaterSrv.hpp"
#include <fwData/Object.hpp>
#include "ctrlSelection/config.hpp"
namespace ctrlSelection
{
......@@ -42,7 +40,7 @@ class CTRLSELECTION_CLASS_API SObjFromSlot : public ::ctrlSelection::IUpdaterSrv
public:
fwCoreServiceClassDefinitionsMacro ( (SObjFromSlot)(::ctrlSelection::IUpdaterSrv) );
fwCoreServiceClassDefinitionsMacro( (SObjFromSlot)(::ctrlSelection::IUpdaterSrv) );
/// Constructor. Do nothing.
CTRLSELECTION_API SObjFromSlot() throw();
......
/* ***** BEGIN LICENSE BLOCK *****
* FW4SPL - Copyright (C) IRCAD, 2009-2016.
* FW4SPL - Copyright (C) IRCAD, 2009-2017.
* Distributed under the terms of the GNU Lesser General Public License (LGPL) as
* published by the Free Software Foundation.
* ****** END LICENSE BLOCK ****** */
......@@ -10,13 +10,11 @@
#include "ctrlSelection/IWrapperSrv.hpp"
#include "ctrlSelection/config.hpp"
#include <fwData/Object.hpp>
#include <fwData/Point.hpp>
#include <fwData/PointList.hpp>
#include <fwServices/IService.hpp>
namespace ctrlSelection
{
......@@ -49,7 +47,7 @@ class CTRLSELECTION_CLASS_API SImageSignalForwarder : public ::ctrlSelection::IW
public:
fwCoreServiceClassDefinitionsMacro ( (SImageSignalForwarder)(::ctrlSelection::IWrapperSrv) );
fwCoreServiceClassDefinitionsMacro( (SImageSignalForwarder)(::ctrlSelection::IWrapperSrv) );
CTRLSELECTION_API SImageSignalForwarder() throw();
......@@ -112,7 +110,6 @@ private:
std::string m_sourceCompoUid; ///< fwID of the composite containing the source image
std::string m_sourceImageKey; ///< Key of the source image
typedef std::vector<std::string> SignalKeysType;
SignalKeysType m_managedSignals; ///< contains the key of the signals to manage
......
......@@ -72,8 +72,8 @@
</extension>
<extension implements="::fwServices::registry::ServiceFactory">
<type>::ctrlSelection::IUpdaterSrv</type>
<service>::ctrlSelection::updater::SObjFromUid</service>
<type>::fwServices::IController</type>
<service>::ctrlSelection::SManage</service>
<object>::fwData::Composite</object>
</extension>
......
/* ***** BEGIN LICENSE BLOCK *****
* FW4SPL - Copyright (C) IRCAD, 2015-2017.
* Distributed under the terms of the GNU Lesser General Public License (LGPL) as
* published by the Free Software Foundation.
* ****** END LICENSE BLOCK ****** */
#include "ctrlSelection/SManage.hpp"
#include <fwCom/Slot.hpp>
#include <fwCom/Slot.hxx>
#include <fwCom/Slots.hpp>
#include <fwCom/Slots.hxx>
#include <fwData/Composite.hpp>
#include <fwData/Vector.hpp>
#include <fwDataTools/helper/Composite.hpp>