From: creatis <creatis@localhost.localdomain>
Date: Fri, 21 Mar 2014 13:39:53 +0000 (+0100)
Subject: Bug #2356 : allowing the definition of grey levels outside of the range of the image... 
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=refs%2Fheads%2FCM_ColorLayerImageView_test;p=creaMaracasVisu.git

Bug #2356 : allowing the definition of grey levels outside of the range of the image to be overlayed via ColorLayerImageView.
---

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx
index 7685135..7404dc1 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx
@@ -266,13 +266,12 @@ void ColorLayerImageView::ConfigLookupTable()  // virtual
   // CM
   // Grey level extrema retrieved from the image grey level extrema.
 
-
+/*
 printf("ERROR: EED ColorLayerImageView::ConfigLookupTable   ------_range----------------\n");
   _range[0]=0;
   _range[1]=4000;
-//  GetImage()->GetScalarRange(_range);
-
-
+*/
+  GetImage()->GetScalarRange(_range);
 
   // ------------------ Setting Default Values
   // Checks the size consistency of vectors _base_color and _grey_level_boundary.
@@ -295,8 +294,11 @@ printf("ERROR: EED ColorLayerImageView::ConfigLookupTable   ------_range--------
   vtkLookupTable* thresholdTable = GetThresholdTable();
 
   // CM Number of table values consistent with the effective number of values (see loop below).
-  thresholdTable->SetNumberOfTableValues(std::max( GetGreyLevelBoundaries( GetBaseColorNb() ), ceil(_range[1]) ) - std::min(  GetGreyLevelBoundaries(0), floor(_range[0]) ) + 1);
-  thresholdTable->SetTableRange(_range); 
+  double thresholdTable_range[2];
+  thresholdTable_range[0]= std::max( GetGreyLevelBoundaries( GetBaseColorNb() ), ceil(_range[1]) );
+  thresholdTable_range[1]= std::min( GetGreyLevelBoundaries(0), floor(_range[0]) );
+  thresholdTable->SetNumberOfTableValues(thresholdTable_range[0] - thresholdTable_range[1] + 1);
+  thresholdTable->SetTableRange(thresholdTable_range); 
   thresholdTable->SetAlphaRange(0, 1);
   thresholdTable->SetValueRange(0, 1);
   thresholdTable->SetSaturationRange(0, 0);