X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkPolyDataToActor.cxx;h=1af68a234c07f03e8013f911a2ccf2a7d1e72865;hb=daf434343deecc059445cf8f478da95345911896;hp=73d46a1ecd6f5ac84a310894165bbb4e9832f471;hpb=f9bd86194f26f89354a730d12ec7fab56a6dc14d;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkPolyDataToActor.cxx b/packages/vtk/src/bbvtkPolyDataToActor.cxx
index 73d46a1..1af68a2 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 
@@ -60,22 +65,25 @@ namespace bbvtk
 	   bbSetInputRenderer(NULL);
 	   bbSetInputTransform(NULL);
 	   bbSetInputOpacity(1);
+	   bbSetInputRepresentation(2);
+	   bbSetInputLineWidth(1);
 
-	   polydatamapper	= NULL;
-	   vtkactor         = NULL;
+	   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->ScalarVisibilityOff();
+//     polydatamapper->ScalarVisibilityOn();
      polydatamapper->ImmediateModeRenderingOn();
    }
 
@@ -99,8 +107,11 @@ namespace bbvtk
 
    void PolyDataToActor::DoProcess()
    {	   
-	   polydatamapper->SetInput( bbGetInputIn() );
+     polydatamapper->SetInput( bbGetInputIn() );
      
+	 vtkactor->GetProperty()->SetRepresentation( bbGetInputRepresentation() );
+	 vtkactor->GetProperty()->SetLineWidth( bbGetInputLineWidth() );
+	   
      vtkactor->GetProperty()->SetColor( bbGetInputColour()[0],  
 					bbGetInputColour()[1], 
 					bbGetInputColour()[2] );