From e9d5c2a6cfeb298fa1214060ad0f220af9d38e3c Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Wed, 14 Sep 2016 13:03:41 +0200 Subject: [PATCH] #3016 creaMaracasVisu Bug New Normal - ColorLayer Box, error with : Error message in Plane color type --- .../ColorLayerImageView.cxx | 29 +++++++++++++++---- 1 file changed, 23 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 ddfb35e..6dd7ca5 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx @@ -318,12 +318,29 @@ 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(); - } + printf("EED ColorLayerImageView::ConfigLookupTable() %d %d\n", GetBaseColorNb() , _grey_level_boundary.size() ); + + + 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 -- 2.47.1