From d92a7b41bf7a8a91f68ea25a66618fd94742c9c7 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Fri, 23 Oct 2015 18:08:52 +0200 Subject: [PATCH] #2723 creaMaracasVisu Feature New Normal - ColorLayer new simple interface with just transparency --- .../bbcreaMaracasVisuColorLayerImageView.cxx | 3 +- .../bbcreaMaracasVisuColorLayerImageView.h | 2 + .../ColorLayerImageViewPanel.cxx | 184 ++++++++++-------- 3 files changed, 107 insertions(+), 82 deletions(-) diff --git a/bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx b/bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx index d5860d9..b4922c6 100644 --- a/bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx +++ b/bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx @@ -91,7 +91,7 @@ void ColorLayerImageView::Process() //===== void ColorLayerImageView::CreateWidget(wxWindow* parent) { - ColorLayerImageViewPanel *clivp = new ColorLayerImageViewPanel(parent, 0, 100, 1); + ColorLayerImageViewPanel *clivp = new ColorLayerImageViewPanel(parent, 0, 100, bbGetInputTypeControlsInterface() ); bbSetOutputWidget( clivp ); } //===== @@ -102,6 +102,7 @@ void ColorLayerImageView::bbUserSetDefaultValues() firsttime=true; bbSetInputIn(NULL); bbSetInputActive(true); + bbSetInputTypeControlsInterface(1); bbSetInputWxVtkBaseView(NULL); bbSetInputWxVtkBaseView1(NULL); bbSetInputWxVtkBaseView2(NULL); diff --git a/bbtk/src/bbcreaMaracasVisuColorLayerImageView.h b/bbtk/src/bbcreaMaracasVisuColorLayerImageView.h index a817bcb..f608f9d 100644 --- a/bbtk/src/bbcreaMaracasVisuColorLayerImageView.h +++ b/bbtk/src/bbcreaMaracasVisuColorLayerImageView.h @@ -47,6 +47,7 @@ class bbcreaMaracasVisu_EXPORT ColorLayerImageView //===== BBTK_DECLARE_INPUT(In,vtkImageData*); BBTK_DECLARE_INPUT(Active,bool); + BBTK_DECLARE_INPUT(TypeControlsInterface,int); BBTK_DECLARE_INPUT(WxVtkBaseView,wxVtkBaseView *); BBTK_DECLARE_INPUT(WxVtkBaseView1,wxVtkBaseView *); BBTK_DECLARE_INPUT(WxVtkBaseView2,wxVtkBaseView *); @@ -75,6 +76,7 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(ColorLayerImageView,bbtk::WxBlackBox); BBTK_CATEGORY("__CategoryBlackBox__"); BBTK_INPUT(ColorLayerImageView,In,"Input Image",vtkImageData*,""); BBTK_INPUT(ColorLayerImageView,Active,"Active True/False (default True)",bool,""); + BBTK_INPUT(ColorLayerImageView,TypeControlsInterface,"1 (default) All controls, 2 just transparency",int,""); 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*,""); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewPanel.cxx index 50ee4ff..cad61bd 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewPanel.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewPanel.cxx @@ -87,100 +87,116 @@ void wxDlgTransformByDimensionBySpacingByPixel::GetTransformType(wxWindow *paren ** Begin of the threshold panel **/ ColorLayerImageViewPanel::ColorLayerImageViewPanel(wxWindow* parent, int min, int max, int type) -: wxPanel(parent, -1, wxDefaultPosition, wxSize(600,100), wxBORDER_SUNKEN) -{ - - _spcBase[0] = _spcBase[1] = _spcBase[2] = 0; - _dimBase[0] = _dimBase[1] = _dimBase[2] = 0; +//: wxPanel(parent, -1, wxDefaultPosition, wxSize(600,100), wxBORDER_SUNKEN) - _colorLayerImageViewManager = new ColorLayerImageViewManager(); +: wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL) - _btn_ReadImage = new wxButton(this, wxID_ANY, _T("Read Image") ); - _thresholdGo = true; - _cb_ShowHide = new wxCheckBox(this, wxID_ANY, _T("Show/Hide Layer") ); - _cb_ShowHide->SetValue(_thresholdGo); - _cb_SliceFixDinamic = new wxCheckBox(this, wxID_ANY, _T("Fixed/Dynamic Slice") ); - _cb_SliceFixDinamic->SetValue(true); - - _sl_SliceImageX = new wxSlider(this, wxID_ANY, 0, 1000, 1000, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator); - _sl_SliceImageY = new wxSlider(this, wxID_ANY, 0, 1000, 1000, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator); - _sl_SliceImageZ = new wxSlider(this, wxID_ANY, 0, 1000, 1000, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator); - _sl_SliceImageX->Enable(false); - _sl_SliceImageY->Enable(false); - _sl_SliceImageZ->Enable(false); - _interpolationCheckBox = new wxCheckBox(this, -1, _T("Image Interpolation") ); - _interpolationCheckBox->SetValue(true); - _opacity = new wxSlider(this, wxID_ANY, 6, 1, 10, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator); +{ +printf("EED ColorLayerImageViewPanel::ColorLayerImageViewPanel Start\n"); - _histogram=NULL; - _histogramMinMaxLevel=NULL; + _spcBase[0] = _spcBase[1] = _spcBase[2] = 0; + _dimBase[0] = _dimBase[1] = _dimBase[2] = 0; -// _histogram = new Histogram( this , -1, wxPoint(0,0), wxSize(400,400), /*wxNO_BORDER*/ wxBORDER_DEFAULT ); -// _histogramMinMaxLevel = new HistogramMinMaxLevel( (HistogramBase*)_histogram ); + _cb_ShowHide = NULL; + _sl_SliceImageX = NULL; + _sl_SliceImageY = NULL; + _sl_SliceImageZ = NULL; + _histogram = NULL; + _histogramMinMaxLevel = NULL; - if (type==0) - { - } + wxFlexGridSizer * sizer = new wxFlexGridSizer(1); + _colorLayerImageViewManager = new ColorLayerImageViewManager(); if (type==1) { - } + _btn_ReadImage = new wxButton(this, wxID_ANY, _T("Read Image") ); + _thresholdGo = true; + _cb_ShowHide = new wxCheckBox(this, wxID_ANY, _T("Show/Hide Layer") ); + _cb_ShowHide->SetValue(_thresholdGo); + _cb_SliceFixDinamic = new wxCheckBox(this, wxID_ANY, _T("Fixed/Dynamic Slice") ); + _cb_SliceFixDinamic->SetValue(true); + _sl_SliceImageX = new wxSlider(this, wxID_ANY, 0, 1000, 1000, + wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator); + _sl_SliceImageY = new wxSlider(this, wxID_ANY, 0, 1000, 1000, + wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator); + _sl_SliceImageZ = new wxSlider(this, wxID_ANY, 0, 1000, 1000, + wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator); + _sl_SliceImageX->Enable(false); + _sl_SliceImageY->Enable(false); + _sl_SliceImageZ->Enable(false); + _interpolationCheckBox = new wxCheckBox(this, -1, _T("Image Interpolation") ); + _interpolationCheckBox->SetValue(true); + _opacity = new wxSlider(this, wxID_ANY, 6, 1, 10, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator); + + // _histogram = new Histogram( this , -1, wxPoint(0,0), wxSize(400,400), /*wxNO_BORDER*/ wxBORDER_DEFAULT ); + // _histogramMinMaxLevel = new HistogramMinMaxLevel( (HistogramBase*)_histogram ); + + Connect( _btn_ReadImage->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &ColorLayerImageViewPanel::onReadImage ); + Connect( _cb_ShowHide->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED , (wxObjectEventFunction) &ColorLayerImageViewPanel::onThresholdShow ); + Connect( _interpolationCheckBox->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &ColorLayerImageViewPanel::onThresholdInterpolation ); + Connect( _opacity->GetId(), wxEVT_SCROLL_THUMBTRACK, (wxObjectEventFunction) &ColorLayerImageViewPanel::onChangeOpacity ); + Connect( _cb_SliceFixDinamic->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &ColorLayerImageViewPanel::onSliceFixDinamic ); + + Connect( _sl_SliceImageX->GetId(), wxEVT_SCROLL_THUMBTRACK , (wxObjectEventFunction) &ColorLayerImageViewPanel::onSliceImage ); + Connect( _sl_SliceImageX->GetId(), wxEVT_SCROLL_LINEUP , (wxObjectEventFunction) &ColorLayerImageViewPanel::onSliceImage ); + Connect( _sl_SliceImageX->GetId(), wxEVT_SCROLL_LINEDOWN , (wxObjectEventFunction) &ColorLayerImageViewPanel::onSliceImage ); + Connect( _sl_SliceImageX->GetId(), wxEVT_SCROLL_PAGEUP , (wxObjectEventFunction) &ColorLayerImageViewPanel::onSliceImage ); + Connect( _sl_SliceImageX->GetId(), wxEVT_SCROLL_PAGEDOWN , (wxObjectEventFunction) &ColorLayerImageViewPanel::onSliceImage ); + + Connect( _sl_SliceImageY->GetId(), wxEVT_SCROLL_THUMBTRACK , (wxObjectEventFunction) &ColorLayerImageViewPanel::onSliceImage ); + Connect( _sl_SliceImageY->GetId(), wxEVT_SCROLL_LINEUP , (wxObjectEventFunction) &ColorLayerImageViewPanel::onSliceImage ); + Connect( _sl_SliceImageY->GetId(), wxEVT_SCROLL_LINEDOWN , (wxObjectEventFunction) &ColorLayerImageViewPanel::onSliceImage ); + Connect( _sl_SliceImageY->GetId(), wxEVT_SCROLL_PAGEUP , (wxObjectEventFunction) &ColorLayerImageViewPanel::onSliceImage ); + Connect( _sl_SliceImageY->GetId(), wxEVT_SCROLL_PAGEDOWN , (wxObjectEventFunction) &ColorLayerImageViewPanel::onSliceImage ); + + Connect( _sl_SliceImageZ->GetId(), wxEVT_SCROLL_THUMBTRACK , (wxObjectEventFunction) &ColorLayerImageViewPanel::onSliceImage ); + Connect( _sl_SliceImageZ->GetId(), wxEVT_SCROLL_LINEUP , (wxObjectEventFunction) &ColorLayerImageViewPanel::onSliceImage ); + Connect( _sl_SliceImageZ->GetId(), wxEVT_SCROLL_LINEDOWN , (wxObjectEventFunction) &ColorLayerImageViewPanel::onSliceImage ); + Connect( _sl_SliceImageZ->GetId(), wxEVT_SCROLL_PAGEUP , (wxObjectEventFunction) &ColorLayerImageViewPanel::onSliceImage ); + Connect( _sl_SliceImageZ->GetId(), wxEVT_SCROLL_PAGEDOWN , (wxObjectEventFunction) &ColorLayerImageViewPanel::onSliceImage ); + + sizer -> Add( new wxStaticText(this,-1,_T("Color Image Layer")) , 1, wxGROW ); + sizer -> Add( _btn_ReadImage , 1, wxGROW ); + sizer -> Add( new wxStaticText(this,-1,_T(" ")) , 1, wxGROW ); + sizer -> Add( new wxStaticText(this,-1,_T("Opacity Level")) , 1, wxGROW ); + sizer -> Add( _opacity , 1, wxGROW ); + sizer -> Add( new wxStaticText(this,-1,_T(" ")) , 1, wxGROW ); + sizer -> Add( _cb_ShowHide , 1, wxGROW ); + sizer -> Add( new wxStaticText(this,-1,_T(" ")) , 1, wxGROW ); + sizer -> Add( _interpolationCheckBox , 1, wxGROW ); + sizer -> Add( new wxStaticText(this,-1,_T(" ")) , 1, wxGROW ); + sizer -> Add( new wxStaticText(this,-1,_T("Slice ")) , 1, wxGROW ); + sizer -> Add( _sl_SliceImageX , 1, wxGROW ); + sizer -> Add( _sl_SliceImageY , 1, wxGROW ); + sizer -> Add( _sl_SliceImageZ , 1, wxGROW ); + sizer -> Add( _cb_SliceFixDinamic , 1, wxGROW ); + // sizer -> Add( _histogramMinMaxLevel->GetWindow() , 1, wxGROW ); - Connect( _btn_ReadImage->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &ColorLayerImageViewPanel::onReadImage ); - Connect( _cb_ShowHide->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED , (wxObjectEventFunction) &ColorLayerImageViewPanel::onThresholdShow ); - Connect( _interpolationCheckBox->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &ColorLayerImageViewPanel::onThresholdInterpolation ); - Connect( _opacity->GetId(), wxEVT_SCROLL_THUMBTRACK, (wxObjectEventFunction) &ColorLayerImageViewPanel::onChangeOpacity ); - Connect( _cb_SliceFixDinamic->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &ColorLayerImageViewPanel::onSliceFixDinamic ); + } // type==1 - Connect( _sl_SliceImageX->GetId(), wxEVT_SCROLL_THUMBTRACK , (wxObjectEventFunction) &ColorLayerImageViewPanel::onSliceImage ); - Connect( _sl_SliceImageX->GetId(), wxEVT_SCROLL_LINEUP , (wxObjectEventFunction) &ColorLayerImageViewPanel::onSliceImage ); - Connect( _sl_SliceImageX->GetId(), wxEVT_SCROLL_LINEDOWN , (wxObjectEventFunction) &ColorLayerImageViewPanel::onSliceImage ); - Connect( _sl_SliceImageX->GetId(), wxEVT_SCROLL_PAGEUP , (wxObjectEventFunction) &ColorLayerImageViewPanel::onSliceImage ); - Connect( _sl_SliceImageX->GetId(), wxEVT_SCROLL_PAGEDOWN , (wxObjectEventFunction) &ColorLayerImageViewPanel::onSliceImage ); - Connect( _sl_SliceImageY->GetId(), wxEVT_SCROLL_THUMBTRACK , (wxObjectEventFunction) &ColorLayerImageViewPanel::onSliceImage ); - Connect( _sl_SliceImageY->GetId(), wxEVT_SCROLL_LINEUP , (wxObjectEventFunction) &ColorLayerImageViewPanel::onSliceImage ); - Connect( _sl_SliceImageY->GetId(), wxEVT_SCROLL_LINEDOWN , (wxObjectEventFunction) &ColorLayerImageViewPanel::onSliceImage ); - Connect( _sl_SliceImageY->GetId(), wxEVT_SCROLL_PAGEUP , (wxObjectEventFunction) &ColorLayerImageViewPanel::onSliceImage ); - Connect( _sl_SliceImageY->GetId(), wxEVT_SCROLL_PAGEDOWN , (wxObjectEventFunction) &ColorLayerImageViewPanel::onSliceImage ); + if (type==2) + { + _opacity = new wxSlider(this, wxID_ANY, 6, 1, 10, wxDefaultPosition, wxSize(2,40), wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator); + Connect( _opacity->GetId(), wxEVT_SCROLL_THUMBTRACK, (wxObjectEventFunction) &ColorLayerImageViewPanel::onChangeOpacity ); +// sizer -> Add( new wxStaticText(this,-1,_T("Opacity Level")) , 1, wxEXPAND ); +// sizer -> Add( _opacity, 1, wxGROW ); +// sizer -> Add( new wxStaticText(this,-1,_T("Opacity Level")) ); + sizer -> Add( _opacity ,1,wxGROW ); + sizer->AddGrowableCol(0); - Connect( _sl_SliceImageZ->GetId(), wxEVT_SCROLL_THUMBTRACK , (wxObjectEventFunction) &ColorLayerImageViewPanel::onSliceImage ); - Connect( _sl_SliceImageZ->GetId(), wxEVT_SCROLL_LINEUP , (wxObjectEventFunction) &ColorLayerImageViewPanel::onSliceImage ); - Connect( _sl_SliceImageZ->GetId(), wxEVT_SCROLL_LINEDOWN , (wxObjectEventFunction) &ColorLayerImageViewPanel::onSliceImage ); - Connect( _sl_SliceImageZ->GetId(), wxEVT_SCROLL_PAGEUP , (wxObjectEventFunction) &ColorLayerImageViewPanel::onSliceImage ); - Connect( _sl_SliceImageZ->GetId(), wxEVT_SCROLL_PAGEDOWN , (wxObjectEventFunction) &ColorLayerImageViewPanel::onSliceImage ); + } // type==2 - wxFlexGridSizer * sizer = new wxFlexGridSizer(1); - if (type==1) - { - sizer -> Add( new wxStaticText(this,-1,_T("Color Image Layer")) , 1, wxGROW ); - sizer -> Add( _btn_ReadImage , 1, wxGROW ); - sizer -> Add( new wxStaticText(this,-1,_T(" ")) , 1, wxGROW ); - } - sizer -> Add( new wxStaticText(this,-1,_T("Opacity Level")) , 1, wxGROW ); - sizer -> Add( _opacity , 1, wxGROW ); - sizer -> Add( new wxStaticText(this,-1,_T(" ")) , 1, wxGROW ); - sizer -> Add( _cb_ShowHide , 1, wxGROW ); - sizer -> Add( new wxStaticText(this,-1,_T(" ")) , 1, wxGROW ); - sizer -> Add( _interpolationCheckBox , 1, wxGROW ); - - sizer -> Add( new wxStaticText(this,-1,_T(" ")) , 1, wxGROW ); - sizer -> Add( new wxStaticText(this,-1,_T("Slice ")) , 1, wxGROW ); - sizer -> Add( _sl_SliceImageX , 1, wxGROW ); - sizer -> Add( _sl_SliceImageY , 1, wxGROW ); - sizer -> Add( _sl_SliceImageZ , 1, wxGROW ); - sizer -> Add( _cb_SliceFixDinamic , 1, wxGROW ); -// sizer -> Add( _histogramMinMaxLevel->GetWindow() , 1, wxGROW ); this->SetSizer( sizer ); - this->SetAutoLayout( true ); - this->Layout(); +// this->SetAutoLayout( true ); +// this->Layout(); //CM Sets the default fitting mode to Pixel mode. _fitting_mode = 3; - // EO CM + // EO CM EED } //---------------------------------------------------------------------------- @@ -247,9 +263,14 @@ void ColorLayerImageViewPanel::SetImage(vtkImageData *img) dim[0] = ext[1]-ext[0]; dim[1] = ext[3]-ext[2]; dim[2] = ext[5]-ext[4]; - _sl_SliceImageX->SetRange( 0 , dim[0] ); - _sl_SliceImageY->SetRange( 0 , dim[1] ); - _sl_SliceImageZ->SetRange( 0 , dim[2] ); + + + if (_sl_SliceImageX!=NULL) + { + _sl_SliceImageX->SetRange( 0 , dim[0] ); + _sl_SliceImageY->SetRange( 0 , dim[1] ); + _sl_SliceImageZ->SetRange( 0 , dim[2] ); + } if ( (spc[0]!=_spcBase[0]) || (spc[1]!=_spcBase[1]) || (spc[2]!=_spcBase[2]) || (dim[0]!=_dimBase[0]) || (spc[1]!=_spcBase[1]) || (spc[2]!=_spcBase[2]) @@ -297,10 +318,8 @@ void ColorLayerImageViewPanel::SetImage(vtkImageData *img) } // spc !_spcBase dim!__dimBase } // _firsttime_mode -printf("EED ColorLayerImageViewPanel::SetImage\n"); if (_active==true) { -printf("EED ColorLayerImageViewPanel::SetImage _active=true \n"); _colorLayerImageViewManager->onThreshold(); RefreshView(); } // _ative @@ -434,8 +453,11 @@ bool ColorLayerImageViewPanel::IsVisible() //---------------------------------------------------------------------------- void ColorLayerImageViewPanel::SetActive(bool active) { - _active=active; - _cb_ShowHide->SetValue( _active ); + _active=active; + if (_cb_ShowHide!=NULL) + { + _cb_ShowHide->SetValue( _active ); + } } -- 2.45.2