From: jean-pierre roux Date: Fri, 22 Jan 2010 14:51:55 +0000 (+0000) Subject: Fix categ X-Git-Tag: CREATOOLS.2-0-3~71 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=4c0b672320742ea3ced419ca0354b50c7c1f2915;p=creaMaracasVisu.git Fix categ --- diff --git a/bbtk/src/bbcreaMaracasVisuVolumeRendering.h b/bbtk/src/bbcreaMaracasVisuVolumeRendering.h index b860dd5..d09f9d4 100644 --- a/bbtk/src/bbcreaMaracasVisuVolumeRendering.h +++ b/bbtk/src/bbcreaMaracasVisuVolumeRendering.h @@ -17,8 +17,6 @@ class bbcreaMaracasVisu_EXPORT VolumeRendering public bbtk::WxBlackBox { BBTK_BLACK_BOX_INTERFACE(VolumeRendering,bbtk::WxBlackBox); - - BBTK_DECLARE_INPUT(In0,vtkImageData*); BBTK_DECLARE_INPUT(In1,vtkImageData*); @@ -46,20 +44,20 @@ class bbcreaMaracasVisu_EXPORT VolumeRendering private: vtkRenderer* _currentrenderer; - + }; BBTK_BEGIN_DESCRIBE_BLACK_BOX(VolumeRendering,bbtk::WxBlackBox); BBTK_NAME("VolumeRendering"); BBTK_AUTHOR("car-prie@uniandes.edu.co"); BBTK_DESCRIPTION("Volume Rendering of a given image"); -BBTK_CATEGORY("__CATEGORY__"); +BBTK_CATEGORY("actor"); BBTK_INPUT(VolumeRendering,In0,"Image to create the volume rendering",vtkImageData*,""); BBTK_INPUT(VolumeRendering,In1,"Image to create the volume rendering",vtkImageData*,""); BBTK_INPUT(VolumeRendering,In2,"Image to create the volume rendering",vtkImageData*,""); BBTK_INPUT(VolumeRendering,In3,"Image to create the volume rendering",vtkImageData*,""); -BBTK_INPUT(VolumeRendering,Renderer,"Image to create the volume rendering",vtkRenderer*,""); +BBTK_INPUT(VolumeRendering,Renderer,"Renderer",vtkRenderer*,""); BBTK_OUTPUT(VolumeRendering,Out0,"Output resulting image",vtkImageData*,""); BBTK_OUTPUT(VolumeRendering,Out1,"Output resulting image",vtkImageData*,""); BBTK_OUTPUT(VolumeRendering,Out2,"Output resulting image",vtkImageData*,""); diff --git a/bbtk/src/bbmaracasvisuAxeVolume.h b/bbtk/src/bbmaracasvisuAxeVolume.h index dad2bd5..870c105 100644 --- a/bbtk/src/bbmaracasvisuAxeVolume.h +++ b/bbtk/src/bbmaracasvisuAxeVolume.h @@ -30,7 +30,7 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(AxeVolume,bbtk::AtomicBlackBox); BBTK_NAME ( "AxeVolume " ) ; BBTK_AUTHOR("eduardo.davila@hotmail.com"); BBTK_DESCRIPTION("Axe Volume" ) ; - BBTK_CATEGORY("__CATEGORY__ fltre view qsdflk qsdf qsdf qsf "); + BBTK_CATEGORY("actor"); BBTK_INPUT(AxeVolume,In,"Size image X",vtkImageData*,""); BBTK_INPUT(AxeVolume,lstPointX,"List of X values", std::vector ,""); BBTK_INPUT(AxeVolume,lstPointY,"List of Y values", std::vector ,""); diff --git a/bbtk/src/bbmaracasvisuDrawAxe3D.cxx b/bbtk/src/bbmaracasvisuDrawAxe3D.cxx index 14db370..5736969 100644 --- a/bbtk/src/bbmaracasvisuDrawAxe3D.cxx +++ b/bbtk/src/bbmaracasvisuDrawAxe3D.cxx @@ -1,24 +1,20 @@ #include "bbmaracasvisuDrawAxe3D.h" #include "bbcreaMaracasVisuPackage.h" - #include "vtkImageData.h" #include "vtkActor.h" #include "vtkPoints.h" #include "vtkCellArray.h" #include "vtkProperty.h" - #include "vtkLinearTransform.h" namespace bbcreaMaracasVisu { - BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,DrawAxe3D) BBTK_BLACK_BOX_IMPLEMENTATION(DrawAxe3D,bbtk::AtomicBlackBox); void DrawAxe3D::Process() { - std::vector< double > vectx = bbGetInputlstPointX(); std::vector< double > vecty = bbGetInputlstPointY(); std::vector< double > vectz = bbGetInputlstPointZ(); @@ -38,7 +34,7 @@ void DrawAxe3D::Process() for( i = 0; i < vectx.size( ); i++) { //multiplicar ver parametros spacing, en maracas cuando se toca la imagen y se ve dycom - //hay par·metro dycom, vtkImagedata valor spacing y esos datos hay que multiplicar al polydata + //hay parametro dicom, vtkImagedata valor spacing y esos datos hay que multiplicar al polydata allPoints->InsertNextPoint( vectx[i]*spc[0], vecty[i]*spc[1], vectz[i]*spc[2] ); allTopology->InsertCellPoint( i ); } // rof @@ -49,8 +45,8 @@ void DrawAxe3D::Process() } mvtkactor->GetProperty()->SetColor( bbGetInputColour()[0], - bbGetInputColour()[1], - bbGetInputColour()[2] ); + bbGetInputColour()[1], + bbGetInputColour()[2] ); if ( bbGetInputTransform()!=NULL ) { @@ -63,16 +59,15 @@ void DrawAxe3D::Process() firsttime=false; bbGetInputRenderer()->AddActor( mvtkactor ); } - } void DrawAxe3D::bbUserSetDefaultValues() { - firsttime = true; - mallData = NULL; - polydatamapper = NULL; - mvtkactor = NULL; - + firsttime = true; + mallData = NULL; + polydatamapper = NULL; + mvtkactor = NULL; + std::vector colour; colour.push_back(1.0); colour.push_back(0.0); @@ -81,19 +76,19 @@ void DrawAxe3D::bbUserSetDefaultValues() } - + //----------------------------------------------------------------- void DrawAxe3D::bbUserInitializeProcessing() { - mallData = vtkPolyData::New( ); - polydatamapper = vtkPolyDataMapper::New(); - mvtkactor = vtkActor::New(); + mallData = vtkPolyData::New( ); + polydatamapper = vtkPolyDataMapper::New(); + mvtkactor = vtkActor::New(); polydatamapper->SetInput(mallData); mvtkactor->SetMapper(polydatamapper); bbSetOutputOut(mvtkactor); } - + //----------------------------------------------------------------- void DrawAxe3D::bbUserFinalizeProcessing() { @@ -101,27 +96,22 @@ void DrawAxe3D::bbUserSetDefaultValues() { mallData->Delete(); mallData=NULL; - } + } if (polydatamapper!=NULL) { polydatamapper->Delete(); polydatamapper=NULL; - } + } if (mvtkactor!=NULL) { mvtkactor->Delete(); mvtkactor=NULL; - } - + } } - - //----------------------------------------------------------------- - - - + //----------------------------------------------------------------- } // EO namespace bbcreaMaracasVisu diff --git a/bbtk/src/bbmaracasvisuDrawAxe3D.h b/bbtk/src/bbmaracasvisuDrawAxe3D.h index a96ad4f..72a492f 100644 --- a/bbtk/src/bbmaracasvisuDrawAxe3D.h +++ b/bbtk/src/bbmaracasvisuDrawAxe3D.h @@ -30,10 +30,10 @@ class /*BBTK_EXPORT*/ DrawAxe3D void Process(); private: - bool firsttime; - vtkPolyData *mallData; - vtkActor *mvtkactor; - vtkPolyDataMapper *polydatamapper; + bool firsttime; + vtkPolyData *mallData; + vtkActor *mvtkactor; + vtkPolyDataMapper *polydatamapper; }; @@ -41,7 +41,7 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(DrawAxe3D,bbtk::AtomicBlackBox); BBTK_NAME("DrawAxe3D"); BBTK_AUTHOR("eduardo.davila@creatis.insa-lyon.fr"); BBTK_DESCRIPTION("Draw a 3D axe in a vtk 3D Viewer"); -BBTK_CATEGORY("__CATEGORY__"); +BBTK_CATEGORY("actor"); BBTK_INPUT(DrawAxe3D,Renderer,"vtk Renderer 3D universe",vtkRenderer*,""); BBTK_INPUT(DrawAxe3D,lstPointX,"list of point X",std::vector,""); BBTK_INPUT(DrawAxe3D,lstPointY,"list of point Y",std::vector,""); diff --git a/bbtk/src/bbmaracasvisuDrawAxisTree3D.h b/bbtk/src/bbmaracasvisuDrawAxisTree3D.h index 34caf18..01a0f75 100644 --- a/bbtk/src/bbmaracasvisuDrawAxisTree3D.h +++ b/bbtk/src/bbmaracasvisuDrawAxisTree3D.h @@ -13,8 +13,6 @@ #include "vtkCellArray.h" #include "vtkProperty.h" - - namespace bbcreaMaracasVisu { @@ -38,9 +36,9 @@ class /*BBTK_EXPORT*/ DrawAxisTree3D private: - std::vector vecVtkPolyData; + std::vector vecVtkPolyData; std::vector vecVtkPolyDataMaper; - std::vector vecVtkActors; + std::vector vecVtkActors; void DrawOneAxis(int iGeneral,int numPoints, int iAxis); }; @@ -49,7 +47,7 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(DrawAxisTree3D,bbtk::AtomicBlackBox); BBTK_NAME("DrawAxisTree3D"); BBTK_AUTHOR("InfoTeam CREATIS-LRMN"); BBTK_DESCRIPTION("Draw Axis Tree 3D"); -BBTK_CATEGORY("__CATEGORY__"); +BBTK_CATEGORY("actor"); BBTK_INPUT(DrawAxisTree3D,Renderer,"Renderer",vtkRenderer*,""); BBTK_INPUT(DrawAxisTree3D,lstIndexs,"Indexs",std::vector,""); BBTK_INPUT(DrawAxisTree3D,lstPointX,"lstPointX",std::vector,"");