[pubgit-commits-list] Clitk branch master updated. v1.2.0-632-geee2b74

[root]

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  eee2b74b70c0972894daf6a75685a8ef87e85c8f (commit)
      from  cd054aec7943b5973dbf27ec20f62f38f0f11719 (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=eee2b74b70c0972894daf6a75685a8ef87e85c8f

commit eee2b74b70c0972894daf6a75685a8ef87e85c8f
Author: Romulo Pinho <romulo.pinho at lyon.unicancer.fr>
Date:   Fri Jan 27 16:05:06 2012 +0100

    corrected bug in fusion with double values

diff --git a/vv/vvSlicerManager.cxx b/vv/vvSlicerManager.cxx
index e739eef..813ba22 100644
--- a/vv/vvSlicerManager.cxx
+++ b/vv/vvSlicerManager.cxx
@@ -1232,15 +1232,18 @@ void vvSlicerManager::SetColorMap(int colormap)
     }
     
     fusLUT->ForceBuild();
+    double v[4];
     
     // set color table transparency
-    double alpha_range_end = frange[0] + (double)mFusionThresOpacity*(frange[1] - frange[0])/100;
-    for (double i = frange[0]; i < alpha_range_end; i++) {
-      double v[4];
-      vtkIdType index = fusLUT->GetIndex(i);
-      fusLUT->GetTableValue(index, v);
+    double range_end = frange[0] + (double)mFusionThresOpacity*(frange[1] - frange[0])/100;
+    double curr_value = frange[0];
+    int nvalues = fusLUT->GetNumberOfTableValues();
+    //for (double i = frange[0]; i <= alpha_range_end; i++) {
+    for (double i = 0; curr_value < range_end; i++) {  
+      fusLUT->GetTableValue(i, v);
       v[3] = 0;
-      fusLUT->SetTableValue(index, v);
+      fusLUT->SetTableValue(i, v);
+      curr_value += (frange[1] - frange[0])/nvalues;
     }
   }
   for ( unsigned int i = 0; i < mSlicers.size(); i++) {

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

Summary of changes:
 vv/vvSlicerManager.cxx |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Clitk