From: Eduardo Davila Date: Thu, 12 Apr 2012 08:39:46 +0000 (+0000) Subject: no message X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=316241991111fc552c8001979dc03d1dc73f0475;p=bbtk.git no message --- diff --git a/packages/vtk/src/bbvtkSphereList.cxx b/packages/vtk/src/bbvtkSphereList.cxx index 6978193..95f14ad 100644 --- a/packages/vtk/src/bbvtkSphereList.cxx +++ b/packages/vtk/src/bbvtkSphereList.cxx @@ -14,7 +14,7 @@ BBTK_BLACK_BOX_IMPLEMENTATION(SphereList,bbtk::AtomicBlackBox); void SphereList::Process() { - int iMin, iMax; + int iMin, iMax; double px = 0.0; double py = 0.0; double pz = 0.0; @@ -25,7 +25,14 @@ void SphereList::Process() if (bbGetInputRenderer()!=NULL) { - spc[0]=spc[1]=spc[2]=1; + if (bbGetInputSpacing().size()==3) + { + spc[0]=bbGetInputSpacing()[0]; + spc[1]=bbGetInputSpacing()[1]; + spc[2]=bbGetInputSpacing()[2]; + } else { + spc[0]=spc[1]=spc[2]=1; + } iMin=0; iMax=bbGetInputlstPointX().size(); @@ -35,13 +42,13 @@ void SphereList::Process() { px = bbGetInputlstPointX()[i]*spc[0]; if (bbGetInputlstPointY().size() == bbGetInputlstPointX().size() ) - { + { py = bbGetInputlstPointY()[i]*spc[1]; - } + } if (bbGetInputlstPointZ().size() == bbGetInputlstPointX().size() ) - { + { pz = bbGetInputlstPointZ()[i]*spc[2]; - } + } // If the number of elements in the radio list is different from the number of X coordinates, the radio value is set to 1. if (bbGetInputlstRadio().size() == bbGetInputlstPointX().size() ) @@ -127,7 +134,14 @@ void SphereList::bbUserSetDefaultValues() colour.push_back(0.0); colour.push_back(0.0); bbSetInputColour(colour); - + + // Sets default spacing. + std::vector spacing; + spacing.push_back(1.0); + spacing.push_back(1.0); + spacing.push_back(1.0); + bbSetInputSpacing(spacing); + bbSetInputOpacity(1.0); } diff --git a/packages/vtk/src/bbvtkSphereList.h b/packages/vtk/src/bbvtkSphereList.h index bf929bf..b23b99a 100644 --- a/packages/vtk/src/bbvtkSphereList.h +++ b/packages/vtk/src/bbvtkSphereList.h @@ -19,15 +19,15 @@ class bbvtk_EXPORT SphereList { BBTK_BLACK_BOX_INTERFACE(SphereList,bbtk::AtomicBlackBox); - BBTK_DECLARE_INPUT(Renderer ,vtkRenderer*); - BBTK_DECLARE_INPUT(lstPointX,std::vector); - BBTK_DECLARE_INPUT(lstPointY,std::vector); - BBTK_DECLARE_INPUT(lstPointZ,std::vector); - BBTK_DECLARE_INPUT(lstRadio ,std::vector); - BBTK_DECLARE_INPUT(Colour ,std::vector); - BBTK_DECLARE_INPUT(Transform ,vtkLinearTransform*); - - BBTK_DECLARE_INPUT(Opacity ,double); + BBTK_DECLARE_INPUT(Renderer ,vtkRenderer*); + BBTK_DECLARE_INPUT(lstPointX,std::vector); + BBTK_DECLARE_INPUT(lstPointY,std::vector); + BBTK_DECLARE_INPUT(lstPointZ,std::vector); + BBTK_DECLARE_INPUT(lstRadio ,std::vector); + BBTK_DECLARE_INPUT(Colour ,std::vector); + BBTK_DECLARE_INPUT(Opacity ,double); + BBTK_DECLARE_INPUT(Spacing ,std::vector); + BBTK_DECLARE_INPUT(Transform ,vtkLinearTransform*); BBTK_DECLARE_OUTPUT(ActorList,std::vector); @@ -41,17 +41,18 @@ class bbvtk_EXPORT SphereList }; BBTK_BEGIN_DESCRIBE_BLACK_BOX(SphereList,bbtk::AtomicBlackBox); -BBTK_NAME("SphereList"); -BBTK_AUTHOR("InfoTeam CREATIS"); -BBTK_DESCRIPTION("Builds a sphere list actor given four vectors (X, Y, Z, radius)."); -BBTK_CATEGORY(""); -BBTK_INPUT(SphereList,Renderer,"Renderer",vtkRenderer*,""); -BBTK_INPUT(SphereList,lstPointX,"List of X coordinates. Requirement: same size as vector Y and vector Z.",std::vector,""); -BBTK_INPUT(SphereList,lstPointY,"List of Y coordinates. Requirement: same size as vector X and vector Z.",std::vector,""); -BBTK_INPUT(SphereList,lstPointZ,"List of Z coordinates. Requirement: same size as vector X and vector Y.",std::vector,""); -BBTK_INPUT(SphereList,lstRadio,"List of Radio values",std::vector,""); -BBTK_INPUT(SphereList,Colour,"Colour RGB values for the spheres (3 first values of the vector for the first sphere, following values for the second sphere, etc.)",std::vector,""); -BBTK_INPUT(SphereList,Opacity,"Opacity of the spheres",double,""); + BBTK_NAME("SphereList"); + BBTK_AUTHOR("InfoTeam CREATIS"); + BBTK_DESCRIPTION("Builds a sphere list actor given four vectors (X, Y, Z, radius)."); + BBTK_CATEGORY(""); + BBTK_INPUT(SphereList,Renderer,"Renderer",vtkRenderer*,""); + BBTK_INPUT(SphereList,lstPointX,"List of X coordinates. Requirement: same size as vector Y and vector Z.",std::vector,""); + BBTK_INPUT(SphereList,lstPointY,"List of Y coordinates. Requirement: same size as vector X and vector Z.",std::vector,""); + BBTK_INPUT(SphereList,lstPointZ,"List of Z coordinates. Requirement: same size as vector X and vector Y.",std::vector,""); + BBTK_INPUT(SphereList,lstRadio,"List of Radio values",std::vector,""); + BBTK_INPUT(SphereList,Colour,"Colour RGB values for the spheres (3 first values of the vector for the first sphere, following values for the second sphere, etc.)",std::vector,""); + BBTK_INPUT(SphereList,Opacity,"Opacity of the spheres",double,""); + BBTK_INPUT(SphereList,Spacing,"(default [1 1 1]) Spacing vector [sx sy sz]",std::vector,""); BBTK_INPUT(SphereList,Transform,"vtkTransform",vtkLinearTransform*,""); BBTK_OUTPUT(SphereList,ActorList,"List of the sphere actors",std::vector,"");