Clean comments

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

diff --git a/packages/vtk/src/bbvtkSphereList.cxx b/packages/vtk/src/bbvtkSphereList.cxx
index 8e552d7614300e3e8b1c31d86477f0e0b7b108e4..95f14ad5ae3eca0e2b886b662eb689e1331497bd 100644 (file)
--- a/packages/vtk/src/bbvtkSphereList.cxx
+++ b/packages/vtk/src/bbvtkSphereList.cxx
@@ -14,17 +14,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 +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() )
@@ -72,7 +80,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 +134,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);
 
 }