X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkSegmentationConnectivity.cxx;h=215516ea3e47765ef6b33f8400661685f2bf48e5;hb=180e7479a79e0eda35693e68ed04e994dce96096;hp=ff5d11f6d4ffd07278f6a75c2b4de5709842b24f;hpb=551b02f0819a98e9595a81570b1d1174f398f34d;p=bbtk.git diff --git a/packages/vtk/src/bbvtkSegmentationConnectivity.cxx b/packages/vtk/src/bbvtkSegmentationConnectivity.cxx index ff5d11f..215516e 100644 --- a/packages/vtk/src/bbvtkSegmentationConnectivity.cxx +++ b/packages/vtk/src/bbvtkSegmentationConnectivity.cxx @@ -1,102 +1,191 @@ +/* + # --------------------------------------------------------------------- + # + # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image + # pour la SantÈ) + # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton + # Previous Authors : Laurent Guigues, Jean-Pierre Roux + # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil + # + # 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. + # ------------------------------------------------------------------------ */ + + /*========================================================================= - 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: 2012/11/16 08:51:58 $ + Version: $Revision: 1.8 $ =========================================================================*/ + /** * \file * \brief */ - #ifdef _USE_VTK_ - #include "bbvtkSegmentationConnectivity.h" #include "bbvtkPackage.h" +#include "bbtkStaticLecture.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 position; - position.push_back(0); - position.push_back(0); - position.push_back(0); - bbSetInputPositionXYZ(position); - std::vector 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 position; + position.push_back(0); + position.push_back(0); + position.push_back(0); + bbSetInputPositionXYZ(position); + std::vector threshold; + threshold.push_back(0); + threshold.push_back(1); + bbSetInputThresholdMinMax(threshold); + bbSetOutputOut(NULL); + bbSetInputOutputFormat("SAME"); + bbSetInputValue(255); } - - - void SegmentationConnectivity::bbUserDestructor() + +// -------------------------------------------------------------- + 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); + cast4 = vtkImageCast::New(); +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 + cast4->SetInput(connect2->GetOutput()); +#else + cast4->SetInputData(connect2->GetOutput()); +#endif + } + +// -------------------------------------------------------------- + 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(); - 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() ); - } + int x,y,z; + int i,numPoints = bbGetInputPositionXYZ().size()/3; + int verif = (bbGetInputPositionXYZ().size()-1) % 3; + if (( numPoints>=1) && (verif==2) && (bbGetInputIn()!=NULL)) + { +//EED 2020-01-18 + int outputformat = bbtkStaticLecture::GetTypeFormat( bbGetInputOutputFormat() , bbGetInputIn() ); +// int outputformat=4; + vtkImageData *imagedata = bbGetInputIn(); +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 + imagedata->UpdateInformation(); + imagedata->SetUpdateExtent(imagedata->GetWholeExtent()); + imagedata->Update(); + thresh2->SetInput(imagedata); +#else +// imagedata->SetExtent(imagedata->GetExtent()); + thresh2->SetInputData(imagedata); +#endif + thresh2->ThresholdBetween(bbGetInputThresholdMinMax()[0], bbGetInputThresholdMinMax()[1]); + 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;i=0) || (x=0) || (y=0) || (zAddSeed( x,y,z ); + } else { + printf("EED WARNNIG! In box: SegmentationConnectivity points list out of range \n"); + } // if point inside image + } // for i + connect2->SetOutputConnectedValue( bbGetInputValue() ); + cast4->SetOutputScalarType( outputformat ); + connect2->Modified(); + connect2->Update(); + cast4->Update(); + bbSetOutputOut(cast4->GetOutput() ); + } else { + printf("EED WARNNIG! In box: SegmentationConnectivity List of points are not coherent. \n"); + bbSetOutputOut( NULL ); + }// if numPoints verif +} - }// EO namespace bbvtk - #endif //_USE_VTK_