X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FThresholdImageView%2FColorLayerImageView.cxx;h=61bb9bb0f682cd3f17d323ec458d6f957a0277fd;hb=497867af0d89e85bac1566016ee3fe1014207489;hp=76851357f141e3fd083e013e14563e4af36666b2;hpb=9d8709b5e9d72b9f0034224bb4c00281264fb28d;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 7685135..61bb9bb 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx @@ -45,9 +45,9 @@ //========================================================================= ColorLayerImageView::ColorLayerImageView( ) { - _z2 = 0; - _fix_dynamic = true; - _color_type = false; + _z2 = 0; + _fix_dynamic = true; + _color_type = false; } //========================================================================= @@ -82,8 +82,6 @@ void ColorLayerImageView::SetZ2(int z2) _z2 = z2; } - - //---------------------------------------------------------------------------- int ColorLayerImageView::GetX() // virtual { @@ -208,17 +206,17 @@ void ColorLayerImageView::SetDefaultGreyLevelBoundary() } // Grey level extrema are set by default to the image grey level extrema. - int minTot = floor (_range[0]); - int maxTot = ceil (_range[1]); + double minTot = _range[0]; + double maxTot = _range[1]; - _grey_level_boundary.push_back((double)minTot); + _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((double)minTot + i * delta); - } + { + _grey_level_boundary.push_back(minTot + i * delta); + } // for } //---------------------------------------------------------------------------- @@ -247,130 +245,165 @@ void ColorLayerImageView::SetDefaultBaseColorAndGreyLevelBoundary() _range[1]=255; } - int minTot = floor (_range[0]); - int maxTot = ceil (_range[1]); + double minTot = floor (_range[0]); + double maxTot = ceil (_range[1]); - _grey_level_boundary.push_back((double)minTot); + _grey_level_boundary.push_back(minTot); // 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((double)maxTot); + _grey_level_boundary.push_back(maxTot); } //---------------------------------------------------------------------------- void ColorLayerImageView::ConfigLookupTable() // virtual { - // CM + // CM 2014 + // EED 28/01/2015 + // Grey level extrema retrieved from the image grey level extrema. - -printf("ERROR: EED ColorLayerImageView::ConfigLookupTable ------_range----------------\n"); - _range[0]=0; - _range[1]=4000; -// GetImage()->GetScalarRange(_range); - - + GetImage()->GetScalarRange(_range); + 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) - SetDefaultBaseColorAndGreyLevelBoundary(); - - // 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. - else - if (GetBaseColorNb() != (_grey_level_boundary.size() - 1) ) + { + 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(); + 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(); } + } // ------------------ End Of Setting Default Values - // ------------------ Defining the Threshold Table vtkLookupTable* thresholdTable = GetThresholdTable(); + double thresholdTable_range[2]; + double r1,r2,g1,g2,b1,b2; + int start,end; // CM Number of table values consistent with the effective number of values (see loop below). - thresholdTable->SetNumberOfTableValues(std::max( GetGreyLevelBoundaries( GetBaseColorNb() ), ceil(_range[1]) ) - std::min( GetGreyLevelBoundaries(0), floor(_range[0]) ) + 1); - thresholdTable->SetTableRange(_range); + 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->SetTableRange(thresholdTable_range); thresholdTable->SetAlphaRange(0, 1); thresholdTable->SetValueRange(0, 1); + thresholdTable->SetSaturationRange(0, 0); thresholdTable->SetRampToLinear( ); + maxColorsThresholdTable = 1000; + thresholdTable->SetNumberOfTableValues( maxColorsThresholdTable ); + + // Defines the lookup table. // If the image has a degradation in one (or both) extremum (lower or higher), // sets the corresponding grey levels as transparent white in the lookup table. - for (int i = floor(_range[0]); i <= GetGreyLevelBoundaries(0); i++) - { - thresholdTable -> SetTableValue( i, 0, 0, 0, 0); - } - for (int i = GetGreyLevelBoundaries( GetBaseColorNb() ) + 1 ; i <= ceil(_range[1]); i++) - { - thresholdTable -> SetTableValue( i, 0, 0, 0, 0); - } - - int delta; // _color_type true, i.e. plain colors. // Sets the plain color for each grey level interval. if (_color_type) - { - for (int i = 0; i < GetBaseColorNb(); i++) - { - delta = GetGreyLevelBoundaries(i+1) - GetGreyLevelBoundaries(i); - for (int ii = 1; ii <= delta; ii++) - { - thresholdTable->SetTableValue(GetGreyLevelBoundaries(i) + ii, - GetBaseColors(i*3), - GetBaseColors(i*3 + 1), - GetBaseColors(i*3 + 2), - 1); - } - } - } // End Of if (_color_type) + { + + if ( minRangeGetGreyLevelBoundaries( _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); + } + + 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) ); + end = GrayLevel_TO_colorTableIndex( GetGreyLevelBoundaries(iColor+1) ); + FillColorTable(start,end, r1,g1,b1,r1,g1,b1); + } // for i + } // End Of if (_color_type) - // _color_type false, i.e. gradient color else - { - // First color: - // Creates a linear range from white to the first color. - delta = GetGreyLevelBoundaries(1) - GetGreyLevelBoundaries(0); - for (int ii = 1; ii <= delta ; ii++) - { - thresholdTable->SetTableValue( GetGreyLevelBoundaries(0) + ii, GetBaseColors(0) * ii/delta, - GetBaseColors(1) * ii/delta, GetBaseColors(2) * ii/delta, 1); - } - - // If other colors exist: - // Creates linear ranges between one color and the following in the color vector. + { +//EED 28/01/2015 if (GetBaseColorNb() > 1) - { - for (int i = 1; i < GetBaseColorNb(); i++) - { - delta = GetGreyLevelBoundaries(i+1) - GetGreyLevelBoundaries(i); - for (int ii = 1; ii <= delta; ii++) { - // Color computation : previous_color + (current_color - previous_color)/delta * ii - thresholdTable->SetTableValue(GetGreyLevelBoundaries(i) + ii, - GetBaseColors((i-1)*3) + (GetBaseColors(i*3) - GetBaseColors((i-1)*3)) / delta * ii , - GetBaseColors((i-1)*3 + 1) + (GetBaseColors(i*3 + 1) - GetBaseColors((i-1)*3 + 1)) / delta * ii , - GetBaseColors((i-1)*3 + 2) + (GetBaseColors(i*3 + 2) - GetBaseColors((i-1)*3 + 2)) / delta * ii , - 1); - } - } - } - } // End Of if (!_color_type) - + for (int iColor = 0; iColor < GetBaseColorNb(); 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) ); + end = GrayLevel_TO_colorTableIndex( GetGreyLevelBoundaries(iColor+1) ); + FillColorTable( start,end, r1,g1,b1, r2,g2,b2 ); + }// for + } //if + } // End Of if (!_color_type) + + thresholdTable->SetRange( minRange, maxRange ); + thresholdTable->SetValueRange( 0.0, 1.0 ); + thresholdTable->Build( ); - // ------------------ End Of Defining the Threshold Table - //EO CM + //EO CM EED +} + +//---------------------------------------------------------------------------- +int ColorLayerImageView::GrayLevel_TO_colorTableIndex( double VALUE ) +{ + GetImage()->GetScalarRange(_range); + 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) +{ + vtkLookupTable* thresholdTable = GetThresholdTable(); + int iTable; + double delta = end-start; + double dr = (r2-r1)/delta; + double dg = (g2-g1)/delta; + double db = (b2-b1)/delta; + for (iTable=0; iTable<=delta; iTable++) + { + thresholdTable->SetTableValue( iTable+start , r1+dr*iTable, g1+dg*iTable, b1+db*iTable,1); + } // for iTable + + if (start==0) thresholdTable->SetTableValue( start , r1, g1, b1,0); // The first color in the table is transparent + } // EOF