From: Claire Mouton Date: Thu, 13 Sep 2012 15:04:57 +0000 (+0000) Subject: Improved the image superposition, adding optional base colors, grey level boundaries... X-Git-Tag: v1.0.4~6 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=9cb8780edf257c286336c7355ecac466f07bbbc5;p=creaMaracasVisu.git Improved the image superposition, adding optional base colors, grey level boundaries and a choice between plain and gradient colors. --- diff --git a/bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx b/bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx index 83d5aae..87241b8 100644 --- a/bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx +++ b/bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx @@ -16,9 +16,17 @@ BBTK_BLACK_BOX_IMPLEMENTATION(ColorLayerImageView,bbtk::WxBlackBox); //===== void ColorLayerImageView::Process() { - ColorLayerImageViewPanel *clivp = (ColorLayerImageViewPanel*)bbGetOutputWidget(); clivp->GetColorLayerImageView()->SetwxVtkBaseView( bbGetInputWxVtkBaseView() ); + + std::vector base_color = bbGetInputlstBaseColor(); + clivp->GetColorLayerImageView()->SetBaseColors( base_color ); + + std::vector grey_level_boundaries = bbGetInputlstGreyLevelBoundaries(); + clivp->GetColorLayerImageView()->SetGreyLevelBoundaries( grey_level_boundaries ); + + clivp->GetColorLayerImageView()->SetPlainOrGradientColor( bbGetInputPlainOrGradientColor() ); + clivp->SetImage( bbGetInputIn() ); // std::string msg; @@ -36,8 +44,8 @@ void ColorLayerImageView::Process() //===== void ColorLayerImageView::CreateWidget(wxWindow* parent) { - ColorLayerImageViewPanel *clivp = new ColorLayerImageViewPanel(parent, 0, 100, 1); - bbSetOutputWidget( clivp ); + ColorLayerImageViewPanel *clivp = new ColorLayerImageViewPanel(parent, 0, 100, 1); + bbSetOutputWidget( clivp ); } //===== // Don't edit this file. This file is generated from xml description.. diff --git a/bbtk/src/bbcreaMaracasVisuColorLayerImageView.h b/bbtk/src/bbcreaMaracasVisuColorLayerImageView.h index de203af..580684c 100644 --- a/bbtk/src/bbcreaMaracasVisuColorLayerImageView.h +++ b/bbtk/src/bbcreaMaracasVisuColorLayerImageView.h @@ -22,6 +22,9 @@ class bbcreaMaracasVisu_EXPORT ColorLayerImageView //===== BBTK_DECLARE_INPUT(WxVtkBaseView,wxVtkBaseView *); BBTK_DECLARE_INPUT(In,vtkImageData*); + BBTK_DECLARE_INPUT(lstBaseColor,std::vector); + BBTK_DECLARE_INPUT(lstGreyLevelBoundaries,std::vector); + BBTK_DECLARE_INPUT(PlainOrGradientColor,bool); BBTK_PROCESS(Process); void Process(); BBTK_CREATE_WIDGET(CreateWidget); @@ -35,10 +38,13 @@ class bbcreaMaracasVisu_EXPORT ColorLayerImageView BBTK_BEGIN_DESCRIBE_BLACK_BOX(ColorLayerImageView,bbtk::WxBlackBox); BBTK_NAME("ColorLayerImageView"); BBTK_AUTHOR("Eduardo DAVILA (Creatis)"); -BBTK_DESCRIPTION("Color Laye rImage View"); +BBTK_DESCRIPTION("Color Layer Image View"); BBTK_CATEGORY("__CategoryBlackBox__"); -BBTK_INPUT(ColorLayerImageView,In,"Input Image",vtkImageData*,""); BBTK_INPUT(ColorLayerImageView,WxVtkBaseView,"creaMaracasVisuViewer viewer",wxVtkBaseView*,""); +BBTK_INPUT(ColorLayerImageView,In,"Input Image",vtkImageData*,""); +BBTK_INPUT(ColorLayerImageView,lstBaseColor,"List of Base Colors in RGB format to define the color map. Requirement: must be of a size being a multiple of 3, with values between 0 and 1. For example, for 2 colors: \"1 0 0 0 0 1\". If not provided as required, the histogram is equally split into three areas, blue, yellow and red.",std::vector,""); +BBTK_INPUT(ColorLayerImageView,lstGreyLevelBoundaries,"List of the Grey Level Boundaries to define the color map. Requirement: Must have one more element than the number of colours. For example, for 2 colors: \"50 150 250\". If not provided as required, the histogram is equally split into areas, which number corresponds to the number of colors provided (3 by default).",std::vector,""); +BBTK_INPUT(ColorLayerImageView,PlainOrGradientColor,"Choose between Plain (true) or Gradient (false) colors. Default is false.",bool,""); BBTK_END_DESCRIBE_BLACK_BOX(ColorLayerImageView); //===== // Don't edit this file. This file is generated from xml description.. diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx index 56bd443..c091b9d 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx @@ -1,7 +1,8 @@ - /** * \file - * \brief Class bbtk::ThresholdImageView . + * \author Eduardo Davila and Claire Mouton. + * \brief Class bbtk::ThresholdImageView. + * \date September 2012 */ #include "ColorLayerImageView.h" @@ -10,116 +11,289 @@ #include #include +#include + - //========================================================================= - //========================================================================= - //========================================================================= - //========================================================================= - ColorLayerImageView::ColorLayerImageView( ) - { - _z2 = 0; - _fix_dinamic = true; - } +//========================================================================= +//========================================================================= +//========================================================================= +//========================================================================= +ColorLayerImageView::ColorLayerImageView( ) +{ + _z2 = 0; + _fix_dynamic = true; + _color_type = false; +} - //========================================================================= - ColorLayerImageView::~ColorLayerImageView() - { - } - //========================================================================= +//========================================================================= +ColorLayerImageView::~ColorLayerImageView() +{ +} +//========================================================================= //---------------------------------------------------------------------------- -void ColorLayerImageView::SetSliceFixDinamic(bool fix_dinamic) +void ColorLayerImageView::SetSliceFixDynamic(bool fix_dynamic) { - _fix_dinamic = fix_dinamic; + _fix_dynamic = fix_dynamic; } //---------------------------------------------------------------------------- void ColorLayerImageView::SetZ2(int z2) { - _z2 = z2; + _z2 = z2; } //---------------------------------------------------------------------------- int ColorLayerImageView::GetZ() // virtual { - int result=0; - if (_fix_dinamic==false) - { - result = _z2; - } else { - result = LayerImageBase::GetZ(); - } + int result=0; + if (_fix_dynamic==false) + { + result = _z2; + } + else + { + result = LayerImageBase::GetZ(); + } + + return result; +} + +//---------------------------------------------------------------------------- +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() << "." << std::endl; +} + +//---------------------------------------------------------------------------- +double ColorLayerImageView::GetBaseColors(unsigned int index) +{ + if (_base_color.size() > index) + return _base_color.at(index); + // An exception should be thrown if the index does not exist in the color vector. + else + { + std::cout << "CM ColorLayerImageView::GetBaseColors : ERROR!!! The index " << index << "is out of the base color vector range." << std ::endl; + return -1.0; + } +} + +//---------------------------------------------------------------------------- +void ColorLayerImageView::SetGreyLevelBoundaries(std::vector & grey_level_boundary) +{ + // The size must be greater than or equal to 2 (at least min and max must exist). + if ( grey_level_boundary.size() >= 2) + { + sort ( grey_level_boundary.begin(), grey_level_boundary.end() ); + _grey_level_boundary = grey_level_boundary; + } + // 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() << "." << std::endl; +} - return result; +//---------------------------------------------------------------------------- +double ColorLayerImageView::GetGreyLevelBoundaries(unsigned int index) +{ + if (_grey_level_boundary.size() > index) + return _grey_level_boundary.at(index); + // An exception should be thrown if the index does not exist in the grey level boundary vector. + else + { + std::cout << "CM ColorLayerImageView::GetGreyLevelBoundaries : ERROR!!! The index " << index << "is out of the grey level boundaries vector range." << std ::endl; + return -1.0; + } } +//---------------------------------------------------------------------------- +void ColorLayerImageView::SetPlainOrGradientColor(bool color_type) +{ + _color_type = color_type; +} + +//---------------------------------------------------------------------------- +int ColorLayerImageView::GetBaseColorNb() +{ + return _base_color.size()/3; +} + +//---------------------------------------------------------------------------- +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; + } + + // Grey level extrema are set by default to the image grey level extrema. + int minTot = floor (_range[0]); + int maxTot = ceil (_range[1]); + + _grey_level_boundary.push_back((double)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); + } +} + +//---------------------------------------------------------------------------- +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(1.0); + // Yellow. + _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); + + // This avoids a potential division by 0 through delta during the lookup table configuration. + if (_range[1]==0) + { + _range[1]=255; + } + + int minTot = floor (_range[0]); + int maxTot = ceil (_range[1]); + + _grey_level_boundary.push_back((double)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); +} //---------------------------------------------------------------------------- void ColorLayerImageView::ConfigLookupTable() // virtual { - double range[2]; + // CM + // Grey level extrema retrieved from the image grey level extrema. + GetImage()->GetScalarRange(_range); + + + // ------------------ 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) ) + { + 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(); + + // 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->SetAlphaRange(0, 1); + thresholdTable->SetValueRange(0, 1); + thresholdTable->SetSaturationRange(0, 0); + thresholdTable->SetRampToLinear( ); + + // 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); + } - GetImage()->GetScalarRange(range); - if (range[1]==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++) { - range[1]=255; + 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); + } } - - int minTot = floor (range[0]); - int maxTot = ceil (range[1]); - + } // End Of if (_color_type) - vtkLookupTable* thresholdTable = GetThresholdTable(); - thresholdTable->SetNumberOfTableValues(maxTot+1); - thresholdTable->SetTableRange(range); - thresholdTable->SetAlphaRange(0, 1); - thresholdTable->SetValueRange(0, 1); - thresholdTable->SetSaturationRange(0, 0); - thresholdTable->SetRampToLinear( ); - - //Assign a fake color for the upper image, and set the white as transparent - int i,ii; - double iBlue=0 , iYellow=0 , iRed=0; - double delta=(maxTot-minTot)/3.0; - - double delta0=delta*0; - double delta1=delta*1; - double delta2=delta*2; - double delta3=maxTot; - - for(i = minTot; i <= maxTot; i++) + + // _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++) { - ii=i-minTot; - if ((ii>=delta0) && (ii<=delta1)) // iBlue - { - thresholdTable->SetTableValue( i , 0 , 0 , iBlue/delta , 1); - if (ii==0) - { - thresholdTable->SetTableValue( i , 0 , 0 , iBlue/delta , 0); - } else { - thresholdTable->SetTableValue( i , 0 , 0 , iBlue/delta , 1); - } - iBlue++; - } - if ((ii>=delta1) && (ii<=delta2)) // iYellow - { - thresholdTable->SetTableValue( i , iYellow/delta , iYellow/delta , (delta-iYellow)/delta , 1); - iYellow++; - } - if ((ii>=delta2) && (ii<=delta3)) // iRed + 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. + if (GetBaseColorNb() > 1) + { + for (int i = 1; i < GetBaseColorNb(); i++) + { + delta = GetGreyLevelBoundaries(i+1) - GetGreyLevelBoundaries(i); + for (int ii = 1; ii <= delta; ii++) { - thresholdTable->SetTableValue( i , 1, (delta-iRed)/delta , 0 , 1); - iRed++; + // 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); } - } // for - - thresholdTable->Build( ); + } + } + } // End Of if (!_color_type) + + thresholdTable->Build( ); + // ------------------ End Of Defining the Threshold Table + //EO CM } - - - // EOF diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.h index e1f4a53..d1ec556 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.h @@ -1,6 +1,3 @@ - - - /** * \file * \brief Class ThresholdImageView . @@ -21,17 +18,67 @@ class ColorLayerImageView : public LayerImageBase { public: ColorLayerImageView( ); - ~ColorLayerImageView(); - void SetSliceFixDinamic(bool fix_dinamic); + ~ColorLayerImageView( ); + void SetSliceFixDynamic(bool fix_dynamic); void SetZ2(int z2); virtual int GetZ(); + + /** + * \brief Each color is described by its RGB coordinates. Therefore, the vector should have the size of a multiple of 3 elements. + * + * \param base_color the base color vector. + */ + void SetBaseColors(std::vector & base_color); + /** + * \brief Returns the base color for a given index (first coordinate of the first color being 1, second coordinate of the first color being 2, etc.). + * + * \param index for which we would like to get the base color. + * \return The corresponding base color value. + */ + double GetBaseColors(unsigned int index); + /** + * \brief The boundaries include the extrema. There must be one more element in this vector than GetBaseColorNb. + * + * \param grey_level_boundary the grey level boundary vector. + */ + void SetGreyLevelBoundaries(std::vector & grey_level_boundary); + /** + * \brief Returns the grey level boundary for a given index. + * + * \param index for which we would like to get the grey level boundary. + * \return The corresponding grey level value. + */ + double GetGreyLevelBoundaries(unsigned int index); + /** + * \brief Sets the color type. True for plain color, false for gradient color. Default is false. + * + * \param color_type the color type + */ + void SetPlainOrGradientColor(bool color_type); + /** + * \brief Returns the number of base colors. + * + * \return The number of base colors. + */ + int GetBaseColorNb(); private: int _z2; - bool _fix_dinamic; + bool _fix_dynamic; + void SetDefaultGreyLevelBoundary(); + void SetDefaultBaseColorAndGreyLevelBoundary(); virtual void ConfigLookupTable(); + //! Range values in the colored image. + double _range[2]; + + //! Base colors for the overlaid image. + std::vector _base_color; + //! Grey level boundaries. + std::vector _grey_level_boundary; + //! Color type (plain or gradient color). + bool _color_type; protected: }; diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewPanel.cxx index e23ab7d..fb4d6ab 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewPanel.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewPanel.cxx @@ -1,5 +1,3 @@ - - /** * \file * \brief ClassThresholdImageViewPanel . @@ -317,7 +315,7 @@ void ColorLayerImageViewPanel::onSliceFixDinamic(wxCommandEvent& event) if (_colorLayerImageView!=NULL) { bool fixdin = _cb_SliceFixDinamic->GetValue(); - _colorLayerImageView->SetSliceFixDinamic( fixdin ); + _colorLayerImageView->SetSliceFixDynamic( fixdin ); if (fixdin==false) { _colorLayerImageView->SetZ2( _sl_SliceImage->GetValue() ); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewPanel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewPanel.h index 03c5c15..526cb1d 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewPanel.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewPanel.h @@ -1,5 +1,3 @@ - - /** * \file * \brief Class ThresholdImageViewPanel . @@ -48,7 +46,7 @@ class ColorLayerImageViewPanel void SetBaseSpacing(double spc[3]); void SetBaseDimension(int dim[3]); void SetOriginalSpacing(double spc[3]); - void SetImage(vtkImageData *img); + void SetImage(vtkImageData *img); private: int _dimBase[3]; diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx index 6753642..513d00f 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx @@ -1,4 +1,3 @@ - /** * \file * \brief Class bbtk::ThresholdImageView . diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.h index 51c73c9..f297a4b 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.h @@ -1,6 +1,3 @@ - - - /** * \file * \brief Class ThresholdImageView .