[clitk-commits-list] Clitk branch master updated. v1.2.0-672-gc052120

root root at tux.creatis.insa-lyon.fr
Fri Feb 3 07:53:46 CET 2012


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Clitk".

The branch, master has been updated
       via  c052120cffbe8dfec61446dd715a9dd145a4dccd (commit)
      from  214e8fb240af99de593f18965c9542fcf00ac81a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.creatis.insa-lyon.fr/pubgit/?p=clitk.git;a=commitdiff;h=c052120cffbe8dfec61446dd715a9dd145a4dccd

commit c052120cffbe8dfec61446dd715a9dd145a4dccd
Author: David Sarrut <david.sarrut at gmail.com>
Date:   Fri Feb 3 07:52:24 2012 +0100

    correct fuzzyMapOnlyFlag

diff --git a/itk/clitkSliceBySliceRelativePositionFilter.txx b/itk/clitkSliceBySliceRelativePositionFilter.txx
index 449ffff..a8d12ad 100644
--- a/itk/clitkSliceBySliceRelativePositionFilter.txx
+++ b/itk/clitkSliceBySliceRelativePositionFilter.txx
@@ -127,7 +127,7 @@ GenerateOutputInformation()
     PrintOptions();
   }
 
-  if (this->GetFuzzyMapOnlyFlag()) this->ComputeFuzzyMapFlagOn();
+  //  if (this->GetFuzzyMapOnlyFlag()) this->ComputeFuzzyMapFlagOn();
 
   // Get input pointer
   input = dynamic_cast<ImageType*>(itk::ProcessObject::GetInput(0));
@@ -229,7 +229,7 @@ GenerateOutputInformation()
     mObjectSlices[i] = LabelizeAndCountNumberOfObjects<SliceType>(mObjectSlices[i], 0, true, 1, nb);
 
     // If no object and empty slices and if we need the full fuzzy map, create a dummy one.
-    if ((nb==0) && (this->GetComputeFuzzyMapFlag())) {
+    if ((nb==0) && (this->GetFuzzyMapOnlyFlag())) {
       typename FloatSliceType::Pointer one = FloatSliceType::New();
       one->CopyInformation(mObjectSlices[0]);
       one->SetRegions(mObjectSlices[0]->GetLargestPossibleRegion());
@@ -306,13 +306,13 @@ GenerateOutputInformation()
 
         // should we stop after fuzzy map ?
         relPosFilter->SetFuzzyMapOnlyFlag(this->GetFuzzyMapOnlyFlag());
-        relPosFilter->SetComputeFuzzyMapFlag(this->GetComputeFuzzyMapFlag());
+        //        relPosFilter->SetComputeFuzzyMapFlag(this->GetComputeFuzzyMapFlag());
       
         // Go !
         relPosFilter->Update();
 
         // If we stop after the fuzzy map, store the fuzzy slices
-        if (this->GetComputeFuzzyMapFlag()) {
+        if (this->GetFuzzyMapOnlyFlag()) {
           mFuzzyMapSlices[i] = relPosFilter->GetFuzzyMap();
           // writeImage<FloatSliceType>(mFuzzyMapSlices[i], "slice_"+toString(i)+".mha");
         }
@@ -348,7 +348,7 @@ GenerateOutputInformation()
   this->template StopCurrentStep<ImageType>(m_working_input);
 
   // Join the fuzzy map if needed
-  if (this->GetComputeFuzzyMapFlag()) {
+  if (this->GetFuzzyMapOnlyFlag()) {
     this->m_FuzzyMap = clitk::JoinSlices<FloatImageType>(mFuzzyMapSlices, m_working_input, GetDirection());
     this->template StopCurrentStep<FloatImageType>(this->m_FuzzyMap);
     if (this->GetFuzzyMapOnlyFlag()) return;

-----------------------------------------------------------------------

Summary of changes:
 itk/clitkSliceBySliceRelativePositionFilter.txx |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Clitk


More information about the Clitk-commits-list mailing list