From: davila Date: Wed, 17 Jun 2015 14:21:49 +0000 (+0200) Subject: #2651 creaMaracasVisu Feature New Normal - Color Layer: Transparent Base, Refresh X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=creaMaracasVisu.git;a=commitdiff_plain;h=d72fc9a08cb41078907e50e4d519461b7a88c367 #2651 creaMaracasVisu Feature New Normal - Color Layer: Transparent Base, Refresh --- diff --git a/bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx b/bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx index 303736b..d5860d9 100644 --- a/bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx +++ b/bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx @@ -50,10 +50,14 @@ void ColorLayerImageView::Process() clivp->SetActive( bbGetInputActive() ); } + clivp->GetColorLayerImageViewManager()->SetwxVtkBaseView( 0 , bbGetInputWxVtkBaseView() ); clivp->GetColorLayerImageViewManager()->SetwxVtkBaseView( 1 , bbGetInputWxVtkBaseView1() ); clivp->GetColorLayerImageViewManager()->SetwxVtkBaseView( 2 , bbGetInputWxVtkBaseView2() ); + std::vector range = bbGetInputlstRangeForColorBar(); + clivp->GetColorLayerImageViewManager()->SetRangeForColorBar( range ); + std::vector base_color = bbGetInputlstBaseColor(); clivp->GetColorLayerImageViewManager()->SetBaseColors( base_color ); @@ -62,10 +66,12 @@ void ColorLayerImageView::Process() std::vector transparence_level_boundaries = bbGetInputlstTransparenceBoundaries(); clivp->GetColorLayerImageViewManager()->SetBaseTransparence( transparence_level_boundaries ); + clivp->GetColorLayerImageViewManager()->SetPlainOrGradientColor( bbGetInputPlainOrGradientColor() ); clivp->SetFittingMode( bbGetInputFittingMode() ); + clivp->SetImage( bbGetInputIn() ); diff --git a/bbtk/src/bbcreaMaracasVisuColorLayerImageView.h b/bbtk/src/bbcreaMaracasVisuColorLayerImageView.h index b51d3ac..a817bcb 100644 --- a/bbtk/src/bbcreaMaracasVisuColorLayerImageView.h +++ b/bbtk/src/bbcreaMaracasVisuColorLayerImageView.h @@ -53,6 +53,7 @@ class bbcreaMaracasVisu_EXPORT ColorLayerImageView BBTK_DECLARE_INPUT(lstBaseColor,std::vector); BBTK_DECLARE_INPUT(lstGreyLevelBoundaries,std::vector); BBTK_DECLARE_INPUT(lstTransparenceBoundaries,std::vector); + BBTK_DECLARE_INPUT(lstRangeForColorBar,std::vector); BBTK_DECLARE_INPUT(PlainOrGradientColor,bool); BBTK_DECLARE_INPUT(FittingMode,int); BBTK_PROCESS(Process); @@ -77,10 +78,12 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(ColorLayerImageView,bbtk::WxBlackBox); BBTK_INPUT(ColorLayerImageView,WxVtkBaseView," 0 creaMaracasVisuViewer viewer XY,YZ ou XZ",wxVtkBaseView*,""); BBTK_INPUT(ColorLayerImageView,WxVtkBaseView1," 1 creaMaracasVisuViewer viewer XY,YZ ou XZ",wxVtkBaseView*,""); BBTK_INPUT(ColorLayerImageView,WxVtkBaseView2," 2 creaMaracasVisuViewer viewer XY,YZ ou XZ",wxVtkBaseView*,""); - 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,lstBaseColor,"???EED 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,lstTransparenceBoundaries,"Transparence vector. (The same size of color lst).",std::vector,""); - BBTK_INPUT(ColorLayerImageView,lstGreyLevelBoundaries,"List of the Grey Level Boundaries to define the color map (grey level outside the color boundaries will not be disayed). 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,lstGreyLevelBoundaries,"???EED List of the Grey Level Boundaries to define the color map (grey level outside the color boundaries will not be disayed). 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,lstRangeForColorBar,"??? EED ",std::vector,""); BBTK_INPUT(ColorLayerImageView,PlainOrGradientColor,"Choose between Plain (true) or Gradient (false) colors. Default is false.",bool,""); 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 } diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.h index 305afdc..86ceb68 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.h @@ -104,16 +104,14 @@ class ColorLayerImageView : public LayerImageBase private: - int _x2, _y2, _z2; - bool _fix_dynamic; - void SetDefaultGreyLevelBoundary(); - void SetDefaultBaseColorAndGreyLevelBoundary(); + int _x2, _y2, _z2; + bool _fix_dynamic; + void SetDefaultGreyLevelBoundary(); + void SetDefaultBaseColorAndGreyLevelBoundary(); virtual void ConfigLookupTable(); - int maxColorsThresholdTable; + int maxColorsThresholdTable; - //! Range values in the colored image. - double _range[2]; //! Base colors for the overlaid image. std::vector _base_color; diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewManager.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewManager.cxx index 51e552d..20a8c38 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewManager.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewManager.cxx @@ -63,9 +63,9 @@ void ColorLayerImageViewManager::SetwxVtkBaseView(int id, wxVtkBaseView *basevie { if (_colorLayerImageViewLst[id]==NULL) { - _colorLayerImageViewLst[id] = new ColorLayerImageView(); + _colorLayerImageViewLst[id] = new ColorLayerImageView(); } - _colorLayerImageViewLst[id]->SetwxVtkBaseView(baseview); + _colorLayerImageViewLst[id]->SetwxVtkBaseView(baseview); } // if id } // baseview @@ -188,6 +188,19 @@ void ColorLayerImageViewManager::SetBaseTransparence(std::vector & base_ } // for } +//---------------------------------------------------------------------------- +void ColorLayerImageViewManager::SetRangeForColorBar(std::vector &range) +{ + int i, size=_colorLayerImageViewLst.size(); + for (i=0;iSetRangeForColorBar( range ); + } // if + } // for +} + //---------------------------------------------------------------------------- diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewManager.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewManager.h index 05425bf..92a8aad 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewManager.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewManager.h @@ -55,6 +55,7 @@ class ColorLayerImageViewManager double GetBaseColors(unsigned int index); void SetGreyLevelBoundaries(std::vector & grey_level_boundary); void SetBaseTransparence(std::vector & base_transparence); + void SetRangeForColorBar(std::vector & range); double GetGreyLevelBoundaries(unsigned int index); void SetPlainOrGradientColor(bool color_type); int GetBaseColorNb(); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx index a283606..f7d28fe 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx @@ -164,10 +164,10 @@ bool LayerImageBase::GetActorPresent() //---------------------------------------------------------------------------- void LayerImageBase::SetImage(vtkImageData* image) { - _image = image; double spc[3]; - _image->GetSpacing(spc); int ext[6]; + _image = image; + _image->GetSpacing(spc); _image->GetWholeExtent(ext); int sx=ext[1]-ext[0]+1; int sy=ext[3]-ext[2]+1; @@ -178,9 +178,29 @@ void LayerImageBase::SetImage(vtkImageData* image) SetX( ssx ); SetY( ssy ); SetZ( ssz ); - _image = image; + _image->Update(); + _image->GetScalarRange( _range ); } +void LayerImageBase::SetRangeForColorBar(std::vector &range) +{ + _rangeForColorBar=range; +} + +void LayerImageBase::GetRangeForColorBar(double &minRange, double &maxRange) +{ + if (_rangeForColorBar.size()==2) + { + minRange = _rangeForColorBar[0]; + maxRange = _rangeForColorBar[1]; + } else { + minRange = _range[0]; + maxRange = _range[1]; + } +} + + + //---------------------------------------------------------------------------- void LayerImageBase::SetwxVtkBaseView(wxVtkBaseView *baseview) { @@ -258,11 +278,8 @@ void LayerImageBase::CleanXYZ(double &x, double &y, double &z) //---------------------------------------------------------------------------- void LayerImageBase::onThreshold() { -printf("EED LayerImageBase::onThreshold Start \n"); - if ((_image!=NULL) && (_baseView!=NULL)) { -printf("EED LayerImageBase::onThreshold 1 \n"); double spc[3]; GetImage()-> GetSpacing(spc); double x=GetX(); @@ -285,7 +302,6 @@ printf("EED LayerImageBase::onThreshold 1 \n"); if (!GetActorPresent()) { -printf("EED LayerImageBase::onThreshold 2 \n"); if (_thresholdTable==NULL) { //Lookup Table @@ -327,8 +343,6 @@ printf("EED LayerImageBase::onThreshold 2 \n"); _imageReslicer->SetInput( GetImage() ); _imageReslicer->SetInformationInput( GetImage() ); -printf("EED LayerImageBase::onThreshold directionViewer=%d\n", directionViewer ); - if (directionViewer==0) { _imageReslicer->SetResliceAxesDirectionCosines( 0,0,1, 0,1,0, -1,0,0 ); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.h index 47a69e9..7735f0a 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.h @@ -87,6 +87,8 @@ class LayerImageBase void SetY(int y); void SetZ(int z); void SetImage(vtkImageData* image); + void SetRangeForColorBar(std::vector &range); + void GetRangeForColorBar(double &minRange, double &maxRange); void SetwxVtkBaseView(wxVtkBaseView *baseview); void onThreshold(); @@ -103,6 +105,7 @@ class LayerImageBase virtual int GetZ(); bool GetActorPresent(); + private: int _X; int _Y; @@ -124,6 +127,8 @@ class LayerImageBase protected: vtkLookupTable *GetThresholdTable(); vtkImageData *GetImage(); + double _range[2]; + std::vector _rangeForColorBar; };