X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkSegmentationConnectivity.cxx;h=da6d9c9720a408bd01104d7f28068ebab531d751;hb=7a10db8c8166b77b7da88846127431f732be69bc;hp=ff5d11f6d4ffd07278f6a75c2b4de5709842b24f;hpb=551b02f0819a98e9595a81570b1d1174f398f34d;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkSegmentationConnectivity.cxx b/packages/vtk/src/bbvtkSegmentationConnectivity.cxx
index ff5d11f..da6d9c9 100644
--- a/packages/vtk/src/bbvtkSegmentationConnectivity.cxx
+++ b/packages/vtk/src/bbvtkSegmentationConnectivity.cxx
@@ -1,79 +1,120 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbvtkSegmentationConnectivity.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/05/09 10:39:47 $
-  Version:   $Revision: 1.3 $
-                                                                                
-  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: 2010/04/08 14:37:59 $
+  Version:   $Revision: 1.6 $
 =========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* 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 
  */
 
-
 #ifdef _USE_VTK_
 
-
 #include "bbvtkSegmentationConnectivity.h"
 #include "bbvtkPackage.h"
 
 namespace bbvtk
 {
-
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(vtk,SegmentationConnectivity);
   BBTK_BLACK_BOX_IMPLEMENTATION(SegmentationConnectivity,
 				bbtk::AtomicBlackBox);
-  
-  
-  void SegmentationConnectivity::bbUserConstructor() 
+
+// --------------------------------------------------------------
+
+  void SegmentationConnectivity::bbUserSetDefaultValues() 
   { 
-    bbSetInputIn(NULL);
-    std::vector<int> position;
-    position.push_back(0);
-    position.push_back(0);
-    position.push_back(0);
-    bbSetInputPositionXYZ(position);
-    std::vector<int> threshold;
-    threshold.push_back(0);
-    threshold.push_back(0);
-    bbSetInputThresholdMinMax(threshold);
-    bbSetOutputOut(NULL);
-    thresh2 = vtkImageThreshold::New();
-    thresh2->SetInValue(255);
-    thresh2->SetOutputScalarTypeToUnsignedShort();
-    thresh2->SetOutValue(0);
-    cast2 = vtkImageCast::New();
-    cast2->SetInput(thresh2->GetOutput());
-    cast2->SetOutputScalarTypeToUnsignedChar();
-    connect2 = vtkImageSeedConnectivity::New();
-    connect2->SetInput(cast2->GetOutput());
-    connect2->SetInputConnectValue(255);
-    connect2->SetOutputConnectedValue(255);
-    connect2->SetOutputUnconnectedValue(0);
-    cast4 = vtkImageCast::New();
-    cast4->SetInput(connect2->GetOutput());
-    cast4->SetOutputScalarTypeToUnsignedShort();
+	  thresh2	= NULL;
+	  cast2		= NULL;
+	  connect2	= NULL;
+	  cast4		= NULL;
+		
+	  bbSetInputIn(NULL);
+	  std::vector<int> position;
+	  position.push_back(0);
+	  position.push_back(0);
+	  position.push_back(0);
+	  bbSetInputPositionXYZ(position);
+	  std::vector<int> threshold;
+	  threshold.push_back(0);
+	  threshold.push_back(0);
+	  bbSetInputThresholdMinMax(threshold);
+	  bbSetOutputOut(NULL);
   }
-  
-  
-  void SegmentationConnectivity::bbUserDestructor() 
+
+// --------------------------------------------------------------
+		
+	void SegmentationConnectivity::bbUserInitializeProcessing()
+	{
+		thresh2 = vtkImageThreshold::New();
+			thresh2->SetInValue(255);
+			thresh2->SetOutputScalarTypeToUnsignedShort();
+			thresh2->SetOutValue(0);
+		cast2 = vtkImageCast::New();
+			cast2->SetInput(thresh2->GetOutput());
+			cast2->SetOutputScalarTypeToUnsignedChar();
+		connect2 = vtkImageSeedConnectivity::New();
+			connect2->SetInput(cast2->GetOutput());
+			connect2->SetInputConnectValue(255);
+			connect2->SetOutputConnectedValue(255);
+			connect2->SetOutputUnconnectedValue(0);
+		cast4 = vtkImageCast::New();
+			cast4->SetInput(connect2->GetOutput());
+			cast4->SetOutputScalarTypeToUnsignedShort();
+	}
+
+// --------------------------------------------------------------
+		
+  void SegmentationConnectivity::bbUserFinalizeProcessing() 
   { 
-    thresh2->Delete();
-    cast2->Delete();
-    connect2->Delete();
-    cast4->Delete();
+	  if (thresh2!=NULL)
+	  {
+		  thresh2->Delete();
+		  thresh2=NULL;
+	  }
+	  if (cast2!=NULL)
+	  {
+		  cast2->Delete();
+		  cast2=NULL;
+	  }
+	  if (connect2!=NULL)
+	  {
+		  connect2->Delete();
+		  connect2=NULL;
+	  }
+	  if (cast4!=NULL)
+	  {
+		  cast4->Delete();
+		  cast4=NULL;
+	  }  
   }
 
+// --------------------------------------------------------------
+		
   void SegmentationConnectivity::DoProcess()
   {
     vtkImageData *imagedata = bbGetInputIn();
@@ -93,10 +134,8 @@ namespace bbvtk
     bbSetOutputOut(cast4->GetOutput() );	  
   }
   
-
 }// EO namespace bbvtk
 
-
 #endif //_USE_VTK_