X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkPolyDataToActor.cxx;h=d56af36bab4d4e0a0d3366ca2b0a214c9b4dd952;hb=2ab6bff6c5478054c4fdc9d37304b28151251acb;hp=21aef0d8226b25781bb0908a1d70bbb5ba2e719b;hpb=cfad95b6e08e6e53846ffcda7fbc5932065f2c47;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkPolyDataToActor.cxx b/packages/vtk/src/bbvtkPolyDataToActor.cxx
index 21aef0d..d56af36 100644
--- a/packages/vtk/src/bbvtkPolyDataToActor.cxx
+++ b/packages/vtk/src/bbvtkPolyDataToActor.cxx
@@ -47,6 +47,7 @@
 #include "bbvtkPolyDataToActor.h"
 #include "bbvtkPackage.h"
 
+
 namespace bbvtk
 {
    BBTK_ADD_BLACK_BOX_TO_PACKAGE(vtk,PolyDataToActor)
@@ -54,20 +55,20 @@ namespace bbvtk
 
    void PolyDataToActor::bbUserSetDefaultValues() 
    { 
-	   firsttime=true;
+	   actorAdded=false;
 	   std::vector<double> colour;
 	   colour.push_back(1.0);
 	   colour.push_back(1.0);
 	   colour.push_back(0.5);
 	   bbSetInputColour(colour);
-
+	   bbSetInputActive(true);
 	   bbSetInputIn(NULL);
 	   bbSetInputRenderer(NULL);
 	   bbSetInputTransform(NULL);
 	   bbSetInputOpacity(1);
 	   bbSetInputRepresentation(2);
 	   bbSetInputLineWidth(1);
-
+	   bbSetInputScalarVisibility(false);
 	   polydatamapper = NULL;
 	   vtkactor       = NULL;
    }
@@ -82,7 +83,6 @@ namespace bbvtk
 //     polydatamapper->SetInput(marchingcubes->GetOutput());
      vtkactor->SetMapper(polydatamapper);
 
-     polydatamapper->ScalarVisibilityOff();
      polydatamapper->ImmediateModeRenderingOn();
    }
 
@@ -104,33 +104,64 @@ namespace bbvtk
 	
 //---------------------------------------------------------------------
 
-   void PolyDataToActor::DoProcess()
-   {	   
-     polydatamapper->SetInput( bbGetInputIn() );
-     
-	 vtkactor->GetProperty()->SetRepresentation( bbGetInputRepresentation() );
-	 vtkactor->GetProperty()->SetLineWidth( bbGetInputLineWidth() );
-	   
-     vtkactor->GetProperty()->SetColor( bbGetInputColour()[0],  
-					bbGetInputColour()[1], 
-					bbGetInputColour()[2] );
-          
-     vtkactor->GetProperty()->SetOpacity( bbGetInputOpacity() );
-     
-     if ( bbGetInputTransform()!=NULL )
-     {
-        vtkactor->SetUserTransform( bbGetInputTransform() );
-     }
-
-     bbSetOutputOut( vtkactor );
-
-     // Interface Update
-     if ((firsttime==true) && (bbGetInputRenderer()!=NULL ))
-     {
-       firsttime=false;
-       bbGetInputRenderer()->AddActor( vtkactor );
-     } 
-   }
+	void PolyDataToActor::DoProcess()
+   	{
+
+		if (bbGetInputActive()==true)
+		{
+			polydatamapper->SetInput( bbGetInputIn() );
+			vtkactor->GetProperty()->SetRepresentation( bbGetInputRepresentation() );
+			if (bbGetInputRepresentation()==1)
+			{
+				 vtkactor->GetProperty()->SetAmbient(1);
+				 vtkactor->GetProperty()->SetDiffuse(1);
+				 vtkactor->GetProperty()->SetSpecular(0);
+			} else {
+printf("EED WARNNING!  PolyDataToActor::DoProcess  which is the default values of Ambient, Diffuse, Specular ? \n");
+			}
+
+
+			 vtkactor->GetProperty()->SetLineWidth( bbGetInputLineWidth() );
+			   
+			 vtkactor->GetProperty()->SetColor( bbGetInputColour()[0],  
+							bbGetInputColour()[1], 
+							bbGetInputColour()[2] );
+				  
+			 vtkactor->GetProperty()->SetOpacity( bbGetInputOpacity() );
+
+			 
+			 if ( bbGetInputTransform()!=NULL )
+			 {
+				vtkactor->SetUserTransform( bbGetInputTransform() );
+			 }
+
+			 bbSetOutputOut( vtkactor );
+
+			 // Interface Update
+			 if ((actorAdded==false) && (bbGetInputRenderer()!=NULL ))
+			 {
+			   actorAdded=true;
+			   bbGetInputRenderer()->AddActor( vtkactor );
+			 }  // actorAdded
+
+			 if (bbGetInputScalarVisibility()==true )
+			 {
+				 polydatamapper->ScalarVisibilityOn();
+			 } else {
+				 polydatamapper->ScalarVisibilityOff();
+			 } // ScalarVisibility
+		} else {
+			 // Interface Update
+			 if ((actorAdded==true) && (bbGetInputRenderer()!=NULL ))
+			 {
+			   actorAdded=false;
+			   bbGetInputRenderer()->RemoveActor( vtkactor );
+			 }  // actorAdded
+		} // Active
+	}
+
+
+
 } // EO namespace bbtk
 
 #endif //_USE_VTK_