X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkSphereList.cxx;h=616f088d4b5093246a909ec71b00e15bcad69b65;hb=84454af9be8cecfbf41ca7c0198c65efe60f9b48;hp=50889bd9dc746a47fba9e79a37a34de6f5f8c0c8;hpb=5a2f51cf157e546e9354dd359e2478cdf4e2d040;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkSphereList.cxx b/packages/vtk/src/bbvtkSphereList.cxx
index 50889bd..616f088 100644
--- a/packages/vtk/src/bbvtkSphereList.cxx
+++ b/packages/vtk/src/bbvtkSphereList.cxx
@@ -38,130 +38,151 @@ namespace bbvtk
 BBTK_ADD_BLACK_BOX_TO_PACKAGE(vtk,SphereList)
 BBTK_BLACK_BOX_IMPLEMENTATION(SphereList,bbtk::AtomicBlackBox);
 
-void SphereList::Process()
+double SphereList::GetRadio(int i)
 {
+    double radio;
+	if ( bbGetInputlstRadio().size()==0 )
+        {
+            radio = 1.0;
+        } else if ( i<bbGetInputlstRadio().size() )
+	{
+            radio = bbGetInputlstRadio()[i];
+        } else  
+        {
+            radio = bbGetInputlstRadio()[ bbGetInputlstRadio().size() - 1 ];
+        }  
+
+       return radio;
+}
 
-        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;
 
+void SphereList::GetPoint(int i, double &px,double &py,double &pz)        
+ {
+      double spc[3];
+      if (bbGetInputSpacing().size()==3)
+      {
+		spc[0]=bbGetInputSpacing()[0];
+		spc[1]=bbGetInputSpacing()[1];
+		spc[2]=bbGetInputSpacing()[2];
+      } else {
+	        spc[0]=spc[1]=spc[2]=1;
+       }
+
+       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];
+	}
+}  
 
