From: Eduardo Davila Date: Fri, 18 Dec 2009 15:44:57 +0000 (+0000) Subject: no message X-Git-Tag: CREATOOLS.2-0-3~98 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=b75d72a71062d0bcb9365af122899e59baf5ae7a;p=bbtk.git no message --- diff --git a/packages/vtk/bbs/appli/exampleSave_vtkPolyData.bbs b/packages/vtk/bbs/appli/exampleSave_vtkPolyData.bbs index 217ec26..cf6cfd9 100644 --- a/packages/vtk/bbs/appli/exampleSave_vtkPolyData.bbs +++ b/packages/vtk/bbs/appli/exampleSave_vtkPolyData.bbs @@ -9,8 +9,9 @@ load wxvtk include "vtk/boxes/bbLoadHola" new LoadHola reader + new MarchingCubes mc - set mc.Value 1200 + set mc.Value 800 connect reader.Out mc.In @@ -18,8 +19,8 @@ new FileSelector saveFileName set saveFileName.OpenSave Save new PolyDataWriter pdw - connect saveFileName.Out pdw.FileName - connect mc.Out pdw.Out + connect saveFileName.Out pdw.Filename + connect mc.Out pdw.In new PolydataToActor pdActor connect mc.Out pdActor.In @@ -29,7 +30,7 @@ new Viewer3D viewer new CommandButton button set button.Label "Save vtkPolyData" - connect button.BoxExecute pdw.BoxExecute + connect button.BoxChange pdw.BoxExecute new LayoutSplit main set main.Proportion 90 diff --git a/packages/vtk/bbs/boxes/bbIsoSurfaceExtractor.bbs b/packages/vtk/bbs/boxes/bbIsoSurfaceExtractor.bbs index 7f0719e..60e62c4 100644 --- a/packages/vtk/bbs/boxes/bbIsoSurfaceExtractor.bbs +++ b/packages/vtk/bbs/boxes/bbIsoSurfaceExtractor.bbs @@ -9,7 +9,7 @@ define IsoSurfaceExtractor vtk # --- --- new PolyDataReader reader - new PolyDataToActor eedTrans + new PolydataToActor eedTrans connect reader.Out eedTrans.In diff --git a/packages/vtk/src/bbvtkPolydataToActor.cxx b/packages/vtk/src/bbvtkPolydataToActor.cxx deleted file mode 100644 index 30bc470..0000000 --- a/packages/vtk/src/bbvtkPolydataToActor.cxx +++ /dev/null @@ -1,127 +0,0 @@ -/*========================================================================= - Program: bbtk - Module: $RCSfile: bbvtkPolydataToActor.cxx,v $ - Language: C++ - Date: $Date: 2009/05/28 08:55:44 $ - Version: $Revision: 1.15 $ -=========================================================================*/ - -/* --------------------------------------------------------------------- - -* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale) -* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux -* -* This software is governed by the CeCILL-B license under French law and -* abiding by the rules of distribution of free software. You can use, -* modify and/ or redistribute the software under the terms of the CeCILL-B -* license as circulated by CEA, CNRS and INRIA at the following URL -* http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html -* or in the file LICENSE.txt. -* -* As a counterpart to the access to the source code and rights to copy, -* modify and redistribute granted by the license, users are provided only -* with a limited warranty and the software's author, the holder of the -* economic rights, and the successive licensors have only limited -* liability. -* -* The fact that you are presently reading this means that you have had -* knowledge of the CeCILL-B license and that you accept its terms. -* ------------------------------------------------------------------------ */ - -/** - * \file - * \brief - */ - - -#ifdef _USE_VTK_ - -#include "vtkProperty.h" -#include "vtkLinearTransform.h" - -#include "bbvtkPolydataToActor.h" -#include "bbvtkPackage.h" - -namespace bbvtk -{ - BBTK_ADD_BLACK_BOX_TO_PACKAGE(vtk,PolydataToActor) - BBTK_BLACK_BOX_IMPLEMENTATION(PolydataToActor,bbtk::AtomicBlackBox); - - void PolydataToActor::bbUserSetDefaultValues() - { - firsttime=true; - std::vector colour; - colour.push_back(1.0); - colour.push_back(1.0); - colour.push_back(0.5); - bbSetInputColour(colour); - - bbSetInputIn(NULL); - bbSetInputRenderer(NULL); - bbSetInputTransform(NULL); - bbSetInputIsovalue(400); - bbSetInputOpacity(1); - - polydatamapper = NULL; - vtkactor = NULL; - } - - - //--------------------------------------------------------------------- - void PolydataToActor::bbUserInitializeProcessing() - { - polydatamapper = vtkPolyDataMapper::New(); - vtkactor = vtkActor::New(); - -// polydatamapper->SetInput(marchingcubes->GetOutput()); - vtkactor->SetMapper(polydatamapper); - - polydatamapper->ScalarVisibilityOff(); - polydatamapper->ImmediateModeRenderingOn(); - } - - //--------------------------------------------------------------------- - void PolydataToActor::bbUserFinalizeProcessing() - { - if (polydatamapper!=NULL) - { - polydatamapper->Delete(); - polydatamapper=NULL; - } - if (vtkactor!=NULL) - { - vtkactor->Delete(); - vtkactor=NULL; - } - } - - -//--------------------------------------------------------------------- - - void PolydataToActor::DoProcess() - { - polydatamapper->SetInput( bbGetInputIn() ); - - vtkactor->GetProperty()->SetColor( bbGetInputColour()[0], - bbGetInputColour()[1], - bbGetInputColour()[2] ); - - vtkactor->GetProperty()->SetOpacity( bbGetInputOpacity() ); - - if ( bbGetInputTransform()!=NULL ) - { - vtkactor->SetUserTransform( bbGetInputTransform() ); - } - - bbSetOutputOut( vtkactor ); - - // Interface Update - if ((firsttime==true) && (bbGetInputRenderer()!=NULL )) - { - firsttime=false; - bbGetInputRenderer()->AddActor( vtkactor ); - } - } -} // EO namespace bbtk - -#endif //_USE_VTK_ diff --git a/packages/vtk/src/bbvtkPolydataToActor.h b/packages/vtk/src/bbvtkPolydataToActor.h deleted file mode 100644 index 1297d3d..0000000 --- a/packages/vtk/src/bbvtkPolydataToActor.h +++ /dev/null @@ -1,114 +0,0 @@ -/*========================================================================= - Program: bbtk - Module: $RCSfile: bbvtkPolydataToActor.h,v $ - Language: C++ - Date: $Date: 2009/05/15 14:58:01 $ - Version: $Revision: 1.12 $ -=========================================================================*/ - -/* --------------------------------------------------------------------- - -* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale) -* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux -* -* This software is governed by the CeCILL-B license under French law and -* abiding by the rules of distribution of free software. You can use, -* modify and/ or redistribute the software under the terms of the CeCILL-B -* license as circulated by CEA, CNRS and INRIA at the following URL -* http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html -* or in the file LICENSE.txt. -* -* As a counterpart to the access to the source code and rights to copy, -* modify and redistribute granted by the license, users are provided only -* with a limited warranty and the software's author, the holder of the -* economic rights, and the successive licensors have only limited -* liability. -* -* The fact that you are presently reading this means that you have had -* knowledge of the CeCILL-B license and that you accept its terms. -* ------------------------------------------------------------------------ */ - - -/** - * \brief Short description in one line - * - * Long description which - * can span multiple lines - */ -/** - * \file - * \brief Pattern for the definition of a new type of Node (header) - */ -/** - * \class bbtk::NodePatern - * \brief Pattern for the definition of a new type of Node - */ - - -#ifdef _USE_VTK_ - - -#ifndef __vtkPolydataToActor_h__ -#define __vtkPolydataToActor_h__ - -#include "vtkRenderer.h" -#include "vtkPolyData.h" -#include "vtkPolyDataMapper.h" -#include "vtkProp3D.h" -#include "vtkActor.h" -#include - -#include "bbtkAtomicBlackBox.h" - -namespace bbvtk -{ - - class /*BBTK_EXPORT*/ PolydataToActor - : - public bbtk::AtomicBlackBox - { - bool firsttime; - vtkPolyDataMapper *polydatamapper; - vtkActor *vtkactor; - - - BBTK_BLACK_BOX_INTERFACE(PolydataToActor,bbtk::AtomicBlackBox); - - BBTK_DECLARE_INPUT(In,vtkPolyData *); - BBTK_DECLARE_INPUT(Isovalue,double); - BBTK_DECLARE_INPUT(Opacity,double); - BBTK_DECLARE_INPUT(Colour,std::vector); - BBTK_DECLARE_INPUT(Renderer,vtkRenderer *); - BBTK_DECLARE_INPUT(Transform, vtkLinearTransform *); - BBTK_DECLARE_OUTPUT(Out,vtkProp3D *); - - BBTK_PROCESS(DoProcess); - void DoProcess(); - - protected: - }; - - BBTK_BEGIN_DESCRIBE_BLACK_BOX(PolydataToActor,bbtk::AtomicBlackBox); - BBTK_NAME("PolydataToActor"); - BBTK_AUTHOR("eduardo.davila at creatis.insa-lyon.fr"); - BBTK_DESCRIPTION("takes a vtkPolyData object to insert into a 3D scene (e.g. a Viewer3D)"); - typedef std::vector vectorcolour; - BBTK_CATEGORY("3D object creator"); - BBTK_INPUT(PolydataToActor,In,"Input image",vtkPolyData*,""); - - BBTK_INPUT(PolydataToActor,Isovalue,"Isovalue",double,""); - BBTK_INPUT(PolydataToActor,Opacity,"Opacity",double,""); - BBTK_INPUT(PolydataToActor,Colour,"r g b",vectorcolour,"colour"); - BBTK_INPUT(PolydataToActor,Renderer,"3D scene in which to insert the surface",vtkRenderer*,""); - BBTK_INPUT(PolydataToActor,Transform,"Linear Transform (4x4 homogeneous)",vtkLinearTransform*,""); - BBTK_OUTPUT(PolydataToActor,Out,"Extracted iso-surface",vtkProp3D *,""); - - BBTK_END_DESCRIBE_BLACK_BOX(PolydataToActor); - -}// EO namespace bbtk - - -#endif //__PolydataToActor_h__ - -#endif //_USE_VTK_ -