#2490 creaMaracasVisu Feature New High - Histogram Interaction

[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 a512a272e1a30804c1a5ebd9c169e706628f1f87..cbba163e24222ba889e5b5523b03627f940770a2 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx
@@ -45,9 +45,9 @@
 //=========================================================================
 ColorLayerImageView::ColorLayerImageView( )
 {
-  _z2          =       0;
-  _fix_dynamic =       true;
-  _color_type   =       false;
+  _z2                                  =       0;
+  _fix_dynamic         =       true;
+  _color_type          =       false;
 }
 
 //=========================================================================
@@ -216,9 +216,9 @@ void ColorLayerImageView::SetDefaultGreyLevelBoundary()
   // By default, the histogram is split into BaseColorNb areas of equal width.
   double delta = (maxTot - minTot)/GetBaseColorNb();
   for (int i = 1; i <= GetBaseColorNb() ; i ++)
-    {
-      _grey_level_boundary.push_back((double)minTot + i * delta);
-    }
+  {
+               _grey_level_boundary.push_back((double)minTot + i * delta);
+  }
 }
 
 //----------------------------------------------------------------------------
@@ -266,13 +266,11 @@ 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);
 
+
+
   // ------------------ Setting Default Values
   // Checks the size consistency of vectors _base_color and _grey_level_boundary.
   // In case of inconsistency, an exception should be thrown. Instead, the default values are set.
@@ -301,6 +299,8 @@ printf("ERROR: EED ColorLayerImageView::ConfigLookupTable   ------_range--------
   thresholdTable->SetTableRange(thresholdTable_range); 
   thresholdTable->SetAlphaRange(0, 1);
   thresholdTable->SetValueRange(0, 1);
+
+
   thresholdTable->SetSaturationRange(0, 0); 
   thresholdTable->SetRampToLinear( );
 
@@ -368,8 +368,28 @@ printf("ERROR: EED ColorLayerImageView::ConfigLookupTable   ------_range--------
            }
        }
     } //  End Of if (!_color_type)
+
+
        
+   thresholdTable->SetRange(_range[0], _range[1]); // image intensity range
+   thresholdTable->SetValueRange(0.0, 1.0); // from black to white
+
+
   thresholdTable->Build( );
+
+
+
+/*
+// Create a greyscale lookup table
+   vtkLookupTable* thresholdTable = GetThresholdTable();
+   thresholdTable->SetRange(0.5, 0.75); // image intensity range
+   thresholdTable->SetValueRange(0.0, 1); // from black to white
+   thresholdTable->SetHueRange(0.0, 1.0); // from black to white
+   thresholdTable->SetSaturationRange(0.0, 1.0); // no color saturation
+   thresholdTable->SetRampToLinear();
+   thresholdTable->Build();
+*/ 
+
   // ------------------ End Of Defining the Threshold Table
 
   //EO CM