From: schaerer Date: Tue, 27 Jul 2010 08:17:13 +0000 (+0000) Subject: remove the old filters directory X-Git-Tag: v1.2.0~470 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=5494029e0c17f42b90691180f9cc79aaef066512;p=clitk.git remove the old filters directory --- diff --git a/filters/.cvsignore b/filters/.cvsignore deleted file mode 100644 index 59659d6..0000000 --- a/filters/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*_ggo.* diff --git a/filters/CMakeLists.txt b/filters/CMakeLists.txt deleted file mode 100644 index 9225fd7..0000000 --- a/filters/CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ -#========================================================= -INCLUDE(../cmake/common.cmake) - -#========================================================= -# make clitk libraries - -# WRAP_GGO(clitkFilters_GGO_C -# clitkBinarizeImage.ggo -# clitkUnsharpMask.ggo -# clitkFooImage.ggo -# clitkImageArithm.ggo -# clitkMedianImageFilter.ggo -# clitkAutoCrop.ggo -# clitkImageResample.ggo -# ) - -# SET(clitkFilters_SRC -# ${clitkFilters_GGO_C} -# clitkGuerreroVentilationGenericFilter.cxx -# clitkImageConvertGenericFilter.cxx -# clitkImageFillRegionGenericFilter.cxx -# clitkImageResampleGenericFilter.cxx -# ../tools/clitkResampleImageGenericFilter.cxx -# clitkSplitImageGenericFilter.cxx -# clitkVFResampleGenericFilter.cxx -# clitkMedianImageGenericFilter.cxx -# ) - - -# ADD_LIBRARY(clitkFilters STATIC ${clitkFilters_SRC}) diff --git a/filters/clitkBinarizeImage.ggo b/filters/clitkBinarizeImage.ggo deleted file mode 100644 index 6f99548..0000000 --- a/filters/clitkBinarizeImage.ggo +++ /dev/null @@ -1,18 +0,0 @@ -#File clitkBinarizeImage.ggo -package "clitkBinarizeImage" -version "1.0" -purpose "" - -option "config" - "Config file" string no -option "verbose" v "Verbose" flag off -option "imagetypes" - "Display allowed image types" flag off - -option "input" i "Input image filename" string yes -option "output" o "Output image filename" string yes -option "lower" l "Lower intensity (default=min), fg is greater than this value" double no -option "upper" u "Upper intensity (default=max), fg is lower than this value" double no - -option "fg" - "Foreground (FG) or 'inside' value" double no default="1" -option "bg" - "Background (BG) or 'ouside' value" double no default="0" -option "mode" - "Use FG and/or BG values (if FG, the BG is replaced by the input image values)" values="FG","BG","both" default="both" required - diff --git a/filters/clitkBinarizeImageGenericFilter.cxx b/filters/clitkBinarizeImageGenericFilter.cxx deleted file mode 100644 index 6e5a5f4..0000000 --- a/filters/clitkBinarizeImageGenericFilter.cxx +++ /dev/null @@ -1,32 +0,0 @@ -/*========================================================================= - Program: vv http://www.creatis.insa-lyon.fr/rio/vv - - Authors belong to: - - University of LYON http://www.universite-lyon.fr/ - - Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr - - CREATIS CNRS laboratory http://www.creatis.insa-lyon.fr - - This software is distributed WITHOUT ANY WARRANTY; without even - the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the copyright notices for more information. - - It is distributed under dual licence - - - BSD See included LICENSE.txt file - - CeCILL-B http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html -======================================================================-====*/ -#ifndef clitkBinarizeImageGenericFilter_cxx -#define clitkBinarizeImageGenericFilter_cxx - -/* ================================================= - * @file clitkBinarizeImageGenericFilter.cxx - * @author Jef Vandemeulebroucke - * @date 29 june 2009 - * - * @brief - * - ===================================================*/ - -#include "clitkBinarizeImageGenericFilter.h" - -#endif //#define clitkBinarizeImageGenericFilter_cxx diff --git a/filters/clitkBinarizeImageGenericFilter.h b/filters/clitkBinarizeImageGenericFilter.h deleted file mode 100644 index 7f6ba4c..0000000 --- a/filters/clitkBinarizeImageGenericFilter.h +++ /dev/null @@ -1,74 +0,0 @@ -/*========================================================================= - Program: vv http://www.creatis.insa-lyon.fr/rio/vv - - Authors belong to: - - University of LYON http://www.universite-lyon.fr/ - - Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr - - CREATIS CNRS laboratory http://www.creatis.insa-lyon.fr - - This software is distributed WITHOUT ANY WARRANTY; without even - the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the copyright notices for more information. - - It is distributed under dual licence - - - BSD See included LICENSE.txt file - - CeCILL-B http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html -======================================================================-====*/ - -#ifndef CLITKBINARIZEIMAGEGENERICFILTER_H -#define CLITKBINARIZEIMAGEGENERICFILTER_H - -#include "clitkIO.h" -#include "clitkImageToImageGenericFilter.h" - -//-------------------------------------------------------------------- -namespace clitk -{ - - template - class ITK_EXPORT BinarizeImageGenericFilter: - public ImageToImageGenericFilter > - { - - public: - - //-------------------------------------------------------------------- - BinarizeImageGenericFilter(); - - //-------------------------------------------------------------------- - typedef BinarizeImageGenericFilter Self; - typedef itk::SmartPointer Pointer; - typedef itk::SmartPointer ConstPointer; - - //-------------------------------------------------------------------- - // Method for creation through the object factory - // and Run-time type information (and related methods) - itkNewMacro(Self); - itkTypeMacro(BinarizeImageGenericFilter, LightObject); - - //-------------------------------------------------------------------- - void SetArgsInfo(const args_info_type & a); - - //-------------------------------------------------------------------- - // Main function called each time the filter is updated - template - void UpdateWithInputImageType(); - - protected: - template void InitializeImageType(); - args_info_type mArgsInfo; - - }; // end class - //-------------------------------------------------------------------- - -} // end namespace clitk -//-------------------------------------------------------------------- - -//-------------------------------------------------------------------- -#ifndef ITK_MANUAL_INSTANTIATION -#include "clitkBinarizeImageGenericFilter.txx" -#endif -//-------------------------------------------------------------------- - -#endif // #define clitkBinarizeImageGenericFilter_h diff --git a/filters/clitkBinarizeImageGenericFilter.txx b/filters/clitkBinarizeImageGenericFilter.txx deleted file mode 100644 index 61a4277..0000000 --- a/filters/clitkBinarizeImageGenericFilter.txx +++ /dev/null @@ -1,168 +0,0 @@ -/*========================================================================= - Program: vv http://www.creatis.insa-lyon.fr/rio/vv - - Authors belong to: - - University of LYON http://www.universite-lyon.fr/ - - Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr - - CREATIS CNRS laboratory http://www.creatis.insa-lyon.fr - - This software is distributed WITHOUT ANY WARRANTY; without even - the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the copyright notices for more information. - - It is distributed under dual licence - - - BSD See included LICENSE.txt file - - CeCILL-B http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html -======================================================================-====*/ - -#ifndef CLITKBINARIZEIMAGEGENERICFILTER_TXX -#define CLITKBINARIZEIMAGEGENERICFILTER_TXX - -// itk include -#include "itkBinaryThresholdImageFilter.h" -#include "itkMaskImageFilter.h" -#include "itkMaskNegatedImageFilter.h" - -#include -// #include - -namespace clitk -{ - -//-------------------------------------------------------------------- -template -BinarizeImageGenericFilter::BinarizeImageGenericFilter(): - ImageToImageGenericFilter("Binarize") -{ - InitializeImageType<2>(); - InitializeImageType<3>(); - InitializeImageType<4>(); -} -//-------------------------------------------------------------------- - - -//-------------------------------------------------------------------- -template -template -void BinarizeImageGenericFilter::InitializeImageType() -{ - ADD_DEFAULT_IMAGE_TYPES(Dim); -} -//-------------------------------------------------------------------- - - -//-------------------------------------------------------------------- -template -void BinarizeImageGenericFilter::SetArgsInfo(const args_info_type & a) -{ - mArgsInfo=a; - SetIOVerbose(mArgsInfo.verbose_flag); - if (mArgsInfo.imagetypes_flag) this->PrintAvailableImageTypes(); - - if (mArgsInfo.input_given) { - SetInputFilename(mArgsInfo.input_arg); - } - if (mArgsInfo.output_given) { - SetOutputFilename(mArgsInfo.output_arg); - } -} -//-------------------------------------------------------------------- - - -//-------------------------------------------------------------------- -// Update with the number of dimensions and the pixeltype -//-------------------------------------------------------------------- -template -template -void -BinarizeImageGenericFilter::UpdateWithInputImageType() -{ - - // Reading input - typename InputImageType::Pointer input = this->template GetInput(0); - - // Main filter - typedef typename InputImageType::PixelType PixelType; - typedef itk::Image OutputImageType; - - // Filter - typedef itk::BinaryThresholdImageFilter BinaryThresholdImageFilterType; - typename BinaryThresholdImageFilterType::Pointer thresholdFilter=BinaryThresholdImageFilterType::New(); - thresholdFilter->SetInput(input); - thresholdFilter->SetInsideValue(mArgsInfo.fg_arg); - - if (mArgsInfo.lower_given) thresholdFilter->SetLowerThreshold(static_cast(mArgsInfo.lower_arg)); - if (mArgsInfo.upper_given) thresholdFilter->SetUpperThreshold(static_cast(mArgsInfo.upper_arg)); - - // DD(mArgsInfo.lower_given); - // DD(mArgsInfo.upper_given); - // DD(mArgsInfo.lower_arg); - // DD(mArgsInfo.upper_arg); - // DD(mArgsInfo.fg_arg); - // DD(mArgsInfo.bg_arg); - // DD(mArgsInfo.fg_given); - // DD(mArgsInfo.bg_given); - // DD(mArgsInfo.mode_arg); - -// DD(mArgsInfo.useFG_flag); -// DD(mArgsInfo.useBG_flag); - -// thresholdFilter->SetInsideValue(mArgsInfo.fg_arg); - -// // Keep BG value to 0 if maskFilterType is used after -// if (mArgsInfo.useBG_flag && mArgsInfo.useFG_flag) { -// thresholdFilter->SetOutsideValue(mArgsInfo.bg_arg); -// } -// else { -// DD("0"); -// thresholdFilter->SetOutsideValue(0); -// } - -// // thresholdFilter->Update(); - -// // If no BG or no FG : new image, copy input with MaskImageFilter -// // If setFG -> FG BG have been changed -// if (mArgsInfo.useBG_flag && mArgsInfo.useFG_flag) { -// ======= - /* Three modes : - - FG -> only use FG value for pixel in the Foreground (or Inside), keep input values for outside - - BG -> only use BG value for pixel in the Background (or Outside), keep input values for inside - - both -> use FG and BG (real binary image) - */ - if (mArgsInfo.mode_arg == std::string("both")) { - thresholdFilter->SetOutsideValue(mArgsInfo.bg_arg); - thresholdFilter->Update(); - //>>>>>>> 1.5 - typename OutputImageType::Pointer outputImage = thresholdFilter->GetOutput(); - this->template SetNextOutput(outputImage); - } else { - typename InputImageType::Pointer outputImage; - thresholdFilter->SetOutsideValue(0); - if (mArgsInfo.mode_arg == std::string("BG")) { - typedef itk::MaskImageFilter maskFilterType; - typename maskFilterType::Pointer maskFilter = maskFilterType::New(); - maskFilter->SetInput1(input); - maskFilter->SetInput2(thresholdFilter->GetOutput()); - maskFilter->SetOutsideValue(mArgsInfo.bg_arg); - maskFilter->Update(); - outputImage = maskFilter->GetOutput(); - } else { - typedef itk::MaskNegatedImageFilter maskFilterType; - typename maskFilterType::Pointer maskFilter = maskFilterType::New(); - maskFilter->SetInput1(input); - maskFilter->SetInput2(thresholdFilter->GetOutput()); - maskFilter->SetOutsideValue(mArgsInfo.fg_arg); - maskFilter->Update(); - outputImage = maskFilter->GetOutput(); - } - // Write/Save results - this->template SetNextOutput(outputImage); - } -} -//-------------------------------------------------------------------- - - -}//end clitk - -#endif //#define clitkBinarizeImageGenericFilter_txx