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=7cb4e902648ed14d2ffe5291297ef34ddd73fddd;hpb=72698df5c9044b7b67fe8fa1d4346e7ebb7d9dd1;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 7cb4e90..3d848ab 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx
@@ -330,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 
@@ -340,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 
@@ -429,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 				
@@ -451,7 +451,16 @@ printf("EED ColorLayerImageView::ConfigLookupTable   Make something with transpa
 //----------------------------------------------------------------------------
 int ColorLayerImageView::GrayLevel_TO_colorTableIndex( double VALUE )
 {
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
   GetImage()->Update();
+#else
+  //...
+#endif
+
+
+
 
 //EED 20 oct 2015
 //  GetImage()->GetScalarRange(_range);