From: Eduardo DAVILA Date: Sun, 19 Apr 2020 17:50:59 +0000 (+0200) Subject: #3398 BBTK Bug New Normal - box SegmentationConnectivity Initialisation parameters X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=974e68c27d558e59ff4c6454ba10f7f1a6d9fa6a;p=bbtk.git #3398 BBTK Bug New Normal - box SegmentationConnectivity Initialisation parameters --- diff --git a/packages/vtk/src/bbvtkSegmentationConnectivity.cxx b/packages/vtk/src/bbvtkSegmentationConnectivity.cxx index a88876b..1f2758e 100644 --- a/packages/vtk/src/bbvtkSegmentationConnectivity.cxx +++ b/packages/vtk/src/bbvtkSegmentationConnectivity.cxx @@ -59,7 +59,6 @@ namespace bbvtk // cast2 = NULL; connect2 = NULL; cast4 = NULL; - bbSetInputIn(NULL); std::vector position; position.push_back(0); @@ -71,30 +70,24 @@ namespace bbvtk threshold.push_back(0); bbSetInputThresholdMinMax(threshold); bbSetOutputOut(NULL); - bbSetInputOutputFormat("SAME"); bbSetInputValue(255); - - } -// -------------------------------------------------------------- - +// -------------------------------------------------------------- void SegmentationConnectivity::bbUserInitializeProcessing() { - thresh2 = vtkImageThreshold::New(); thresh2->SetInValue(255); + thresh2->SetOutValue(0); thresh2->SetOutputScalarTypeToUnsignedChar(); connect2 = vtkImageSeedConnectivity::New(); - //EED 2017-01-01 Migration VTK7 #if VTK_MAJOR_VERSION <= 5 connect2->SetInput(thresh2->GetOutput()); #else connect2->SetInputData(thresh2->GetOutput()); #endif - connect2->SetInputConnectValue(255); connect2->SetOutputConnectedValue( 255 ); connect2->SetOutputUnconnectedValue(0); @@ -105,31 +98,9 @@ namespace bbvtk #else cast4->SetInputData(connect2->GetOutput()); #endif - -// EED 2016 06 15 - -/* - 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() { if (thresh2!=NULL) @@ -154,14 +125,9 @@ namespace bbvtk } } - - - // -------------------------------------------------------------- - void SegmentationConnectivity::DoProcess() { - int x,y,z; int i,numPoints = bbGetInputPositionXYZ().size()/3; int verif = (bbGetInputPositionXYZ().size()-1) % 3; @@ -176,29 +142,22 @@ namespace bbvtk imagedata->Update(); thresh2->SetInput(imagedata); #else - imagedata->SetExtent(imagedata->GetExtent()); +// imagedata->SetExtent(imagedata->GetExtent()); thresh2->SetInputData(imagedata); #endif - - thresh2->ThresholdBetween(3000, 3001); thresh2->ThresholdBetween(bbGetInputThresholdMinMax()[0], bbGetInputThresholdMinMax()[1]); - thresh2->Modified(); thresh2->Update(); connect2->RemoveAllSeeds (); - int ext[6]; - //EED 2017-01-01 Migration VTK7 #if VTK_MAJOR_VERSION <= 5 imagedata->GetWholeExtent(ext); #else imagedata->GetExtent(ext); #endif - int maxX = ext[1]-ext[0]+1; int maxY = ext[3]-ext[2]+1; int maxZ = ext[5]-ext[4]+1; - for (i=0;iSetOutputConnectedValue( bbGetInputValue() ); cast4->SetOutputScalarType( outputformat ); @@ -222,9 +180,7 @@ namespace bbvtk printf("EED WARNNIG! In box: SegmentationConnectivity List of points are not coherent. \n"); bbSetOutputOut( NULL ); }// if numPoints verif - } - }// EO namespace bbvtk