X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkIsoSurfaceExtractor.cxx;h=3aa3a37c952c53945af51ea34ae9ac0072e6e2cf;hb=6cfd155d0c3f67ed2b8ce1e7e6f0ffebddd59802;hp=e4bbc81577a1ffd08ae0fc13dc60c882e3ff7aef;hpb=b4af0750ea7d8e5793a76f5c3d79668a31c1729b;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkIsoSurfaceExtractor.cxx b/packages/vtk/src/bbvtkIsoSurfaceExtractor.cxx
index e4bbc81..3aa3a37 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/03/03 14:10:03 $
-  Version:   $Revision: 1.2 $
-                                                                                
-  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: 2008/11/25 11:17:23 $
+  Version:   $Revision: 1.10 $
 =========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* 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"
@@ -32,7 +45,7 @@
 namespace bbvtk
 {
    BBTK_ADD_BLACK_BOX_TO_PACKAGE(vtk,IsoSurfaceExtractor)
-   BBTK_USER_BLACK_BOX_IMPLEMENTATION(IsoSurfaceExtractor,bbtk::AtomicBlackBox);
+   BBTK_BLACK_BOX_IMPLEMENTATION(IsoSurfaceExtractor,bbtk::AtomicBlackBox);
 
    void IsoSurfaceExtractor::bbUserConstructor() 
    { 
@@ -42,64 +55,69 @@ namespace bbvtk
      colour.push_back(1.0);
      colour.push_back(0.5);
      bbSetInputColour(colour);
-
    }
-   void IsoSurfaceExtractor::bbUserCopyConstructor() 
+   void IsoSurfaceExtractor::bbUserCopyConstructor(bbtk::BlackBox::Pointer from) 
    { 
      Init();
    }
 
+   void IsoSurfaceExtractor::bbUserDestructor() 
+   { 
+     marchingcubes->Delete();
+     polydatamapper->Delete();
+     vtkactor->Delete();
+  }
+
    void IsoSurfaceExtractor::Init() 
    { 
      firsttime=true;
 
-	  bbSetInputIn(NULL);
-     bbSetInputInVtkObject(NULL);
+     bbSetInputIn(NULL);
+     //     bbSetInputInVtkObject(NULL);
      bbSetInputRenderer(NULL);
+     bbSetInputTransform(NULL);
      bbSetInputIsovalue(400);
      bbSetInputOpacity(1);
 	 
-	 marchingcubes	= vtkMarchingCubes::New();
+     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::DoProcess()
    {
-     //   bbGetInputIn()->Print(std::cout);
-     // Visualisation - result volume
      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