X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FThresholdImageView%2FColorLayerImageView.cxx;h=3d848abee2afa6857b50a3fca8f74a69b46af89b;hb=ca35b13e046343c8b50cbd6b833828b06c9d1608;hp=76fa42b2c456e4c1e2547fc354499dbcf542ad4a;hpb=4645482ed1eae5aaabdd813b784acafd13c41179;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx
index 76fa42b..3d848ab 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx
@@ -168,6 +168,10 @@ double ColorLayerImageView::GetBaseColors(unsigned int index)
 //----------------------------------------------------------------------------
 void ColorLayerImageView::SetGreyLevelBoundaries(std::vector<double> & grey_level_boundary)
 {
+ _grey_level_boundary = grey_level_boundary;
+
+//EED 2017 / 11 / 27
+/*
   // The size must be greater than or equal to 2 (at least min and max must exist).
   if ( grey_level_boundary.size() >= 2)
     {
@@ -177,6 +181,8 @@ void ColorLayerImageView::SetGreyLevelBoundaries(std::vector<double> & grey_leve
   // Otherwise, an exception should be thrown.
   else if (grey_level_boundary.size() != 0)
     std::cout << "CM ColorLayerImageView::SetGreyLevelBoundaries : ERROR!!! The grey level boundaries vector has an inconsistent size. It must be of a size greater than or equal to 2 (at least min and max must exist), but its size is: " << grey_level_boundary.size() << ". Therefore, the histogram will be equally split." << std::endl;
+*/
+
 }
 
 //----------------------------------------------------------------------------
@@ -302,6 +308,7 @@ void ColorLayerImageView::SetDefaultBaseColorAndGreyLevelBoundary()
 //----------------------------------------------------------------------------
 void ColorLayerImageView::ConfigLookupTable()  // virtual
 {
+
   // CM 2014
   // EED	 28/01/2015 	
   // Grey level extrema retrieved from the image grey level extrema.
@@ -323,8 +330,8 @@ void ColorLayerImageView::ConfigLookupTable()  // virtual
   		{
      		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;
+//EED				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;
+//EED				std::cout << "CM The default values for the base colors and the grey level boundaries will be set." << std::endl;
 				SetDefaultGreyLevelBoundary();	   
       		} // if 
 		} // _color_type 
@@ -333,8 +340,8 @@ void ColorLayerImageView::ConfigLookupTable()  // virtual
   		{
      		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;
+//EED				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;
+//EED				std::cout << "CM The default values for the base colors and the grey level boundaries will be set." << std::endl;
 				SetDefaultGreyLevelBoundary();	   
       		} // if 
 		} // _color_type 
@@ -422,7 +429,7 @@ void ColorLayerImageView::ConfigLookupTable()  // virtual
 				end 	= GrayLevel_TO_colorTableIndex( GetGreyLevelBoundaries(iColor+1) );  
 	         	t1 		= _transparence_level_boundary[iColor];
 				t2		= _transparence_level_boundary[iColor+1];
-printf("EED ColorLayerImageView::ConfigLookupTable   Make something with transparence \n");
+//printf("EED ColorLayerImageView::ConfigLookupTable   Make something with transparence \n");
 				FillColorTable( start,end, r1,g1,b1, r2,g2,b2, t1,t2 );
 			}// for 
 		} //if 				
@@ -438,8 +445,6 @@ printf("EED ColorLayerImageView::ConfigLookupTable   Make something with transpa
 //  thresholdTable->SetBelowRangeColor(0,0,0,0);	
 
   thresholdTable->Build( );
-
-
   //EO CM EED
 }