From acf6909509155546cc95c54a568d871fda4c2152 Mon Sep 17 00:00:00 2001 From: creatis Date: Fri, 21 Mar 2014 14:39:53 +0100 Subject: [PATCH] Bug #2356 : allowing the definition of grey levels outside of the range of the image to be overlayed via ColorLayerImageView. --- .../ThresholdImageView/ColorLayerImageView.cxx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) 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); -- 2.45.1