X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FThresholdImageView%2FColorLayerImageView.cxx;h=07634e33399c311890428c732c515f1a07893f09;hb=8cb2e736dbd160649089afd44928db6d26febcca;hp=ddfb35e0e5abea9a92dd27938426a30c363a7cbe;hpb=dd319ebc7abbc47850e0931b9c42bd1157786e13;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 ddfb35e..07634e3 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.
@@ -314,16 +321,31 @@ void ColorLayerImageView::ConfigLookupTable()  // virtual
   // ------------------ 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.
+
   	if (GetBaseColorNb() == 0)
 	{
  		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
 
@@ -333,6 +355,7 @@ void ColorLayerImageView::ConfigLookupTable()  // virtual
       _transparence_level_boundary.push_back(1);
 	}
 
+
   // ------------------ Defining the Threshold Table
   vtkLookupTable* thresholdTable = GetThresholdTable();
 
@@ -406,6 +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");
 				FillColorTable( start,end, r1,g1,b1, r2,g2,b2, t1,t2 );
 			}// for 
 		} //if 				
@@ -421,7 +445,6 @@ void ColorLayerImageView::ConfigLookupTable()  // virtual
 //  thresholdTable->SetBelowRangeColor(0,0,0,0);	
 
   thresholdTable->Build( );
-
   //EO CM EED
 }