#3059 BBTK Bug New Normal - Update of SphereList box in vtk package

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

diff --git a/packages/vtk/src/bbvtkSphereList.cxx b/packages/vtk/src/bbvtkSphereList.cxx
index 40fce8f425c2e9d2353c481491b8d0f272c77c62..7b91170bf59b48e61c527d83ddbfaac29afbf8d6 100644 (file)
--- a/packages/vtk/src/bbvtkSphereList.cxx
+++ b/packages/vtk/src/bbvtkSphereList.cxx
@@ -41,10 +41,10 @@ BBTK_BLACK_BOX_IMPLEMENTATION(SphereList,bbtk::AtomicBlackBox);
 double SphereList::GetRadio(int i)
 {
     double radio;
-       if (bbGetInputlstRadio().size()==0)
+       if ( bbGetInputlstRadio().size()==0 )
         {
             radio = 1.0;
-        } else if (bbGetInputlstRadio().size() < i )
+        } else if ( i<bbGetInputlstRadio().size() )
        {
             radio = bbGetInputlstRadio()[i];
         } else  
@@ -77,6 +77,7 @@ void SphereList::GetPoint(int i, double &px,double &py,double &pz)
        {                       
                pz = bbGetInputlstPointZ()[i]*spc[2];
        }
+printf("EED SphereList::GetPoint() %f %f %f\n",px,py,pz);
 }  
 
                        
@@ -102,7 +103,7 @@ void SphereList::GetColor(int i, double &cr,double &cg,double &cb)
 
 void SphereList::Process()
 {
-
+printf ("EED SphereList::Process Start\n");
         int iMin, iMax;
        double px = 0.0;
        double py = 0.0;
@@ -112,25 +113,33 @@ void SphereList::Process()
        double cg = 0.0;
        double cb = 0.0;
        
+/*
+== igualar la lista de objetos 
+     si la lista es igual nada que hacer
+     si la nueva lista es las corta que la lista existente borrar los actores
+     si la lista es mas larga que la lista existente crear los actores
+== acualizar la lista de objetos
+*/
+
+
        if (bbGetInputRenderer()!=NULL)
        {
-                // If it is not the first time Process is executed, the actors have already been created. The only thing to do is to update the opacity. 
+// If it is not the first time Process is executed, the actors have already been created. The only thing to do is to update the opacity. 
                if (sphereActor.size() != 0)
-                {
-                  for (int i = 0; i < sphereActor.size(); i++)
-                  {
-                       GetPoint(i, px,py,pz);
-                       GetColor(i, cr,cg,cb);
-                       sphereActor[i] ->SetPosition( px,py,pz );
-                       sphereActor[i] -> GetProperty() -> SetOpacity( bbGetInputOpacity() );
-                       sphereActor[i] -> GetProperty() -> SetColor( cr,cg,cb );
-                       vtkspheresourceLst[i] -> SetRadius( GetRadio(i) ); 
-                 } // for i
-               } else {
-                   
-
-                    iMin=0;
-                    iMax=bbGetInputlstPointX().size();
+               {
+               for (int i = 0; i < sphereActor.size(); i++)
+               {
+                               GetPoint(i, px,py,pz);
+                               GetColor(i, cr,cg,cb);
+                               sphereActor[i] ->SetPosition( px,py,pz );
+printf("EED SphereList::Process() %f %f %f\n",px,py,pz);
+                sphereActor[i] -> GetProperty() -> SetOpacity( bbGetInputOpacity() );
+                sphereActor[i] -> GetProperty() -> SetColor( cr,cg,cb );
+                vtkspheresourceLst[i] -> SetRadius( GetRadio(i) ); 
+               } // for i
+               } else {
+                       iMin=0;
+            iMax=bbGetInputlstPointX().size();
 //                    printf("EED SphereList::Process   iMax=%d \n", iMax);
 //                    for (int i = 0; i < iMax; i++)
 //                      {
@@ -140,55 +149,52 @@ void SphereList::Process()
 //                      } // for i
  
                    // If the vector Y or respectively the vector Z has a different size from the vector X, the position value py or respectively pz is set to 0.
-                    for ( int i=iMin ; i<iMax; i=i+1 )
-                    {
-                         
-
-                        GetPoint(i, px,py,pz);
-                       GetColor(i, cr,cg,cb);
-                       
-
-                       // Sphere
-                       vtkSphereSource * newSphere =  vtkSphereSource::New();
-                       vtkspheresourceLst.push_back(newSphere);
-
-                       newSphere -> SetThetaResolution(20);
-                       newSphere -> SetPhiResolution(20);
-                       newSphere -> SetRadius( GetRadio(i) ); 
-
-                       vtkPolyDataMapper * newMapper = vtkPolyDataMapper::New();
-                       newMapper -> SetInput( newSphere -> GetOutput() );
+               for ( int i=iMin ; i<iMax; i=i+1 )
+               {
+               GetPoint(i, px,py,pz);
+                               GetColor(i, cr,cg,cb);
+                               // Sphere
+                               vtkSphereSource * newSphere = vtkSphereSource::New();
+                               vtkspheresourceLst.push_back(newSphere);
+
+                               newSphere -> SetThetaResolution(20);
+                               newSphere -> SetPhiResolution(20);
+                               newSphere -> SetRadius( GetRadio(i) ); 
+
+                               vtkPolyDataMapper * newMapper = vtkPolyDataMapper::New();
+                               newMapper -> SetInput( newSphere -> GetOutput() );
        
-                       vtkActor * newActor = vtkActor::New();
-                       sphereActor.push_back(newActor);
-                       newActor -> SetMapper(newMapper);
-                       newActor -> SetOrigin(0, 0, 0);                 
-                       newActor -> GetProperty() -> SetColor(cr,cg,cb);
-                       newActor -> GetProperty() -> SetOpacity( bbGetInputOpacity() );
-                       newActor -> SetPosition( px,py,pz );
+                               vtkActor * newActor = vtkActor::New();
+                               sphereActor.push_back(newActor);
+                               newActor -> SetMapper(newMapper);
+                               newActor -> SetOrigin(0, 0, 0);                 
+                               newActor -> GetProperty() -> SetColor(cr,cg,cb);
+                               newActor -> GetProperty() -> SetOpacity( bbGetInputOpacity() );
+                               newActor -> SetPosition( px,py,pz );
        
-                       if ( bbGetInputTransform()!=NULL )
-                       {
-                               newActor->SetUserTransform( bbGetInputTransform() );
-                       }
+                               if ( bbGetInputTransform()!=NULL )
+                               {
+                                       newActor->SetUserTransform( bbGetInputTransform() );
+                               }
        
-
-                       if (bbGetInputRenderer()!=NULL)
-                       {
-                           bbGetInputRenderer() -> AddActor( newActor );
-                       }
-
-                    } // for
-
-                    if (sphereActor.size() != 0)
-                    {
-                        // Sets the output.
-                        bbSetOutputActorList(sphereActor);
-                    }
+                               if (bbGetInputRenderer()!=NULL)
+                               {
+                                   bbGetInputRenderer() -> AddActor( newActor );
+                               }
+
+                       } // for
+
+            if (sphereActor.size() != 0)
+            {
+               // Sets the output.
+               bbSetOutputActorList(sphereActor);
+               }
                     
-                } // if (bbGetInputRenderer()!=NULL)
+               } // if (sphereActor.size() != 0)
+       } // if (bbGetInputRenderer()!=NULL)
+
+printf ("EED SphereList::Process END\n");
 
-        } // if (sphereActor.size() != 0)
 }
 
 void SphereList::bbUserSetDefaultValues()