From: tbaudier Date: Tue, 13 Nov 2018 10:07:54 +0000 (+0100) Subject: Remove trailing spaces and tab X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=clitk.git;a=commitdiff_plain;h=adcb66e6659f609eab388827c24f52280253db99 Remove trailing spaces and tab --- diff --git a/tools/clitkRTStructStatistics.ggo b/tools/clitkRTStructStatistics.ggo index ebd275b..8198220 100644 --- a/tools/clitkRTStructStatistics.ggo +++ b/tools/clitkRTStructStatistics.ggo @@ -1,9 +1,9 @@ #File clitkRTStructStatistics.ggo package "clitkRTStructStatistics" -version "2.0" -purpose "Find the centroid/roundness of a binarized image." +version "2.0" +purpose "Find the centroid and roundness of a binarized image." -option "config" - "Config file" string no -option "verbose" v "Verbose" flag off +option "config" - "Config file" string no +option "verbose" v "Verbose" flag off -option "input" i "Input image filename (mask)" string yes +option "input" i "Input image filename (mask)" string yes diff --git a/tools/clitkRTStructStatisticsGenericFilter.h b/tools/clitkRTStructStatisticsGenericFilter.h index 4339c69..aeeed80 100644 --- a/tools/clitkRTStructStatisticsGenericFilter.h +++ b/tools/clitkRTStructStatisticsGenericFilter.h @@ -1,7 +1,7 @@ /*========================================================================= Program: vv http://www.creatis.insa-lyon.fr/rio/vv - Authors belong to: + 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 @@ -23,7 +23,7 @@ * @author Thomas Baudier * @date 11 Jul 2016 08:37:53 - * @brief + * @brief -------------------------------------------------------------------*/ // clitk include @@ -37,14 +37,14 @@ //-------------------------------------------------------------------- namespace clitk { - + template class ITK_EXPORT RTStructStatisticsGenericFilter: public clitk::ImageToImageGenericFilter > { - + public: - - // Constructor + + // Constructor RTStructStatisticsGenericFilter (); // Types @@ -55,19 +55,19 @@ namespace clitk { // New itkNewMacro(Self); - - - + + + //-------------------------------------------------------------------- void SetArgsInfo(const args_info_type & a); //-------------------------------------------------------------------- // Main function called each time the filter is updated - template + template void UpdateWithInputImageType(); - protected: - template void InitializeImageType(); + protected: + template void InitializeImageType(); args_info_type mArgsInfo; }; // end class RTStructStatisticsGenericFilter @@ -75,7 +75,7 @@ namespace clitk { } // end namespace //-------------------------------------------------------------------- - + #ifndef ITK_MANUAL_INSTANTIATION #include "clitkRTStructStatisticsGenericFilter.txx" #endif diff --git a/tools/clitkRTStructStatisticsGenericFilter.txx b/tools/clitkRTStructStatisticsGenericFilter.txx index d658e2b..d83b25d 100644 --- a/tools/clitkRTStructStatisticsGenericFilter.txx +++ b/tools/clitkRTStructStatisticsGenericFilter.txx @@ -56,9 +56,9 @@ void RTStructStatisticsGenericFilter::SetArgsInfo(const args_inf // Set value this->SetIOVerbose(mArgsInfo.verbose_flag); - + if (mArgsInfo.input_given) this->AddInputFilename(mArgsInfo.input_arg); - + } //-------------------------------------------------------------------- @@ -79,18 +79,18 @@ void RTStructStatisticsGenericFilter::UpdateWithInputImageType() typedef itk::LabelMap< ShapeLabelObjectType > LabelMapType; typedef itk::ConnectedComponentImageFilter ConnectedComponentImageFilterType; typedef itk::LabelImageToShapeLabelMapFilter< OutputImageType, LabelMapType> I2LType; - + typename ConnectedComponentImageFilterType::Pointer connected = ConnectedComponentImageFilterType::New (); connected->SetInput(mask); connected->FullyConnectedOn(); connected->Update(); - + //Create a map to contain all connectedComponent (even a little pixel) typename I2LType::Pointer i2l = I2LType::New(); i2l->SetInput( connected->GetOutput() ); i2l->SetComputePerimeter(true); i2l->Update(); - + // Retrieve the biggest component LabelMapType *labelMap = i2l->GetOutput(); int largestComponent(0); @@ -101,10 +101,10 @@ void RTStructStatisticsGenericFilter::UpdateWithInputImageType() if (labelObject->GetNumberOfPixels() > nbPixel) { nbPixel = labelObject->GetNumberOfPixels(); - largestComponent = n; + largestComponent = n; } } - + //Write statitistics on the largest component ShapeLabelObjectType *labelObject = labelMap->GetNthLabelObject(largestComponent); std::cout << " Centroid: " << std::endl; diff --git a/tools/clitkSUVPeak.ggo b/tools/clitkSUVPeak.ggo index 6e9206a..8412941 100644 --- a/tools/clitkSUVPeak.ggo +++ b/tools/clitkSUVPeak.ggo @@ -1,11 +1,11 @@ #File clitkSUVPeak.ggo package "clitkSUVPeak" version "2.0" -#This tool supports multiple images on the input, or even 4D, but all images must be of the same type and dimensions. +#This tool supports multiple images on the input, or even 4D, but all images must be of the same type and dimensions. purpose "Compute statistics on an image, or on part of an image specified by a mask and label(s). The tool also supports multichannel images, which is useful, e.g., for vector fields. All channels are processed (separately) by default, but only one channel may be chosen." -option "config" - "Config file" string no -option "verbose" v "Verbose" flag off +option "config" - "Config file" string no +option "verbose" v "Verbose" flag off -option "input" i "Input first image filename" string yes -option "mask" m "Mask image filename (uchar)" string no +option "input" i "Input first image filename" string yes +option "mask" m "Mask image filename (uchar)" string no diff --git a/tools/clitkSUVPeakGenericFilter.h b/tools/clitkSUVPeakGenericFilter.h index 57c4d05..6357167 100644 --- a/tools/clitkSUVPeakGenericFilter.h +++ b/tools/clitkSUVPeakGenericFilter.h @@ -1,7 +1,7 @@ /*========================================================================= Program: vv http://www.creatis.insa-lyon.fr/rio/vv - Authors belong to: + 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 @@ -23,7 +23,7 @@ * @author David Sarrut * @date 23 Feb 2008 08:37:53 - * @brief + * @brief -------------------------------------------------------------------*/ // clitk include @@ -39,14 +39,14 @@ //-------------------------------------------------------------------- namespace clitk { - + template class ITK_EXPORT SUVPeakGenericFilter: public clitk::ImageToImageGenericFilter > { - + public: - - // Constructor + + // Constructor SUVPeakGenericFilter (); // Types @@ -57,9 +57,9 @@ namespace clitk { // New itkNewMacro(Self); - - - + + + //-------------------------------------------------------------------- void SetArgsInfo(const args_info_type & a); @@ -68,11 +68,11 @@ namespace clitk { //-------------------------------------------------------------------- // Main function called each time the filter is updated - template + template void UpdateWithInputImageType(); - protected: - template void InitializeImageType(); + protected: + template void InitializeImageType(); args_info_type mArgsInfo; }; // end class SUVPeakGenericFilter @@ -80,7 +80,7 @@ namespace clitk { } // end namespace //-------------------------------------------------------------------- - + #ifndef ITK_MANUAL_INSTANTIATION #include "clitkSUVPeakGenericFilter.txx" #endif diff --git a/tools/clitkSUVPeakGenericFilter.txx b/tools/clitkSUVPeakGenericFilter.txx index 8a41726..127a071 100644 --- a/tools/clitkSUVPeakGenericFilter.txx +++ b/tools/clitkSUVPeakGenericFilter.txx @@ -54,9 +54,9 @@ void SUVPeakGenericFilter::SetArgsInfo(const args_info_type & a) // Set value this->SetIOVerbose(mArgsInfo.verbose_flag); - + if (mArgsInfo.input_given) this->AddInputFilename(mArgsInfo.input_arg); - + if (mArgsInfo.mask_given) this->AddInputFilename(mArgsInfo.mask_arg); } //-------------------------------------------------------------------- @@ -88,7 +88,7 @@ void SUVPeakGenericFilter::UpdateWithInputImageType() double volume = 1000; //1 cc into mc const double PI = 3.141592653589793238463; double radius = std::pow(3*volume/(4*PI),1./3); - + typename ImageType::Pointer kernel = ComputeMeanFilterKernel(input->GetSpacing(), radius); // Perform the convolution @@ -98,8 +98,8 @@ void SUVPeakGenericFilter::UpdateWithInputImageType() filter->SetKernelImage(kernel); filter->Update(); typename ImageType::Pointer output = filter->GetOutput(); - - + + typedef itk::ImageRegionConstIteratorWithIndex IteratorType; typedef itk::ImageRegionConstIteratorWithIndex MIteratorType; IteratorType iters(output, output->GetLargestPossibleRegion()); @@ -128,7 +128,7 @@ void SUVPeakGenericFilter::UpdateWithInputImageType() //-------------------------------------------------------------------- template template -typename ImageType::Pointer +typename ImageType::Pointer SUVPeakGenericFilter::ComputeMeanFilterKernel(const typename ImageType::SpacingType & spacing, double radius) { // Some kind of cache to speed up a bit