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

diff --git a/packages/vtk/src/bbvtkPolyDataToActor.cxx b/packages/vtk/src/bbvtkPolyDataToActor.cxx
index 3645ce8..d56af36 100644
--- a/packages/vtk/src/bbvtkPolyDataToActor.cxx
+++ b/packages/vtk/src/bbvtkPolyDataToActor.cxx
@@ -1,4 +1,31 @@
-/*=========================================================================                                                                               
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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.
+ # ------------------------------------------------------------------------ */
+
+
+/*=========================================================================
   Program:   bbtk
   Module:    $RCSfile: bbvtkPolyDataToActor.cxx,v $
   Language:  C++
@@ -6,28 +33,6 @@
   Version:   $Revision: 1.15 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
-* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
-*
-*  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.
-* ------------------------------------------------------------------------ */                                                                         
-
 /**
  *  \file 
  *  \brief 
@@ -42,6 +47,7 @@
 #include "bbvtkPolyDataToActor.h"
 #include "bbvtkPackage.h"
 
+
 namespace bbvtk
 {
    BBTK_ADD_BLACK_BOX_TO_PACKAGE(vtk,PolyDataToActor)
@@ -49,33 +55,34 @@ 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);
-
-	   polydatamapper	= NULL;
-	   vtkactor         = NULL;
+	   bbSetInputRepresentation(2);
+	   bbSetInputLineWidth(1);
+	   bbSetInputScalarVisibility(false);
+	   polydatamapper = NULL;
+	   vtkactor       = NULL;
    }
 
 
 	//---------------------------------------------------------------------
    void PolyDataToActor::bbUserInitializeProcessing() 
    { 	 
-     polydatamapper	= vtkPolyDataMapper::New();
+     polydatamapper = vtkPolyDataMapper::New();
      vtkactor       = vtkActor::New();
 
 //     polydatamapper->SetInput(marchingcubes->GetOutput());
      vtkactor->SetMapper(polydatamapper);
 
-     polydatamapper->ScalarVisibilityOff();
      polydatamapper->ImmediateModeRenderingOn();
    }
 
@@ -97,32 +104,64 @@ namespace bbvtk
 	
 //---------------------------------------------------------------------
 
-   void PolyDataToActor::DoProcess()
-   {
-	   std::cout <<  "EED PolyDataToActor::DoProcess" << std::endl;
-	   
-	   polydatamapper->SetInput( bbGetInputIn() );
-     
-     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_