Commit 38f945d3 authored by Emilie Harquel's avatar Emilie Harquel
Browse files

- renamed VtkRenderService to SRender

- added doConfigure() methods in adaptors
- added "autoConnect" option for adaptors (default "yes")

--HG--
branch : fw4spl_0.10.2
parent 39e84400
......@@ -117,7 +117,7 @@
Generic scene:
This scene display a 3D image and a textured mesh.
-->
<service uid="genericScene" impl="::fwRenderVTK::VtkRenderService" autoConnect="yes">
<service uid="genericScene" impl="::fwRenderVTK::SRender" autoConnect="yes">
<scene>
<!-- Image picker -->
<picker id="myPicker" vtkclass="fwVtkCellPicker" />
......
......@@ -157,7 +157,7 @@
</config>
</service>
<service uid="genericScene" impl="::fwRenderVTK::VtkRenderService" autoConnect="yes">
<service uid="genericScene" impl="::fwRenderVTK::SRender" autoConnect="yes">
<scene>
<picker id="myPicker" vtkclass="fwVtkCellPicker" />
<renderer id="default" background="0.0" />
......
......@@ -79,7 +79,7 @@
This scene shows four times the same mesh but with a different matrix. It manages multiples
transformation matrices.
-->
<service uid="genericScene" impl="::fwRenderVTK::VtkRenderService" autoConnect="yes">
<service uid="genericScene" impl="::fwRenderVTK::SRender" autoConnect="yes">
<scene>
<renderer id="default" background="0.0" />
......
......@@ -119,7 +119,7 @@
<service uid="pointView" impl="::uiVisu::PointEditor" autoConnect="yes" />
<service uid="genericScene" impl="::fwRenderVTK::VtkRenderService" autoConnect="yes">
<service uid="genericScene" impl="::fwRenderVTK::SRender" autoConnect="yes">
<scene>
<picker id="myPicker" vtkclass="fwVtkCellPicker" />
......
......@@ -122,7 +122,7 @@
<item key="myCompositeVisu">
<object uid="myCompositeVisu" type="::fwData::Composite">
<service uid="genericScene" impl="::fwRenderVTK::VtkRenderService" type="::fwRender::IRender" autoConnect="yes">
<service uid="genericScene" impl="::fwRenderVTK::SRender" type="::fwRender::IRender" autoConnect="yes">
<scene>
<picker id="myPicker" vtkclass="fwVtkCellPicker" />
......
......@@ -96,7 +96,7 @@
<object uid="compositeVisu" type="::fwData::Composite">
<service uid="genericScene" impl="::fwRenderVTK::VtkRenderService" type="::fwRender::IRender" autoConnect="yes">
<service uid="genericScene" impl="::fwRenderVTK::SRender" type="::fwRender::IRender" autoConnect="yes">
<scene>
<picker id="picker" vtkclass="fwVtkCellPicker" />
......
......@@ -51,7 +51,7 @@
<object uid="${GENERIC_UID}_VisuComposite" type="::fwData::Composite">
<!-- Generic Scene Negato -->
<service uid="${GENERIC_UID}_negato" impl="::fwRenderVTK::VtkRenderService" type="::fwRender::IRender" autoConnect="yes">
<service uid="${GENERIC_UID}_negato" impl="::fwRenderVTK::SRender" type="::fwRender::IRender" autoConnect="yes">
<scene>
<picker id="negatodefault" vtkclass="fwVtkCellPicker" />
......
......@@ -52,7 +52,7 @@
<object uid="${GENERIC_UID}_VisuComposite" type="::fwData::Composite">
<!-- Generic Scene Negato -->
<service uid="${GENERIC_UID}_negato" impl="::fwRenderVTK::VtkRenderService" type="::fwRender::IRender" autoConnect="yes">
<service uid="${GENERIC_UID}_negato" impl="::fwRenderVTK::SRender" type="::fwRender::IRender" autoConnect="yes">
<scene>
<picker id="negatodefault" vtkclass="fwVtkCellPicker" />
......
......@@ -61,7 +61,7 @@
</service>
<!-- Generic Scene Negato -->
<service uid="${GENERIC_UID}_negato" impl="::fwRenderVTK::VtkRenderService" type="::fwRender::IRender" autoConnect="yes">
<service uid="${GENERIC_UID}_negato" impl="::fwRenderVTK::SRender" type="::fwRender::IRender" autoConnect="yes">
<scene>
<picker id="negatodefault" vtkclass="fwVtkCellPicker" />
......
......@@ -142,7 +142,7 @@
</service>
<!-- Generic scene to show merging of backgroung and front images -->
<service uid="${GENERIC_UID}_blendGenericScene" impl="::fwRenderVTK::VtkRenderService" type="::fwRender::IRender" autoConnect="yes">
<service uid="${GENERIC_UID}_blendGenericScene" impl="::fwRenderVTK::SRender" type="::fwRender::IRender" autoConnect="yes">
<scene>
<picker id="myPicker" vtkclass="fwVtkCellPicker" />
<vtkObject id="imageBlend" class="vtkImageBlend" />
......
......@@ -76,7 +76,7 @@
</registry>
</service>
<service uid="${GENERIC_UID}_genericScene" impl="::fwRenderVTK::VtkRenderService" type="::fwRender::IRender" autoConnect="yes">
<service uid="${GENERIC_UID}_genericScene" impl="::fwRenderVTK::SRender" type="::fwRender::IRender" autoConnect="yes">
<scene>
<picker id="negato2default" vtkclass="fwVtkCellPicker" />
<renderer id="default" background="0.0" />
......
......@@ -158,7 +158,7 @@
<service uid="${GENERIC_UID}_ActionSnapshotVR" impl="::uiVisu::action::SSnapshot" type="::fwGui::IActionSrv" autoConnect="no" />
<!-- Generic Scene VR -->
<service uid="${GENERIC_UID}_vr" impl="::fwRenderVTK::VtkRenderService" type="::fwRender::IRender" autoConnect="yes">
<service uid="${GENERIC_UID}_vr" impl="::fwRenderVTK::SRender" type="::fwRender::IRender" autoConnect="yes">
<scene>
<picker id="negato1default" vtkclass="fwVtkCellPicker" />
......
/* ***** BEGIN LICENSE BLOCK *****
* FW4SPL - Copyright (C) IRCAD, 2009-2015.
* FW4SPL - Copyright (C) IRCAD, 2009-2016.
* Distributed under the terms of the GNU Lesser General Public License (LGPL) as
* published by the Free Software Foundation.
* ****** END LICENSE BLOCK ****** */
......@@ -83,7 +83,7 @@ protected:
<placeInScene uid="genericScene" />
</service>
@endverbatim
\b genericScene is the uid of the ::fwRenderVTK::VtkRenderService representing the generic scene which will be printed.
\b genericScene is the uid of the ::fwRenderVTK::SRender representing the generic scene which will be printed.
*/
virtual void configuring() throw(fwTools::Failed);
......
......@@ -80,7 +80,7 @@
</registry>
</service>
<service uid="${GENERIC_UID}_gs" impl="::fwRenderVTK::VtkRenderService" type="::fwRender::IRender" autoConnect="yes">
<service uid="${GENERIC_UID}_gs" impl="::fwRenderVTK::SRender" type="::fwRender::IRender" autoConnect="yes">
<scene>
<picker id="picker" vtkclass="fwVtkCellPicker" />
<renderer id="default" background="0.0" />
......@@ -136,7 +136,7 @@
</parameters>
<config>
<object type="::fwData::Composite">
<service uid="${GENERIC_UID}_gs" impl="::fwRenderVTK::VtkRenderService" type="::fwRender::IRender" autoConnect="yes">
<service uid="${GENERIC_UID}_gs" impl="::fwRenderVTK::SRender" type="::fwRender::IRender" autoConnect="yes">
<registry>
<parent wid="${WID_PARENT}" />
</registry>
......
......@@ -7,7 +7,7 @@
<extension implements="::fwServices::registry::ServiceFactory">
<type>::fwRender::IRender</type>
<service>::fwRenderVTK::VtkRenderService</service>
<service>::fwRenderVTK::SRender</service>
<object>::fwData::Composite</object>
</extension>
......
/* ***** BEGIN LICENSE BLOCK *****
* FW4SPL - Copyright (C) IRCAD, 2009-2015.
* FW4SPL - Copyright (C) IRCAD, 2009-2016.
* Distributed under the terms of the GNU Lesser General Public License (LGPL) as
* published by the Free Software Foundation.
* ****** END LICENSE BLOCK ****** */
......@@ -10,7 +10,7 @@
#include <fwServices/macros.hpp>
#include <fwRender/IRender.hpp>
#include <fwRenderVTK/VtkRenderService.hpp>
#include <fwRenderVTK/SRender.hpp>
#include <fwRenderVTK/vtk/Instantiator.hpp>
#include "visuVTK/Plugin.hpp"
......
......@@ -50,7 +50,7 @@ protected:
VISUVTKADAPTOR_API void doStart() throw(fwTools::Failed);
VISUVTKADAPTOR_API void doStop() throw(fwTools::Failed);
VISUVTKADAPTOR_API void doUpdate() throw(fwTools::Failed);
VISUVTKADAPTOR_API void configuring() throw(fwTools::Failed);
VISUVTKADAPTOR_API void doConfigure() throw(fwTools::Failed);
VISUVTKADAPTOR_API void doSwap() throw(fwTools::Failed);
void buildPipeline();
......
/* ***** BEGIN LICENSE BLOCK *****
* FW4SPL - Copyright (C) IRCAD, 2009-2015.
* FW4SPL - Copyright (C) IRCAD, 2009-2016.
* Distributed under the terms of the GNU Lesser General Public License (LGPL) as
* published by the Free Software Foundation.
* ****** END LICENSE BLOCK ****** */
......@@ -35,7 +35,7 @@ public:
protected:
VISUVTKADAPTOR_API virtual void configuring() throw( ::fwTools::Failed );
VISUVTKADAPTOR_API virtual void doConfigure() throw( ::fwTools::Failed );
VISUVTKADAPTOR_API virtual void doStart() throw( ::fwTools::Failed );
VISUVTKADAPTOR_API virtual void doStop() throw( ::fwTools::Failed );
VISUVTKADAPTOR_API virtual void doSwap() throw( ::fwTools::Failed );
......
/* ***** BEGIN LICENSE BLOCK *****
* FW4SPL - Copyright (C) IRCAD, 2009-2015.
* FW4SPL - Copyright (C) IRCAD, 2009-2016.
* Distributed under the terms of the GNU Lesser General Public License (LGPL) as
* published by the Free Software Foundation.
* ****** END LICENSE BLOCK ****** */
......@@ -37,7 +37,7 @@ protected:
VISUVTKADAPTOR_API void doStart() throw(fwTools::Failed);
VISUVTKADAPTOR_API void doStop() throw(fwTools::Failed);
VISUVTKADAPTOR_API void configuring() throw(fwTools::Failed);
VISUVTKADAPTOR_API void doConfigure() throw(fwTools::Failed);
VISUVTKADAPTOR_API void doSwap() throw(fwTools::Failed);
// redraw all (stop then restart sub services)
VISUVTKADAPTOR_API void doUpdate() throw(fwTools::Failed);
......
/* ***** BEGIN LICENSE BLOCK *****
* FW4SPL - Copyright (C) IRCAD, 2009-2015.
* FW4SPL - Copyright (C) IRCAD, 2009-2016.
* Distributed under the terms of the GNU Lesser General Public License (LGPL) as
* published by the Free Software Foundation.
* ****** END LICENSE BLOCK ****** */
......@@ -35,7 +35,7 @@ protected:
void doUpdate() throw(fwTools::Failed)
{
}
void configuring() throw(fwTools::Failed)
void doConfigure() throw(fwTools::Failed)
{
}
};
......
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