From: David Sarrut <david.sarrut@creatis.insa-lyon.fr>
Date: Wed, 5 Oct 2011 09:03:46 +0000 (+0200)
Subject: Correct PrintOptions
X-Git-Tag: v1.3.0~203
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=385f942c3dcfad57d9666e331b93e09e3107cc8c;p=clitk.git

Correct PrintOptions
---

diff --git a/itk/clitkSliceBySliceRelativePositionFilter.h b/itk/clitkSliceBySliceRelativePositionFilter.h
index f860c03..e4fe7a4 100644
--- a/itk/clitkSliceBySliceRelativePositionFilter.h
+++ b/itk/clitkSliceBySliceRelativePositionFilter.h
@@ -70,7 +70,7 @@ namespace clitk {
     void SetInputObject(const ImageType * image);
 
     // Options
-    void PrintOptions();
+    void PrintOptions(std::ostream & os = std::cout);
     itkGetConstMacro(Direction, int);
     itkSetMacro(Direction, int);
 
diff --git a/itk/clitkSliceBySliceRelativePositionFilter.txx b/itk/clitkSliceBySliceRelativePositionFilter.txx
index d75cc88..0548146 100644
--- a/itk/clitkSliceBySliceRelativePositionFilter.txx
+++ b/itk/clitkSliceBySliceRelativePositionFilter.txx
@@ -73,23 +73,25 @@ SetInputObject(const ImageType * image)
 template <class ImageType>
 void 
 clitk::SliceBySliceRelativePositionFilter<ImageType>::
-PrintOptions() 
+PrintOptions(std::ostream & os) 
 {
-  DD(this->GetDirection());
-  DD((int)this->GetObjectBackgroundValue());
-  DDV(this->GetOrientationTypeString(), (uint)this->GetNumberOfAngles());
-  DD(this->GetIntermediateSpacingFlag());
-  DD(this->GetIntermediateSpacing());
-  DD(this->GetFuzzyThreshold());
-  DD(this->GetUniqueConnectedComponentBySliceFlag());
-  DD(this->GetAutoCropFlag());
-  DD(this->GetInverseOrientationFlag());
-  DD(this->GetRemoveObjectFlag());
-  DD(this->GetCombineWithOrFlag());
-  DD(this->GetUseTheLargestObjectCCLFlag());
-  DD(this->GetObjectCCLSelectionFlag());
-  DD(this->GetObjectCCLSelectionDimension());
-  DD(this->GetObjectCCLSelectionIgnoreSingleCCLFlag());
+  os << "Slice direction = " << this->GetDirection() << std::endl
+     << "BG value        = " << this->GetBackgroundValue() << std::endl;
+  for(int i=0; i<this->GetNumberOfAngles(); i++)
+    os << "Orientation     = " << this->GetOrientationTypeString()[i] << std::endl;
+  os << "InverseOrientationFlag  = " << this->GetInverseOrientationFlag() << std::endl        
+     << "SpacingFlag     = " << this->GetIntermediateSpacingFlag() << std::endl
+     << "Spacing         = " << this->GetIntermediateSpacing() << std::endl
+     << "FuzzyThreshold  = " << this->GetFuzzyThreshold() << std::endl
+     << "UniqueConnectedComponentBySliceFlag  = " << this->GetUniqueConnectedComponentBySliceFlag() << std::endl
+     << "AutoCropFlag    = " << this->GetAutoCropFlag() << std::endl    
+     << "RemoveObjectFlag= " << this->GetRemoveObjectFlag() << std::endl    
+     << "CombineWithOrFlag = " << this->GetCombineWithOrFlag() << std::endl    
+     << "UseTheLargestObjectCCLFlag = " << this->GetUseTheLargestObjectCCLFlag() << std::endl    
+     << "ObjectCCLSelectionFlag = " << this->GetObjectCCLSelectionFlag() << std::endl    
+     << "ObjectCCLSelectionDimension = " << this->GetObjectCCLSelectionDimension() << std::endl    
+     << "ObjectCCLSelectionIgnoreSingleCCLFlag = " << this->GetObjectCCLSelectionIgnoreSingleCCLFlag() << std::endl    
+     << "IgnoreEmptySliceObjectFlag = " << this->GetIgnoreEmptySliceObjectFlag() << std::endl;    
 }
 //--------------------------------------------------------------------