X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=tools%2FclitkRelativePositionAnalyzerGenericFilter.txx;h=5074504eb6232bb9ddb211ad50dc2fb7563b3225;hb=31ae3f744e457adcd92677eaddd4c54d2702a392;hp=4225c43b608153e072a1491ac6a2de682cef00c8;hpb=aeb947ddd800ab06cf4916c9371bca3832056b4f;p=clitk.git

diff --git a/tools/clitkRelativePositionAnalyzerGenericFilter.txx b/tools/clitkRelativePositionAnalyzerGenericFilter.txx
index 4225c43..5074504 100644
--- a/tools/clitkRelativePositionAnalyzerGenericFilter.txx
+++ b/tools/clitkRelativePositionAnalyzerGenericFilter.txx
@@ -64,8 +64,16 @@ template<class FilterType>
 void clitk::RelativePositionAnalyzerGenericFilter<ArgsInfoType>::
 SetOptionsFromArgsInfoToFilter(FilterType * f) 
 {
-  
+  f->SetNumberOfBins(mArgsInfo.bins_arg);
+  f->SetAreaLossTolerance(mArgsInfo.tol_arg);
+  clitk::RelativePositionDirectionType d;
+  if (mArgsInfo.angle1_given) d.angle1 = clitk::deg2rad(mArgsInfo.angle1_arg);
+  if (mArgsInfo.angle2_given) d.angle2 = clitk::deg2rad(mArgsInfo.angle2_arg);
+  if (mArgsInfo.inverse_given) d.notFlag = clitk::deg2rad(mArgsInfo.inverse_flag);
+  f->SetDirection(d);
 }
+//--------------------------------------------------------------------
+
 
 //--------------------------------------------------------------------
 // Update with the number of dimensions and the pixeltype
@@ -75,28 +83,27 @@ template<class ImageType>
 void clitk::RelativePositionAnalyzerGenericFilter<ArgsInfoType>::
 UpdateWithInputImageType() 
 { 
-  // Reading input
-  typename ImageType::Pointer support = this->template GetInput<ImageType>(0);
-  typename ImageType::Pointer object = this->template GetInput<ImageType>(1);
-  typename ImageType::Pointer target = this->template GetInput<ImageType>(2);
-
   // Create filter
   typedef clitk::RelativePositionAnalyzerFilter<ImageType> FilterType;
   typename FilterType::Pointer filter = FilterType::New();
   
-  // Set global Options 
+  // Reading input
+  typename ImageType::Pointer support = this->template GetInput<ImageType>(0);
+  typename ImageType::Pointer object = this->template GetInput<ImageType>(1);
+  typename ImageType::Pointer target = this->template GetInput<ImageType>(2);
   filter->SetInputSupport(support);
   filter->SetInputObject(object);
   filter->SetInputTarget(target);
+
+  // Set global Options 
   SetOptionsFromArgsInfoToFilter<FilterType>(filter);
 
   // Go !
   filter->Update();
-  
-  // Write/Save results
-  //  typename ImageType::Pointer output = filter->GetOutput();
-  //this->template SetNextOutput<ImageType>(output); 
 
+  // Display output
+  filter->GetInfo().Println();
+  filter->GetInfoReverse().Println();
 }
 //--------------------------------------------------------------------