X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FThresholdImageView%2FColorLayerImageView.cxx;h=07634e33399c311890428c732c515f1a07893f09;hb=dea0efc567d8332b2e7eb936e3ba4ac1c11b2542;hp=61bb9bb0f682cd3f17d323ec458d6f957a0277fd;hpb=b61b15415d19c665de225637c9136c634a5831c5;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 61bb9bb..07634e3 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx @@ -45,7 +45,7 @@ //========================================================================= ColorLayerImageView::ColorLayerImageView( ) { - _z2 = 0; + _z2 = 0; _fix_dynamic = true; _color_type = false; } @@ -134,13 +134,24 @@ int ColorLayerImageView::GetZ() // virtual void ColorLayerImageView::SetBaseColors(std::vector & base_color) { // The base color vector must be of a size multiple of 3, not null. - if (base_color.size() != 0 && base_color.size() % 3 == 0) - _base_color = base_color; - // Otherwise, an exception should be thrown. - else if (base_color.size() != 0) - std::cout << "CM ColorLayerImageView::SetBaseColors : ERROR!!! The base color vector has an inconsistent size. It must be of a size multiple of 3, different from 0, but its size is: "<< base_color.size() << ". Therefore, the default values will be used as base colors." << std::endl; +//EED if ((base_color.size() != 0) && (base_color.size() % 3 == 0)) + if ( base_color.size() % 3 == 0) + { + _base_color = base_color; + } else if (base_color.size() != 0) // Otherwise, an exception should be thrown. + { + std::cout << "CM ColorLayerImageView::SetBaseColors : ERROR!!! The base color vector has an inconsistent size. It must be of a size multiple of 3, different from 0, but its size is: "<< base_color.size() << ". Therefore, the default values will be used as base colors." << std::endl; + } } + +//---------------------------------------------------------------------------- +void ColorLayerImageView::SetBaseTransparence(std::vector & base_transparence) +{ + _transparence_level_boundary = base_transparence; +} + + //---------------------------------------------------------------------------- double ColorLayerImageView::GetBaseColors(unsigned int index) { @@ -157,6 +168,10 @@ double ColorLayerImageView::GetBaseColors(unsigned int index) //---------------------------------------------------------------------------- void ColorLayerImageView::SetGreyLevelBoundaries(std::vector & 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) { @@ -166,6 +181,8 @@ void ColorLayerImageView::SetGreyLevelBoundaries(std::vector & 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; +*/ + } //---------------------------------------------------------------------------- @@ -196,116 +213,173 @@ int ColorLayerImageView::GetBaseColorNb() //---------------------------------------------------------------------------- void ColorLayerImageView::SetDefaultGreyLevelBoundary() { - // CM Sets the default behaviour concerning the lookup table keeping the base colors already set. - _grey_level_boundary.clear(); - // This avoids a potential division by 0 through delta during the lookup table configuration. - if (_range[1]==0) - { - _range[1]=255; + // CM Sets the default behaviour concerning the lookup table keeping the base colors already set. + _grey_level_boundary.clear(); + + // This avoids a potential division by 0 through delta during the lookup table configuration. + if (_range[1]==0) + { + _range[1]=255; } - // Grey level extrema are set by default to the image grey level extrema. - double minTot = _range[0]; - double maxTot = _range[1]; + int i; + double delta; + // Grey level extrema are set by default to the image grey level extrema. + double minTot = _range[0]; + double maxTot = _range[1]; - _grey_level_boundary.push_back(minTot); - - // By default, the histogram is split into BaseColorNb areas of equal width. - double delta = (maxTot - minTot)/GetBaseColorNb(); - for (int i = 1; i <= GetBaseColorNb() ; i ++) - { - _grey_level_boundary.push_back(minTot + i * delta); - } // for + if (_color_type) + { + delta = (maxTot - minTot)/GetBaseColorNb(); + // By default, the histogram is split into BaseColorNb areas of equal width. + for (i = 0; i <= GetBaseColorNb() ; i ++) + { + _grey_level_boundary.push_back(minTot + i * delta); + } // for + } else { + delta = (maxTot - minTot)/(GetBaseColorNb()-1); + for (i = 0; i < GetBaseColorNb() ; i ++) + { + _grey_level_boundary.push_back(minTot + i * delta); + } // for + } // if } //---------------------------------------------------------------------------- void ColorLayerImageView::SetDefaultBaseColorAndGreyLevelBoundary() { + // CM Sets the default behaviour concerning the lookup table. _grey_level_boundary.clear(); _base_color.clear(); // Base colors are set to blue, yellow and red. // Blue. _base_color.push_back(0.0); + _base_color.push_back(0.0); + _base_color.push_back(0.5); + + _base_color.push_back(0.0); + _base_color.push_back(0.0); + _base_color.push_back(1.0); + _base_color.push_back(0.0); _base_color.push_back(1.0); - // Yellow. + _base_color.push_back(1.0); + _base_color.push_back(1.0); _base_color.push_back(1.0); _base_color.push_back(0.0); - // Red. + _base_color.push_back(1.0); _base_color.push_back(0.0); _base_color.push_back(0.0); + _base_color.push_back(0.5); + _base_color.push_back(0.0); + _base_color.push_back(0.0); + + // This avoids a potential division by 0 through delta during the lookup table configuration. if (_range[1]==0) { _range[1]=255; } - double minTot = floor (_range[0]); - double maxTot = ceil (_range[1]); +// double minTot = floor (_range[0]); +// double maxTot = ceil (_range[1]); + double minTot = _range[0]; + double maxTot = _range[1]; - _grey_level_boundary.push_back(minTot); - + double delta = (maxTot - minTot)/8.0; // By default, the histogram is split into three areas of equal width. - double delta = (maxTot - minTot)/3.0; - _grey_level_boundary.push_back(minTot + delta); - _grey_level_boundary.push_back(minTot + 2*delta); - _grey_level_boundary.push_back(maxTot); + _grey_level_boundary.push_back(minTot + delta*0); + _grey_level_boundary.push_back(minTot + delta*1); +// _grey_level_boundary.push_back(minTot + delta*2); + _grey_level_boundary.push_back(minTot + delta*3); +// _grey_level_boundary.push_back(minTot + delta*4); + _grey_level_boundary.push_back(minTot + delta*5); + // _grey_level_boundary.push_back(minTot + delta*6); + _grey_level_boundary.push_back(minTot + delta*7); + _grey_level_boundary.push_back(minTot + delta*8); } //---------------------------------------------------------------------------- void ColorLayerImageView::ConfigLookupTable() // virtual { + // CM 2014 - // EED 28/01/2015 - + // EED 28/01/2015 // Grey level extrema retrieved from the image grey level extrema. - - GetImage()->GetScalarRange(_range); +//EED 20 oct 2015 +// GetImage()->GetScalarRange(_range); + GetImageScalarRange(); double minRange = _range[0]; double maxRange = _range[1]; // ------------------ 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) + + 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() - 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(); - } + } 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 (_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 + int iTransparence,transparenceSize = _transparence_level_boundary.size(); + for (iTransparence=transparenceSize ; iTransparence < GetBaseColorNb(); iTransparence++ ) + { + _transparence_level_boundary.push_back(1); + } + + // ------------------ Defining the Threshold Table vtkLookupTable* thresholdTable = GetThresholdTable(); + double thresholdTable_range[2]; - double r1,r2,g1,g2,b1,b2; + double r1,r2,g1,g2,b1,b2,t1,t2; int start,end; // CM Number of table values consistent with the effective number of values (see loop below). - thresholdTable_range[1]= std::max( GetGreyLevelBoundaries( _grey_level_boundary.size()-1 ) , ceil(_range[1]) ); - thresholdTable_range[0]= std::min( GetGreyLevelBoundaries(0) , floor(_range[0]) ); + thresholdTable_range[1]= std::max( GetGreyLevelBoundaries( _grey_level_boundary.size()-1 ) , ceil(maxRange) ); + thresholdTable_range[0]= std::min( GetGreyLevelBoundaries(0), floor(minRange) ); + + thresholdTable_range[1]= GetGreyLevelBoundaries( _grey_level_boundary.size()-1 ); + thresholdTable_range[0]= GetGreyLevelBoundaries(0); thresholdTable->SetTableRange(thresholdTable_range); - thresholdTable->SetAlphaRange(0, 1); - thresholdTable->SetValueRange(0, 1); + thresholdTable->SetAlphaRange( 0,1 ); + thresholdTable->SetValueRange( 0,1 ); - thresholdTable->SetSaturationRange(0, 0); + thresholdTable->SetSaturationRange( 0,0 ); thresholdTable->SetRampToLinear( ); maxColorsThresholdTable = 1000; - thresholdTable->SetNumberOfTableValues( maxColorsThresholdTable ); + thresholdTable->SetNumberOfTableValues( maxColorsThresholdTable+1 ); + thresholdTable->SetNanColor(0,0,0,0); // Defines the lookup table. @@ -314,95 +388,95 @@ void ColorLayerImageView::ConfigLookupTable() // virtual // _color_type true, i.e. plain colors. // Sets the plain color for each grey level interval. - if (_color_type) + if (_color_type) // Plain { - if ( minRangeGetGreyLevelBoundaries( _grey_level_boundary.size()-1 ) ) { - start = GrayLevel_TO_colorTableIndex( GetGreyLevelBoundaries( _grey_level_boundary.size()-1 ) ); + start = GrayLevel_TO_colorTableIndex( GetGreyLevelBoundaries( _grey_level_boundary.size()-1 ) ); end = GrayLevel_TO_colorTableIndex( maxRange ); - FillColorTable(start,end, 0,0,0, 0,0,0); + FillColorTable(start,end, 0,0,0, 0,0,0, 0,0); } - for (int iColor = 0; iColor < GetBaseColorNb(); iColor++) { r1 = GetBaseColors(iColor*3+0); g1 = GetBaseColors(iColor*3+1); b1 = GetBaseColors(iColor*3+2); - start = GrayLevel_TO_colorTableIndex( GetGreyLevelBoundaries(iColor) ); + start = GrayLevel_TO_colorTableIndex( GetGreyLevelBoundaries(iColor) ); end = GrayLevel_TO_colorTableIndex( GetGreyLevelBoundaries(iColor+1) ); - FillColorTable(start,end, r1,g1,b1,r1,g1,b1); + t1 = _transparence_level_boundary[iColor]; +// t2 = _transparence_level_boundary[iColor+1]; + FillColorTable(start,end, r1,g1,b1,r1,g1,b1,t1,t1); } // for i - } // End Of if (_color_type) - - // _color_type false, i.e. gradient color - else - { -//EED 28/01/2015 + } else { // _color_type false, i.e. gradient color if (GetBaseColorNb() > 1) { - for (int iColor = 0; iColor < GetBaseColorNb(); iColor++) + for (int iColor = 0; iColor < GetBaseColorNb()-1; iColor++) { - if (iColor==0) - { - r1 = 0; - g1 = 0; - b1 = 0; - } else { - r1 = GetBaseColors((iColor-1)*3+0); - g1 = GetBaseColors((iColor-1)*3+1); - b1 = GetBaseColors((iColor-1)*3+2); - } // if iColor == 0 - - r2 = GetBaseColors(iColor*3+0); - g2 = GetBaseColors(iColor*3+1); - b2 = GetBaseColors(iColor*3+2); - start = GrayLevel_TO_colorTableIndex( GetGreyLevelBoundaries(iColor) ); + r1 = GetBaseColors( (iColor+0)*3+0 ); + g1 = GetBaseColors( (iColor+0)*3+1 ); + b1 = GetBaseColors( (iColor+0)*3+2 ); + r2 = GetBaseColors( (iColor+1)*3+0); + g2 = GetBaseColors( (iColor+1)*3+1); + b2 = GetBaseColors( (iColor+1)*3+2); + start = GrayLevel_TO_colorTableIndex( GetGreyLevelBoundaries(iColor) ); end = GrayLevel_TO_colorTableIndex( GetGreyLevelBoundaries(iColor+1) ); - FillColorTable( start,end, r1,g1,b1, r2,g2,b2 ); + 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 } // End Of if (!_color_type) - thresholdTable->SetRange( minRange, maxRange ); - thresholdTable->SetValueRange( 0.0, 1.0 ); + double minRangeForColorBar, maxRangeForColorBar; + GetRangeForColorBar( minRangeForColorBar, maxRangeForColorBar ); + thresholdTable->SetRange( minRangeForColorBar, maxRangeForColorBar ); - thresholdTable->Build( ); +// thresholdTable->SetTableRange( minRange, maxRange ); +// thresholdTable->SetValueRange( 0.0, 1.0 ); +// thresholdTable->SetAboveRangeColor(0,0,0,0); +// thresholdTable->SetBelowRangeColor(0,0,0,0); + thresholdTable->Build( ); //EO CM EED } //---------------------------------------------------------------------------- int ColorLayerImageView::GrayLevel_TO_colorTableIndex( double VALUE ) { - GetImage()->GetScalarRange(_range); + GetImage()->Update(); + +//EED 20 oct 2015 +// GetImage()->GetScalarRange(_range); + GetImageScalarRange(); + double minRange = _range[0]; double maxRange = _range[1]; return maxColorsThresholdTable * (VALUE-minRange) / (maxRange-minRange); } //---------------------------------------------------------------------------- -void ColorLayerImageView::FillColorTable(int start, int end, double r1, double g1, double b1, double r2, double g2, double b2) +void ColorLayerImageView::FillColorTable(int start, int end, double r1, double g1, double b1, double r2, double g2, double b2, double t1, double t2) { vtkLookupTable* thresholdTable = GetThresholdTable(); - int iTable; - double delta = end-start; - double dr = (r2-r1)/delta; - double dg = (g2-g1)/delta; - double db = (b2-b1)/delta; + int iTable; + double delta = end-start; + double dr = (r2-r1)/delta; + double dg = (g2-g1)/delta; + double db = (b2-b1)/delta; + double dt = (t2-t1)/delta; for (iTable=0; iTable<=delta; iTable++) { - thresholdTable->SetTableValue( iTable+start , r1+dr*iTable, g1+dg*iTable, b1+db*iTable,1); + thresholdTable->SetTableValue( iTable+start , r1+dr*iTable, g1+dg*iTable, b1+db*iTable,t1+dt*iTable); } // for iTable - if (start==0) thresholdTable->SetTableValue( start , r1, g1, b1,0); // The first color in the table is transparent }