X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkSphereList.cxx;h=7577a0a7ed47a6d1c5e980a03102507a2b5c235d;hb=cfad95b6e08e6e53846ffcda7fbc5932065f2c47;hp=69781933ea02317d58e899bf36a99929191e25e0;hpb=54a98470cd2684e07391bf0bf46cd7db9b5e7d6c;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkSphereList.cxx b/packages/vtk/src/bbvtkSphereList.cxx
index 6978193..7577a0a 100644
--- a/packages/vtk/src/bbvtkSphereList.cxx
+++ b/packages/vtk/src/bbvtkSphereList.cxx
@@ -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.
+ # ------------------------------------------------------------------------ */
+
+
 #include "bbvtkSphereList.h"
 #include "bbvtkPackage.h"
 
@@ -14,7 +41,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 +52,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 +69,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 +161,14 @@ void SphereList::bbUserSetDefaultValues()
   colour.push_back(0.0);
   colour.push_back(0.0);
   bbSetInputColour(colour);
-  
+	
+	// Sets default spacing.
+	std::vector<double> spacing;
+	spacing.push_back(1.0);
+	spacing.push_back(1.0);
+	spacing.push_back(1.0);
+	bbSetInputSpacing(spacing);
+	
   bbSetInputOpacity(1.0);
 
 }