Amends the bug #2356 fixing by fixing it.

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / ThresholdImageView / ColorLayerImageView.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx
index 5e940da3426e18a314151c111c5e01a298bc8b01..a512a272e1a30804c1a5ebd9c169e706628f1f87 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx
@@ -63,12 +63,59 @@ void ColorLayerImageView::SetSliceFixDynamic(bool fix_dynamic)
   _fix_dynamic = fix_dynamic;
 }
 
+//----------------------------------------------------------------------------
+void ColorLayerImageView::SetX2(int x2)  
+{
+  _x2 = x2;
+}
+
+//----------------------------------------------------------------------------
+void ColorLayerImageView::SetY2(int y2)  
+{
+  _y2 = y2;
+}
+
+
 //----------------------------------------------------------------------------
 void ColorLayerImageView::SetZ2(int z2)  
 {
   _z2 = z2;
 }
 
+
+
+//----------------------------------------------------------------------------
+int ColorLayerImageView::GetX() // virtual 
+{
+  int result=0;
+  if (_fix_dynamic==false)
+    {
+      result = _x2;
+    }
+  else
+    {
+      result = LayerImageBase::GetX();
+    }  
+
+  return result;
+}
+
+//----------------------------------------------------------------------------
+int ColorLayerImageView::GetY() // virtual 
+{
+  int result=0;
+  if (_fix_dynamic==false)
+    {
+      result = _y2;
+    }
+  else
+    {
+      result = LayerImageBase::GetY();
+    }  
+
+  return result;
+}
+
 //----------------------------------------------------------------------------
 int ColorLayerImageView::GetZ() // virtual 
 {
@@ -218,8 +265,13 @@ void ColorLayerImageView::ConfigLookupTable()  // virtual
 {
   // CM
   // Grey level extrema retrieved from the image grey level extrema.
-  GetImage()->GetScalarRange(_range);
 
+/*
+printf("ERROR: EED ColorLayerImageView::ConfigLookupTable   ------_range----------------\n");
+  _range[0]=0;
+  _range[1]=4000;
+*/
+  GetImage()->GetScalarRange(_range);
 
   // ------------------ Setting Default Values
   // Checks the size consistency of vectors _base_color and _grey_level_boundary.
@@ -242,8 +294,11 @@ void ColorLayerImageView::ConfigLookupTable()  // virtual
   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[1]= std::max( GetGreyLevelBoundaries( GetBaseColorNb() ), ceil(_range[1]) );
+  thresholdTable_range[0]= std::min( GetGreyLevelBoundaries(0), floor(_range[0]) );
+  thresholdTable->SetNumberOfTableValues(thresholdTable_range[1] - thresholdTable_range[0] + 1);
+  thresholdTable->SetTableRange(thresholdTable_range); 
   thresholdTable->SetAlphaRange(0, 1);
   thresholdTable->SetValueRange(0, 1);
   thresholdTable->SetSaturationRange(0, 0);