+			
+void SphereList::GetColor(int i, double &cr,double &cg,double &cb)        
+ {
+	unsigned int j = 3*i +2;
+	if (j < bbGetInputColour().size() )
+	{
+		cr=bbGetInputColour()[3*i+0];
+		cg=bbGetInputColour()[3*i+1];
+		cb=bbGetInputColour()[3*i+2];
+		
+	} else {
+		int lastValidColorIndex = (bbGetInputColour().size()-1)/3;
+		lastValidColorIndex	= lastValidColorIndex*3;
+		cr=bbGetInputColour()[ lastValidColorIndex+0 ];
+		cg=bbGetInputColour()[ lastValidColorIndex+1 ];
+		cb=bbGetInputColour()[ lastValidColorIndex+2 ];
+	}
+}  
+
+void SphereList::Process()
+{
 	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 (sphereActor.size() != 0)
-                {
-                  for (int i = 0; i < sphereActor.size(); i++)
-                    sphereActor[i] -> GetProperty() -> SetOpacity( bbGetInputOpacity() );
-	        }
-                else
-                {
-                    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();
-                    printf("EED SphereList::Process   iMax=%d \n", iMax);
-                    for (int i = 0; i < iMax; i++)
-                      {
-                        std::cout << "CM SphereList::Process i=" <<  i  << " bbGetInputlstPointX()[i]=" << bbGetInputlstPointX()[i] << std::endl;
-                        std::cout << "CM SphereList::Process i=" <<  i  << " bbGetInputlstPointY()[i]=" << bbGetInputlstPointY()[i] << std::endl;
-                        std::cout << "CM SphereList::Process i=" <<  i  << " bbGetInputlstPointZ()[i]=" << bbGetInputlstPointZ()[i] << std::endl;
-                      }
-                    // 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 )
-                    {
-			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() )
+	  	int sizeLstX=bbGetInputlstPointX().size();	
+	  	int sizeLstY=bbGetInputlstPointY().size();
+	  	int sizeLstZ=bbGetInputlstPointZ().size();
+	  	int sizeLstActors=sphereActor.size();
+	  	if ((sizeLstX==sizeLstY) &&(sizeLstX==sizeLstZ))
+		{
+			if (sizeLstActors>sizeLstX)
 			{
-			    radio = bbGetInputlstRadio()[i];
-                        }
-			else
+				int i;
+				int diff=sizeLstActors-sizeLstX;
+				for (i=0;i<diff;i++)
+				{
+					bbGetInputRenderer()->RemoveActor( sphereActor[0] );
+					vtkspheresourceLst[0]->Delete();
+					sphereActor[0]->Delete();
+					vtkspheresourceLst.erase( vtkspheresourceLst.begin() );
+					sphereActor.erase( sphereActor.begin() );
+				} // for 
+			} // if size
+
+			if (sizeLstActors<sizeLstX)
 			{
-                            if (bbGetInputlstRadio().size()>=1)
-                            {
-                                radio = bbGetInputlstRadio()[ bbGetInputlstRadio().size() - 1 ];
-                            } 
-                            else 
-                            {
-                                radio = 1.0;
-                            }
-			}
-
-			// Sphere
-			vtkSphereSource * newSphere =  vtkSphereSource::New();
-
-			newSphere -> SetThetaResolution(20);
-			newSphere -> SetPhiResolution(20);
-			newSphere -> SetRadius(radio); 
-
-			vtkPolyDataMapper * newMapper = vtkPolyDataMapper::New();
-			newMapper -> SetInput( newSphere -> GetOutput() );
-	
-			vtkActor * newActor = vtkActor::New();
-			sphereActor.push_back(newActor);
-			newActor -> SetMapper(newMapper);
-			newActor -> SetOrigin(0, 0, 0);
-			
-			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 );
-	
-			if ( bbGetInputTransform()!=NULL )
-			{
-				newActor->SetUserTransform( bbGetInputTransform() );
-			}
-	
-
-			if (bbGetInputRenderer()!=NULL)
-			{
-			    bbGetInputRenderer() -> AddActor( newActor );
-			}
-
-                    } // for
+				int i;
+				int diff=sizeLstX-sizeLstActors;
+				for (i=0;i<diff;i++)
+				{
+					// Sphere
+					vtkSphereSource * newSphere = vtkSphereSource::New();
+					vtkspheresourceLst.push_back(newSphere);
+					newSphere -> SetThetaResolution(20);
+					newSphere -> SetPhiResolution(20);
+					newSphere -> SetRadius( 1 ); 
+					vtkPolyDataMapper * newMapper = vtkPolyDataMapper::New();
+					newMapper -> SetInput( newSphere -> GetOutput() );	
+					vtkActor * newActor = vtkActor::New();
+					sphereActor.push_back(newActor);
+					newActor -> SetMapper(newMapper);
+					newActor -> SetOrigin(0, 0, 0);				
+					if ( bbGetInputTransform()!=NULL )
+					{
+						newActor->SetUserTransform( bbGetInputTransform() );
+					}
+					bbGetInputRenderer()->AddActor( newActor );
+				} // for
+			} // if size
+
+			// Refresh data
+      		for (int i = 0; i < sphereActor.size() ; i++)
+        	{
+				double px = 0.0;
+				double py = 0.0;
+				double pz = 0.0;
+				double cr = 0.0;
+				double cg = 0.0;
+				double cb = 0.0;
+				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
+
+          	if (sphereActor.size() != 0)
+            {
+            	// Sets the output.
+            	bbSetOutputActorList(sphereActor);
+          	}
+  
+		} else {
+			printf("EED Warning!  SphereList::Process Lst XYZ are not of the same size.\n");
+		}// if sizeLst
+	} else {
+			printf("EED Warning!  SphereList::Process Render not assigned.\n");		
+	}// if Renderer
 
-                    if (sphereActor.size() != 0)
-                    {
-                        // Sets the output.
-                        bbSetOutputActorList(sphereActor);
-                    }
-                    
-                } // if (bbGetInputRenderer()!=NULL)
+//====================================================================
 
-        } // if (sphereActor.size() != 0)
 }
 
+
 void SphereList::bbUserSetDefaultValues()
 {