*** empty log message ***

[bbtk.git] / packages / vtk / src / bbvtkIsoSurfaceExtractor.cxx

diff --git a/packages/vtk/src/bbvtkIsoSurfaceExtractor.cxx b/packages/vtk/src/bbvtkIsoSurfaceExtractor.cxx
index 3e4e55f32979a9f56d9f8abbdb86cbae3de24272..3c311e93a2816ccdfd60321b2e68b6990435ed12 100644 (file)
--- 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: 2008/11/20 17:41:48 $
+  Version:   $Revision: 1.8 $
 =========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* 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,34 +54,39 @@ namespace bbvtk
      colour.push_back(1.0);
      colour.push_back(0.5);
      bbSetInputColour(colour);
-
+        bbSetInputTransform(NULL);
    }
    void IsoSurfaceExtractor::bbUserCopyConstructor() 
    { 
      Init();
    }
 
+   void IsoSurfaceExtractor::bbUserDestructor() 
+   { 
+     marchingcubes->Delete();
+     polydatamapper->Delete();
+     vtkactor->Delete();
+  }
+
    void IsoSurfaceExtractor::Init() 
    { 
      firsttime=true;
 
-         bbSetInputIn(NULL);
-         //     bbSetInputInVtkObject(NULL);
-         //     bbSetInputRenderer(NULL);
+     bbSetInputIn(NULL);
+     //     bbSetInputInVtkObject(NULL);
+     bbSetInputRenderer(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();
-
-
 }
 
 //---------------------------------------------------------------------
@@ -82,25 +99,26 @@ namespace bbvtk
      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() );
+       
+        if ( bbGetInputTransform()!=NULL )
+        {
+                vtkactor->SetUserTransform( bbGetInputTransform() );
+        }
+
      bbSetOutputOut( vtkactor );
      
      // Interface Update
-     /* 
      if ((firsttime==true) && (bbGetInputRenderer()!=NULL ))
-       {
-        firsttime=false;
-        bbGetInputRenderer()->AddActor( vtkactor );
-       }
-     */
+     {
+               firsttime=false;
+           bbGetInputRenderer()->AddActor( vtkactor );
+     }
    }
 } // EO namespace bbtk