From: David Sarrut Date: Fri, 3 Feb 2012 06:53:55 +0000 (+0100) Subject: Moved from repository clitk to clitk.private/deprecated X-Git-Tag: v1.3.0~104^2~8^2~7 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=9bc57f72f647fd2365d061622b85dcdaaf96b1b6;p=clitk.git Moved from repository clitk to clitk.private/deprecated --- diff --git a/segmentation/clitkBool.cxx b/segmentation/clitkBool.cxx deleted file mode 100644 index dbb313c..0000000 --- a/segmentation/clitkBool.cxx +++ /dev/null @@ -1,45 +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 -======================================================================-====*/ - -// clitk -#include "clitkBool_ggo.h" -#include "clitkBooleanOperatorLabelImageGenericFilter.h" - -//-------------------------------------------------------------------- -int main(int argc, char * argv[]) -{ - - // Init command line - GGO(clitkBool, args_info); - CLITK_INIT; - - // Filter - typedef clitk::BooleanOperatorLabelImageGenericFilter FilterType; - FilterType::Pointer filter = FilterType::New(); - - filter->SetArgsInfo(args_info); - - try { - filter->Update(); - } catch(std::runtime_error e) { - std::cout << e.what() << std::endl; - } - - return EXIT_SUCCESS; -} // This is the end, my friend -//-------------------------------------------------------------------- diff --git a/segmentation/clitkBool.ggo b/segmentation/clitkBool.ggo deleted file mode 100644 index f885655..0000000 --- a/segmentation/clitkBool.ggo +++ /dev/null @@ -1,14 +0,0 @@ -#File clitkExtractMediastinalVessels.ggo -package "clitkExtractMediastinalVessels" -version "1.0" -purpose "Extract MediastinalVessels" - -option "config" - "Config file" string no -option "imagetypes" - "Display allowed image types" flag off -option "verbose" v "Verbose" flag off - -option "input" i "Input mask 1" string yes -option "input2" j "Input mask 2" string yes -option "output" o "Output filename" string yes - -option "type" t "Bool type (0=AndNot, 1=And, 2=Or)" int default="1" no diff --git a/segmentation/clitkBooleanOperatorLabelImageGenericFilter.h b/segmentation/clitkBooleanOperatorLabelImageGenericFilter.h deleted file mode 100644 index acd69ff..0000000 --- a/segmentation/clitkBooleanOperatorLabelImageGenericFilter.h +++ /dev/null @@ -1,80 +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 CLITKBOOLEANOPERATORLABELIMAGEGENERICFILTER_H -#define CLITKBOOLEANOPERATORLABELIMAGEGENERICFILTER_H - -#include "clitkIO.h" -#include "clitkImageToImageGenericFilter.h" -#include "clitkBooleanOperatorLabelImageFilter.h" - -//-------------------------------------------------------------------- -namespace clitk -{ - - template - class ITK_EXPORT BooleanOperatorLabelImageGenericFilter: - public ImageToImageGenericFilter > - { - - public: - //-------------------------------------------------------------------- - BooleanOperatorLabelImageGenericFilter(); - - //-------------------------------------------------------------------- - typedef ImageToImageGenericFilter > Superclass; - typedef BooleanOperatorLabelImageGenericFilter Self; - typedef itk::SmartPointer Pointer; - typedef itk::SmartPointer ConstPointer; - - //-------------------------------------------------------------------- - itkNewMacro(Self); - itkTypeMacro(BooleanOperatorLabelImageGenericFilter, LightObject); - - //-------------------------------------------------------------------- - // Options for the GenericFilter - void SetArgsInfo(const ArgsInfoType & a); - - //-------------------------------------------------------------------- - // Options for the Filter - template - void SetOptionsFromArgsInfoToFilter(FilterType * f) ; - - //-------------------------------------------------------------------- - // Main function called each time the filter is updated - template - void UpdateWithInputImageType(); - - protected: - template void InitializeImageType(); - ArgsInfoType mArgsInfo; - - private: - BooleanOperatorLabelImageGenericFilter(const Self&); //purposely not implemented - void operator=(const Self&); //purposely not implemented - - }; // end class - //-------------------------------------------------------------------- - -} // end namespace clitk - -#ifndef ITK_MANUAL_INSTANTIATION -#include "clitkBooleanOperatorLabelImageGenericFilter.txx" -#endif - -#endif // #define CLITKBOOLEANOPERATORLABELIMAGEGENERICFILTER_H diff --git a/segmentation/clitkBooleanOperatorLabelImageGenericFilter.txx b/segmentation/clitkBooleanOperatorLabelImageGenericFilter.txx deleted file mode 100644 index 0c07b67..0000000 --- a/segmentation/clitkBooleanOperatorLabelImageGenericFilter.txx +++ /dev/null @@ -1,104 +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 CLITKBOOLEANOPERATORLABELIMAGEGENERICFILTER_TXX -#define CLITKBOOLEANOPERATORLABELIMAGEGENERICFILTER_TXX - -#include "clitkImageCommon.h" - -//-------------------------------------------------------------------- -template -clitk::BooleanOperatorLabelImageGenericFilter::BooleanOperatorLabelImageGenericFilter(): - ImageToImageGenericFilter("BooleanOperatorLabelImage") -{ - // Default values - cmdline_parser_clitkBool_init(&mArgsInfo); - InitializeImageType<3>(); // Only for 3D images -} -//-------------------------------------------------------------------- - - -//-------------------------------------------------------------------- -template -template -void clitk::BooleanOperatorLabelImageGenericFilter::InitializeImageType() -{ - ADD_IMAGE_TYPE(Dim, uchar); // Can add float later -} -//-------------------------------------------------------------------- - - -//-------------------------------------------------------------------- -template -void clitk::BooleanOperatorLabelImageGenericFilter::SetArgsInfo(const ArgsInfoType & a) -{ - mArgsInfo=a; - SetIOVerbose(mArgsInfo.verbose_flag); - if (mArgsInfo.imagetypes_flag) this->PrintAvailableImageTypes(); - if (mArgsInfo.input_given) AddInputFilename(mArgsInfo.input_arg); - if (mArgsInfo.input2_given) AddInputFilename(mArgsInfo.input2_arg); -} -//-------------------------------------------------------------------- - - -//-------------------------------------------------------------------- -template -template -void -clitk::BooleanOperatorLabelImageGenericFilter:: -SetOptionsFromArgsInfoToFilter(FilterType * f) -{ - // Operation type - f->SetOperationType(typename FilterType::OperationTypeEnumeration(mArgsInfo.type_arg)); - - // Output filename - this->AddOutputFilename(mArgsInfo.output_arg); -} -//-------------------------------------------------------------------- - - -//-------------------------------------------------------------------- -// Update with the number of dimensions and the pixeltype -//-------------------------------------------------------------------- -template -template -void clitk::BooleanOperatorLabelImageGenericFilter::UpdateWithInputImageType() -{ - // Reading input - typename ImageType::Pointer input1 = this->template GetInput(0); - typename ImageType::Pointer input2 = this->template GetInput(1); - - // Create filter - typedef clitk::BooleanOperatorLabelImageFilter FilterType; - typename FilterType::Pointer filter = FilterType::New(); - - // Set global Options - filter->SetInput1(input1); - filter->SetInput2(input2); - SetOptionsFromArgsInfoToFilter(filter); - - // Go ! - filter->Update(); - - // Write/Save results - typename ImageType::Pointer output = filter->GetOutput(); - this->template SetNextOutput(output); -} -//-------------------------------------------------------------------- - -#endif //#define CLITKBOOLEANOPERATORLABELIMAGEGENERICFILTER_TXX