X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FThresholdImageView%2FColorLayerImageView.cxx;h=e01c2f3945ac7ec857b145ca9393e8bce48620da;hb=d72fc9a08cb41078907e50e4d519461b7a88c367;hp=a1db87799b57e9dca27c2643594e74f3faf380bc;hpb=8e2ced4052c8d04dda193fe9f220b82bd9d0d156;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 a1db877..e01c2f3 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx @@ -213,18 +213,28 @@ void ColorLayerImageView::SetDefaultGreyLevelBoundary() _range[1]=255; } + 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 + } //---------------------------------------------------------------------------- @@ -235,35 +245,54 @@ void ColorLayerImageView::SetDefaultBaseColorAndGreyLevelBoundary() _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); - // Yellow. + + _base_color.push_back(0.0); + _base_color.push_back(1.0); + _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); } //---------------------------------------------------------------------------- @@ -286,7 +315,7 @@ void ColorLayerImageView::ConfigLookupTable() // virtual 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) ) + 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() - 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; @@ -296,7 +325,7 @@ void ColorLayerImageView::ConfigLookupTable() // virtual // ------------------ End Of Setting Default Values int iTransparence,transparenceSize = _transparence_level_boundary.size(); - for (iTransparence= transparenceSize ; iTransparence < GetBaseColorNb(); iTransparence++ ) + for (iTransparence=transparenceSize ; iTransparence < GetBaseColorNb(); iTransparence++ ) { _transparence_level_boundary.push_back(1); } @@ -308,14 +337,14 @@ void ColorLayerImageView::ConfigLookupTable() // virtual 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->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; @@ -328,9 +357,8 @@ 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 ( minRange 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; - r1 = GetBaseColors((iColor-1)*3+0); - g1 = GetBaseColors((iColor-1)*3+1); - b1 = GetBaseColors((iColor-1)*3+2); - } 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); + 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) ); t1 = _transparence_level_boundary[iColor]; t2 = _transparence_level_boundary[iColor+1]; - FillColorTable( start,end, r1,g1,b1, r2,g2,b2, t1,t1 ); + 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->SetTableRange( minRange, maxRange ); +// thresholdTable->SetValueRange( 0.0, 1.0 ); +// thresholdTable->SetAboveRangeColor(0,0,0,0); +// thresholdTable->SetBelowRangeColor(0,0,0,0); thresholdTable->Build( ); @@ -403,6 +420,7 @@ void ColorLayerImageView::ConfigLookupTable() // virtual //---------------------------------------------------------------------------- int ColorLayerImageView::GrayLevel_TO_colorTableIndex( double VALUE ) { + GetImage()->Update(); GetImage()->GetScalarRange(_range); double minRange = _range[0]; double maxRange = _range[1]; @@ -424,7 +442,6 @@ void ColorLayerImageView::FillColorTable(int start, int end, double r1, double g 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 }