From: jean-pierre roux Date: Wed, 4 May 2011 12:23:52 +0000 (+0000) Subject: Fix comments / fix mistyping X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=c430580690d4102f46be88a0d386401293f3875f;p=bbtk.git Fix comments / fix mistyping --- diff --git a/packages/vtk/bbs/appli/exampleReadView_vtkPolyData_2.bbs b/packages/vtk/bbs/appli/exampleReadView_vtkPolyData_2.bbs index e3f5b85..75828e8 100644 --- a/packages/vtk/bbs/appli/exampleReadView_vtkPolyData_2.bbs +++ b/packages/vtk/bbs/appli/exampleReadView_vtkPolyData_2.bbs @@ -3,16 +3,16 @@ description "LoadBunny_vtkPolyData box example" author "Info-dev at creatis.insa-lyon.fr" category "example mesh" -load vtk + load wx load wxvtk load std -include vtk/boxes/bbLoadBunny_vtkPolyData +include vtk //new PolyDataReader pdr // set pdr.In "/Users/davila/Borrame/Images/Helena/bunny.vtk" -new bbLoadBunny_vtkPolyData pdr +new LoadBunny_vtkPolyData pdr new PolyDataToActor pdActor connect pdr.Out pdActor.In diff --git a/packages/vtk/bbs/boxes/bbLoadHola_vtkPolyData.bbs b/packages/vtk/bbs/boxes/bbLoadHola_vtkPolyData.bbs index d583de6..b90b6df 100644 --- a/packages/vtk/bbs/boxes/bbLoadHola_vtkPolyData.bbs +++ b/packages/vtk/bbs/boxes/bbLoadHola_vtkPolyData.bbs @@ -4,7 +4,7 @@ include std/boxes/bbPrependPackageDataPath define LoadHola_vtkPolyData vtk description "Loads the image 'hola_vtkPolyData.vtk'" author "eduardo.davila at creatis.insa-lyon.fr" - category "image;read/write" + category "mesh;read/write" new PolyDataReader reader new PrependPackageDataPath ppdp @@ -13,6 +13,6 @@ define LoadHola_vtkPolyData vtk connect ppdp.Out reader.In output Out reader.Out "The poly data" - output FileName ppdp.Out "The path to the image loaded" + output FileName ppdp.Out "The path to the mesh to load" endefine diff --git a/packages/vtk/src/bbvtkMIPCreator.cxx b/packages/vtk/src/bbvtkMIPCreator.cxx index 00ec5dc..ece4899 100644 --- a/packages/vtk/src/bbvtkMIPCreator.cxx +++ b/packages/vtk/src/bbvtkMIPCreator.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbvtkMIPCreator.cxx,v $ Language: C++ - Date: $Date: 2011/03/23 15:49:19 $ - Version: $Revision: 1.10 $ + Date: $Date: 2011/05/04 12:23:55 $ + Version: $Revision: 1.11 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -221,7 +221,6 @@ namespace bbvtk // mVolume->GetProperty()->SetColor( bbGetInputColour()[0], bbGetInputColour()[1], bbGetInputColour()[2] ); // mVolume->GetProperty()->SetOpacity( bbGetInputOpacity() ); - } }//namespace bbtk diff --git a/packages/vtk/src/bbvtkPolyDataToActor.cxx b/packages/vtk/src/bbvtkPolyDataToActor.cxx index 3645ce8..629c418 100644 --- a/packages/vtk/src/bbvtkPolyDataToActor.cxx +++ b/packages/vtk/src/bbvtkPolyDataToActor.cxx @@ -61,15 +61,15 @@ namespace bbvtk bbSetInputTransform(NULL); bbSetInputOpacity(1); - polydatamapper = NULL; - vtkactor = NULL; + polydatamapper = NULL; + vtkactor = NULL; } //--------------------------------------------------------------------- void PolyDataToActor::bbUserInitializeProcessing() { - polydatamapper = vtkPolyDataMapper::New(); + polydatamapper = vtkPolyDataMapper::New(); vtkactor = vtkActor::New(); // polydatamapper->SetInput(marchingcubes->GetOutput()); @@ -98,10 +98,8 @@ namespace bbvtk //--------------------------------------------------------------------- void PolyDataToActor::DoProcess() - { - std::cout << "EED PolyDataToActor::DoProcess" << std::endl; - - polydatamapper->SetInput( bbGetInputIn() ); + { + polydatamapper->SetInput( bbGetInputIn() ); vtkactor->GetProperty()->SetColor( bbGetInputColour()[0], bbGetInputColour()[1], diff --git a/packages/vtk/src/bbvtkPolyDataToActor.h b/packages/vtk/src/bbvtkPolyDataToActor.h index dd23a69..47789ff 100644 --- a/packages/vtk/src/bbvtkPolyDataToActor.h +++ b/packages/vtk/src/bbvtkPolyDataToActor.h @@ -78,7 +78,7 @@ namespace bbvtk BBTK_DECLARE_INPUT(Opacity,double); BBTK_DECLARE_INPUT(Colour,std::vector); BBTK_DECLARE_INPUT(Renderer,vtkRenderer *); - BBTK_DECLARE_INPUT(Transform, vtkLinearTransform *); + BBTK_DECLARE_INPUT(Transform, vtkLinearTransform *); BBTK_DECLARE_OUTPUT(Out,vtkProp3D *); BBTK_PROCESS(DoProcess);