Feature #1774

[bbtk.git] / packages / vtk / src / bbvtkSphereList.cxx

diff --git a/packages/vtk/src/bbvtkSphereList.cxx b/packages/vtk/src/bbvtkSphereList.cxx
index 8e552d7614300e3e8b1c31d86477f0e0b7b108e4..7577a0a7ed47a6d1c5e980a03102507a2b5c235d 100644 (file)
--- 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,17 +41,25 @@ 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;
        double radio;
        double spc[3];
  
+       int last_valid_color_index = 0;
 
        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();
@@ -34,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() )
@@ -72,7 +107,16 @@ void SphereList::Process()
                        sphereActor.push_back(newActor);
                        newActor -> SetMapper(newMapper);
                        newActor -> SetOrigin(0, 0, 0);
-                       newActor -> GetProperty() -> SetColor( bbGetInputColour()[0] , bbGetInputColour()[1] , bbGetInputColour()[2] );
+                       
+                       unsigned int j = 3*i +2;
+                       if (j < bbGetInputColour().size() )
+                         {
+                           newActor -> GetProperty() -> SetColor( bbGetInputColour()[3*i] , bbGetInputColour()[3*i + 1] , bbGetInputColour()[3*i + 2] );
+                           last_valid_color_index = 3*i;
+                         }
+                       else
+                         newActor -> GetProperty() -> SetColor( bbGetInputColour()[last_valid_color_index] , bbGetInputColour()[last_valid_color_index + 1] , bbGetInputColour()[last_valid_color_index + 2] );
+
                        newActor -> GetProperty() -> SetOpacity( bbGetInputOpacity() );
                        newActor -> SetPosition( px,py,pz );
        
@@ -117,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);
 
 }