#3017 creaMaracasVisu Feature New Normal - ColorLayer Box, Transparency option...

[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 ddfb35e0e5abea9a92dd27938426a30c363a7cbe..dadf2caecba1fdbf9b4506a0f9e70e51c465e7a0 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx
@@ -318,12 +318,27 @@ void ColorLayerImageView::ConfigLookupTable()  // virtual
        {
                SetDefaultBaseColorAndGreyLevelBoundary();
        } else {  // If at least one color has been set, set the grey level boundaries to build an equipartition of the image grey levels, keeping the base colors defined.
-       if (GetBaseColorNb() != (int)_grey_level_boundary.size() )
-       {
-               std::cout << "CM ColorLayerImageView::ConfigLookupTable : ERROR!!! Inconsistency between the sizes of vectors _base_color and _grey_level_boundary. _base_color.size()/3 (=" <<_base_color.size()/3 << ") should be equal to _grey_level_boundary.size() (=" << _grey_level_boundary.size() << ")." << std::endl;
-                       std::cout << "CM The default values for the base colors and the grey level boundaries will be set." << std::endl;
-                       SetDefaultGreyLevelBoundary();     
-      }
+
+               if (_color_type==true)  // Plain
+               {
+               if (GetBaseColorNb() != (int)_grey_level_boundary.size()-1)
+               {
+                               std::cout << "CM ColorLayerImageView::ConfigLookupTable : ERROR!!! Inconsistency between the sizes of vectors _base_color and _grey_level_boundary. _base_color.size()/3 (=" <<_base_color.size()/3 << ") should be equal to _grey_level_boundary.size()+1 (=" << _grey_level_boundary.size()<<"+1)." << std::endl;
+                               std::cout << "CM The default values for the base colors and the grey level boundaries will be set." << std::endl;
+                               SetDefaultGreyLevelBoundary();     
+               } // if 
+               } // _color_type 
+
+               if (_color_type==false)  // Gradiant
+               {
+               if (GetBaseColorNb() != (int)_grey_level_boundary.size())
+               {
+                               std::cout << "CM ColorLayerImageView::ConfigLookupTable : ERROR!!! Inconsistency between the sizes of vectors _base_color and _grey_level_boundary. _base_color.size()/3 (=" <<_base_color.size()/3 << ") should be equal to _grey_level_boundary.size() (=" << _grey_level_boundary.size()<<")." << std::endl;
+                               std::cout << "CM The default values for the base colors and the grey level boundaries will be set." << std::endl;
+                               SetDefaultGreyLevelBoundary();     
+               } // if 
+               } // _color_type 
+
    }
   // ------------------ End Of Setting Default Values