From: David Sarrut Date: Thu, 2 Feb 2012 16:01:20 +0000 (+0100) Subject: Moved from repository clitk to clitk.private/tests_dav X-Git-Tag: v1.3.0~104^2~8^2~12 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=595624eb4297e747630105d45017de69733caef2;p=clitk.git Moved from repository clitk to clitk.private/tests_dav --- diff --git a/segmentation/clitkAnd.cxx b/segmentation/clitkAnd.cxx deleted file mode 100644 index e8be880..0000000 --- a/segmentation/clitkAnd.cxx +++ /dev/null @@ -1,51 +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://www.centreleonberard.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 -===========================================================================**/ - -/* ================================================= - * @file clitkAnd.cxx - * @author - * @date - * - * @brief - * - ===================================================*/ - - -// clitk -#include "clitkAnd_ggo.h" -#include "clitkIO.h" -#include "clitkAndGenericFilter.h" - - -//-------------------------------------------------------------------- -int main(int argc, char * argv[]) { - - // Init command line - GGO(clitkAnd, args_info); - CLITK_INIT; - - // Filter - clitk::AndGenericFilter::Pointer genericFilter=clitk::AndGenericFilter::New(); - - genericFilter->SetArgsInfo(args_info); - genericFilter->Update(); - - return EXIT_SUCCESS; -}// end main - -//-------------------------------------------------------------------- diff --git a/segmentation/clitkAnd.ggo b/segmentation/clitkAnd.ggo deleted file mode 100644 index 8455845..0000000 --- a/segmentation/clitkAnd.ggo +++ /dev/null @@ -1,13 +0,0 @@ -#File clitkAnd.ggo -package "clitkAnd" -version "1.0" -purpose "Perform a pixel-wise logical AND between to images" - -option "config" - "Config file" string no -option "verbose" v "Verbose" flag off - -option "input" i "Input image filename" string yes -option "input2" j "Input image filename" string yes -option "output" o "Output image filename" string yes - - diff --git a/segmentation/clitkAndGenericFilter.cxx b/segmentation/clitkAndGenericFilter.cxx deleted file mode 100644 index e81757b..0000000 --- a/segmentation/clitkAndGenericFilter.cxx +++ /dev/null @@ -1,72 +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://www.centreleonberard.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 clitkAndGenericFilter_cxx -#define clitkAndGenericFilter_cxx - -/* ================================================= - * @file clitkAndGenericFilter.cxx - * @author - * @date - * - * @brief - * - ===================================================*/ - -#include "clitkAndGenericFilter.h" - - -namespace clitk -{ - - - //----------------------------------------------------------- - // Constructor - //----------------------------------------------------------- - AndGenericFilter::AndGenericFilter() - { - m_Verbose=false; - m_InputFileName=""; - } - - - //----------------------------------------------------------- - // Update - //----------------------------------------------------------- - void AndGenericFilter::Update() - { - // Read the Dimension and PixelType - int Dimension; - std::string PixelType; - ReadImageDimensionAndPixelType(m_InputFileName, Dimension, PixelType); - - - // Call UpdateWithDim - if(Dimension==2) UpdateWithDim<2>(PixelType); - else if(Dimension==3) UpdateWithDim<3>(PixelType); - // else if (Dimension==4)UpdateWithDim<4>(PixelType); - else - { - std::cout<<"Error, Only for 2 or 3 Dimensions!!!"< Pointer; - typedef itk::SmartPointer ConstPointer; - - // Method for creation through the object factory - itkNewMacro(Self); - - // Run-time type information (and related methods) - itkTypeMacro( AndGenericFilter, LightObject ); - - - //---------------------------------------- - // Typedefs - //---------------------------------------- - - - //---------------------------------------- - // Set & Get - //---------------------------------------- - void SetArgsInfo(const args_info_clitkAnd & a) - { - m_ArgsInfo=a; - m_Verbose=m_ArgsInfo.verbose_flag; - m_InputFileName=m_ArgsInfo.input_arg; - } - - - //---------------------------------------- - // Update - //---------------------------------------- - void Update(); - - protected: - - //---------------------------------------- - // Constructor & Destructor - //---------------------------------------- - AndGenericFilter(); - ~AndGenericFilter() {}; - - - //---------------------------------------- - // Templated members - //---------------------------------------- - template void UpdateWithDim(std::string PixelType); - template void UpdateWithDimAndPixelType(); - - - //---------------------------------------- - // Data members - //---------------------------------------- - args_info_clitkAnd m_ArgsInfo; - bool m_Verbose; - std::string m_InputFileName; - - }; - - -} // end namespace clitk - -#ifndef ITK_MANUAL_INSTANTIATION -#include "clitkAndGenericFilter.txx" -#endif - -#endif // #define clitkAndGenericFilter_h diff --git a/segmentation/clitkAndGenericFilter.txx b/segmentation/clitkAndGenericFilter.txx deleted file mode 100644 index 6bf0ccc..0000000 --- a/segmentation/clitkAndGenericFilter.txx +++ /dev/null @@ -1,127 +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://www.centreleonberard.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 clitkAndGenericFilter_txx -#define clitkAndGenericFilter_txx - -/* ================================================= - * @file clitkAndGenericFilter.txx - * @author - * @date - * - * @brief - * - ===================================================*/ - - -namespace clitk -{ - - //------------------------------------------------------------------- - // Update with the number of dimensions - //------------------------------------------------------------------- - template - void - AndGenericFilter::UpdateWithDim(std::string PixelType) - { - if (m_Verbose) std::cout << "Image was detected to be "<(); - } - // else if(PixelType == "unsigned_short"){ - // if (m_Verbose) std::cout << "Launching filter in "<< Dimension <<"D and unsigned_short..." << std::endl; - // UpdateWithDimAndPixelType(); - // } - - else if (PixelType == "unsigned_char"){ - if (m_Verbose) std::cout << "Launching filter in "<< Dimension <<"D and unsigned_char..." << std::endl; - UpdateWithDimAndPixelType(); - } - - // else if (PixelType == "char"){ - // if (m_Verbose) std::cout << "Launching filter in "<< Dimension <<"D and signed_char..." << std::endl; - // UpdateWithDimAndPixelType(); - // } - else { - if (m_Verbose) std::cout << "Launching filter in "<< Dimension <<"D and float..." << std::endl; - UpdateWithDimAndPixelType(); - } - } - - - //------------------------------------------------------------------- - // Update with the number of dimensions and the pixeltype - //------------------------------------------------------------------- - template - void - AndGenericFilter::UpdateWithDimAndPixelType() - { - - // ImageTypes - typedef itk::Image InputImageType; - typedef itk::Image InternalImageType; - typedef itk::Image OutputImageType; - - // Read the input - typedef itk::ImageFileReader InputReaderType; - typename InputReaderType::Pointer reader = InputReaderType::New(); - reader->SetFileName( m_InputFileName); - reader->Update(); - typename InputImageType::Pointer input= reader->GetOutput(); - - // Read the second input - typename InputReaderType::Pointer reader2 = InputReaderType::New(); - reader2->SetFileName( m_ArgsInfo.input2_arg); - reader2->Update(); - typename InputImageType::Pointer input2= reader2->GetOutput(); - - - // Cast - typedef itk::CastImageFilter InputCastImageFilterType; - typename InputCastImageFilterType::Pointer caster= InputCastImageFilterType::New(); - caster->SetInput(input); - typename InputCastImageFilterType::Pointer caster2= InputCastImageFilterType::New(); - caster->SetInput(input2); - - // Filter - typedef itk::AndImageFilter< InternalImageType , InternalImageType , InternalImageType> AndFilterType; - typename AndFilterType::Pointer andFilter = AndFilterType::New(); - andFilter->SetInput1(caster->GetOutput()); - andFilter->SetInput2(caster2->GetOutput()); - if (m_Verbose) std::cout<<"Performing a logical AND..."< OutputCastImageFilterType; - typename OutputCastImageFilterType::Pointer caster3= OutputCastImageFilterType::New(); - caster3->SetInput(andFilter->GetOutput()); - typename OutputImageType::Pointer output =caster3->GetOutput(); - - // Output - typedef itk::ImageFileWriter WriterType; - typename WriterType::Pointer writer = WriterType::New(); - writer->SetFileName(m_ArgsInfo.output_arg); - writer->SetInput(output); - writer->Update(); - - } - - -}//end clitk - -#endif //#define clitkAndGenericFilter_txx