X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkSphereList.h;h=fdc775afc1868d6dff5a855c158d9ef56e858db8;hb=66923cdc16451738c67193d83bc453772717ed6b;hp=ec632f30e266289c9d03c209ebcb1cc20e1edc0d;hpb=076686675e6ef7994bf843e31d5b17341a657325;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkSphereList.h b/packages/vtk/src/bbvtkSphereList.h
index ec632f3..fdc775a 100644
--- a/packages/vtk/src/bbvtkSphereList.h
+++ b/packages/vtk/src/bbvtkSphereList.h
@@ -1,3 +1,30 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  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.
+ # ------------------------------------------------------------------------ */
+
+
 #ifndef __bbvtkSphereList_h_INCLUDED__
 #define __bbvtkSphereList_h_INCLUDED__
 #include "bbvtk_EXPORT.h"
@@ -19,15 +46,15 @@ class bbvtk_EXPORT SphereList
 {
   BBTK_BLACK_BOX_INTERFACE(SphereList,bbtk::AtomicBlackBox);
 
-  BBTK_DECLARE_INPUT(Renderer ,vtkRenderer*);
-  BBTK_DECLARE_INPUT(lstPointX,std::vector<double>);
-  BBTK_DECLARE_INPUT(lstPointY,std::vector<double>);
-  BBTK_DECLARE_INPUT(lstPointZ,std::vector<double>);
-  BBTK_DECLARE_INPUT(lstRadio ,std::vector<double>);
-  BBTK_DECLARE_INPUT(Colour   ,std::vector<double>);
-  BBTK_DECLARE_INPUT(Transform   ,vtkLinearTransform*);
-
-  BBTK_DECLARE_INPUT(Opacity  ,double);
+	BBTK_DECLARE_INPUT(Renderer ,vtkRenderer*);
+	BBTK_DECLARE_INPUT(lstPointX,std::vector<double>);
+	BBTK_DECLARE_INPUT(lstPointY,std::vector<double>);
+	BBTK_DECLARE_INPUT(lstPointZ,std::vector<double>);
+	BBTK_DECLARE_INPUT(lstRadio ,std::vector<double>);
+	BBTK_DECLARE_INPUT(Colour   ,std::vector<double>);
+	BBTK_DECLARE_INPUT(Opacity  ,double);
+	BBTK_DECLARE_INPUT(Spacing   ,std::vector<double>);
+	BBTK_DECLARE_INPUT(Transform   ,vtkLinearTransform*);
 
   BBTK_DECLARE_OUTPUT(ActorList,std::vector<vtkActor*>);
 
@@ -35,23 +62,27 @@ class bbvtk_EXPORT SphereList
   void Process();
 
   std::vector<vtkActor *> sphereActor;
-  std::vector<vtkPolyDataMapper *> sphereMapper;
-  std::vector<vtkSphereSource *> vtkSphere;
+  std::vector<vtkSphereSource *> vtkspheresourceLst;
 
+private:
+   double GetRadio(int);
+   void GetPoint(int i, double &px,double &py,double &pz);   
+   void GetColor(int i, double &cr,double &cg,double &cb);
 };
 
 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<double>,"");
-BBTK_INPUT(SphereList,lstPointY,"List of Y coordinates. Requirement: same size as vector X and vector Z.",std::vector<double>,"");
-BBTK_INPUT(SphereList,lstPointZ,"List of Z coordinates. Requirement: same size as vector X and vector Y.",std::vector<double>,"");
-BBTK_INPUT(SphereList,lstRadio,"List of Radio values",std::vector<double>,"");
-BBTK_INPUT(SphereList,Colour,"Colour RGB values for the spheres",std::vector<double>,"");
-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<double>,"");
+	BBTK_INPUT(SphereList,lstPointY,"List of Y coordinates. Requirement: same size as vector X and vector Z.",std::vector<double>,"");
+	BBTK_INPUT(SphereList,lstPointZ,"List of Z coordinates. Requirement: same size as vector X and vector Y.",std::vector<double>,"");
+	BBTK_INPUT(SphereList,lstRadio,"List of Radio values",std::vector<double>,"");
+	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<double>,"");
+	BBTK_INPUT(SphereList,Opacity,"Opacity of the spheres",double,"");
+	BBTK_INPUT(SphereList,Spacing,"(default [1 1 1]) Spacing vector [sx sy sz]",std::vector<double>,"");
 BBTK_INPUT(SphereList,Transform,"vtkTransform",vtkLinearTransform*,"");
 
  BBTK_OUTPUT(SphereList,ActorList,"List of the sphere actors",std::vector<vtkActor*>,"");