X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=packages%2Fvtk%2Fsrc%2FbbvtkIsoSurfaceExtractor.cxx;h=ae9a7fe9aacae536a3f9c4e188699f6950206a96;hb=c9290f68cfff1094e0548fae2beb996476e5a496;hp=3e4e55f32979a9f56d9f8abbdb86cbae3de24272;hpb=4ad5b5ee44357ad873bc8c43230defb6d0a79879;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkIsoSurfaceExtractor.cxx b/packages/vtk/src/bbvtkIsoSurfaceExtractor.cxx
index 3e4e55f..ae9a7fe 100644
--- a/packages/vtk/src/bbvtkIsoSurfaceExtractor.cxx
+++ b/packages/vtk/src/bbvtkIsoSurfaceExtractor.cxx
@@ -1,21 +1,33 @@
-
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbvtkIsoSurfaceExtractor.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/04/18 12:59:52 $
-  Version:   $Revision: 1.4 $
-                                                                                
-  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
-  l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details.
-                                                                                
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
-                                                                                
+  Date:      $Date: 2009/05/28 08:55:44 $
+  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 
@@ -25,6 +37,7 @@
 #ifdef _USE_VTK_
 
 #include "vtkProperty.h"
+#include "vtkLinearTransform.h"
 
 #include "bbvtkIsoSurfaceExtractor.h"
 #include "bbvtkPackage.h"
@@ -34,73 +47,100 @@ namespace bbvtk
    BBTK_ADD_BLACK_BOX_TO_PACKAGE(vtk,IsoSurfaceExtractor)
    BBTK_BLACK_BOX_IMPLEMENTATION(IsoSurfaceExtractor,bbtk::AtomicBlackBox);
 
-   void IsoSurfaceExtractor::bbUserConstructor() 
-   { 
-     Init();
-     std::vector<double> colour;
-     colour.push_back(1.0);
-     colour.push_back(1.0);
-     colour.push_back(0.5);
-     bbSetInputColour(colour);
-
-   }
-   void IsoSurfaceExtractor::bbUserCopyConstructor() 
+   void IsoSurfaceExtractor::bbUserSetDefaultValues() 
    { 
-     Init();
+     //	   printf("EED %p IsoSurfaceExtractor::bbUserConstructor \n", this);
+	   firsttime=true;
+	   std::vector<double> colour;
+	   colour.push_back(1.0);
+	   colour.push_back(1.0);
+	   colour.push_back(0.5);
+	   bbSetInputColour(colour);
+
+	   bbSetInputIn(NULL);
+	   //     bbSetInputInVtkObject(NULL);
+	   bbSetInputRenderer(NULL);
+	   bbSetInputTransform(NULL);
+	   bbSetInputIsovalue(400);
+	   bbSetInputOpacity(1);
+
+	   marchingcubes	= NULL;
+	   polydatamapper	= NULL;
+	   vtkactor         = NULL;
    }
 
-   void IsoSurfaceExtractor::Init() 
-   { 
-     firsttime=true;
-
-	  bbSetInputIn(NULL);
-	  //     bbSetInputInVtkObject(NULL);
-	  //     bbSetInputRenderer(NULL);
-     bbSetInputIsovalue(400);
-     bbSetInputOpacity(1);
-	 
-	 marchingcubes	= vtkMarchingCubes::New();
+
+	//---------------------------------------------------------------------
+   void IsoSurfaceExtractor::bbUserInitializeProcessing() 
+   { 	 
+     marchingcubes	= vtkMarchingCubes::New();
      polydatamapper	= vtkPolyDataMapper::New();
-     vtkactor        = vtkActor::New();
+     vtkactor           = vtkActor::New();
 
      polydatamapper->SetInput(marchingcubes->GetOutput());
      vtkactor->SetMapper(polydatamapper);
 
      polydatamapper->ScalarVisibilityOff();
      polydatamapper->ImmediateModeRenderingOn();
+   }
 
-
-}
-
+	//---------------------------------------------------------------------
+	void IsoSurfaceExtractor::bbUserFinalizeProcessing() 
+	{ 
+		if (marchingcubes!=NULL)
+		{
+			marchingcubes->Delete();
+			marchingcubes=NULL;
+		}
+
+		
+		if (polydatamapper!=NULL)
+		{
+			polydatamapper->Delete();
+			polydatamapper=NULL;
+		}
+
+		if (vtkactor!=NULL)
+		{
+			vtkactor->Delete();
+			vtkactor=NULL;
+		}
+		
+		
+		
+		
+	}
+	
+	
 //---------------------------------------------------------------------
 
    void IsoSurfaceExtractor::DoProcess()
    {
-     //   bbGetInputIn()->Print(std::cout);
-     // Visualisation - result volume
+     //printf("EED %p IsoSurfaceExtractor::DoProcess \n", this);
      marchingcubes->SetInput( bbGetInputIn() );
      marchingcubes->SetValue(0,  bbGetInputIsovalue() );
      marchingcubes->Update();
      
-     // if (_2_isoActorMC6!=NULL)
-     //  {
-     //   bbGetInputRenderer()->RemoveActor(vtkactor);
-     //  }
-     
-     vtkactor->GetProperty()->SetColor( bbGetInputColour()[0],  bbGetInputColour()[1], bbGetInputColour()[2] );
+     vtkactor->GetProperty()->SetColor( bbGetInputColour()[0],  
+					bbGetInputColour()[1], 
+					bbGetInputColour()[2] );
      
      
      vtkactor->GetProperty()->SetOpacity( bbGetInputOpacity() );
-     bbSetOutputOut( vtkactor );
      
-     // Interface Update
-     /* 
-     if ((firsttime==true) && (bbGetInputRenderer()!=NULL ))
+     if ( bbGetInputTransform()!=NULL )
        {
-	 firsttime=false;
-	 bbGetInputRenderer()->AddActor( vtkactor );
+	 vtkactor->SetUserTransform( bbGetInputTransform() );
        }
-     */
+
+     bbSetOutputOut( vtkactor );
+
+     // Interface Update
+     if ((firsttime==true) && (bbGetInputRenderer()!=NULL ))
+     {
+       firsttime=false;
+       bbGetInputRenderer()->AddActor( vtkactor );
+     } 
    }
 } // EO namespace bbtk