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

diff --git a/packages/vtk/src/bbvtkSegmentationConnectivity.cxx b/packages/vtk/src/bbvtkSegmentationConnectivity.cxx
index ec416f1..ff5d11f 100644
--- a/packages/vtk/src/bbvtkSegmentationConnectivity.cxx
+++ b/packages/vtk/src/bbvtkSegmentationConnectivity.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbvtkSegmentationConnectivity.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/04/24 12:56:41 $
-  Version:   $Revision: 1.1 $
+  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
@@ -30,60 +30,69 @@
 namespace bbvtk
 {
 
-	BBTK_ADD_BLACK_BOX_TO_PACKAGE(vtk,SegmentationConnectivity)
-	BBTK_USER_BLACK_BOX_IMPLEMENTATION(SegmentationConnectivity,bbtk::AtomicBlackBox);
-
-
-	void SegmentationConnectivity::bbUserConstructor() 
-   { 
-      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();
-   }
-
+  BBTK_ADD_BLACK_BOX_TO_PACKAGE(vtk,SegmentationConnectivity);
+  BBTK_BLACK_BOX_IMPLEMENTATION(SegmentationConnectivity,
+				bbtk::AtomicBlackBox);
+  
+  
+  void SegmentationConnectivity::bbUserConstructor() 
+  { 
+    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();
+  }
+  
+  
+  void SegmentationConnectivity::bbUserDestructor() 
+  { 
+    thresh2->Delete();
+    cast2->Delete();
+    connect2->Delete();
+    cast4->Delete();
+  }
 
   void SegmentationConnectivity::DoProcess()
   {
-	vtkImageData *imagedata = bbGetInputIn();
-	imagedata->UpdateInformation();
-	imagedata->SetUpdateExtent(imagedata->GetWholeExtent());
-	imagedata->Update();
-	thresh2->ThresholdBetween(3000, 3001);
-	thresh2->SetInput(imagedata);
-	thresh2->ThresholdBetween(bbGetInputThresholdMinMax()[0], bbGetInputThresholdMinMax()[1]);
-	thresh2->Update();
-	cast2->Update();
-	connect2->RemoveAllSeeds ();
-	connect2->AddSeed( bbGetInputPositionXYZ()[0] , bbGetInputPositionXYZ()[1] , bbGetInputPositionXYZ()[2] );
-	connect2->Update();
-	cast4->Update();
-
+    vtkImageData *imagedata = bbGetInputIn();
+    imagedata->UpdateInformation();
+    imagedata->SetUpdateExtent(imagedata->GetWholeExtent());
+    imagedata->Update();
+    thresh2->ThresholdBetween(3000, 3001);
+    thresh2->SetInput(imagedata);
+    thresh2->ThresholdBetween(bbGetInputThresholdMinMax()[0], bbGetInputThresholdMinMax()[1]);
+    thresh2->Update();
+    cast2->Update();
+    connect2->RemoveAllSeeds ();
+    connect2->AddSeed( bbGetInputPositionXYZ()[0] , bbGetInputPositionXYZ()[1] , bbGetInputPositionXYZ()[2] );
+    connect2->Update();
+    cast4->Update();
+    
     bbSetOutputOut(cast4->GetOutput() );	  
   }
-
+  
 
 }// EO namespace bbvtk