X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FThresholdImageView%2FColorLayerImageViewPanel.cxx;h=cad61bd9c6b7382f286c5db306b61b9f288bcddb;hb=d92a7b41bf7a8a91f68ea25a66618fd94742c9c7;hp=ffabba162bf8ae6dbba8fbfd61921eb36bb1d96b;hpb=4ecb6789d069c8dcd40724f03d8225c25629cd52;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewPanel.cxx index ffabba1..cad61bd 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewPanel.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewPanel.cxx @@ -59,7 +59,6 @@ void wxDlgTransformByDimensionBySpacingByPixel::GetTransformType(wxWindow *paren wxRadioBox * radioOpts = new wxRadioBox(dial, -1, _T("Type of Transformation"), wxDefaultPosition, wxSize(270,45), 3 , lstOptOperation, 3, wxRA_SPECIFY_COLS); dialSizer->Add( new wxStaticText(dial,-1,message) , 0, wxGROW ); - // dialSizer->Add( new wxStaticText(dial,-1,_T("selected Roi file. Do you want to tranform it?")) , 0, wxGROW ); dialSizer->Add( new wxStaticText(dial,-1,_T(" ")) , 0, wxGROW ); dialSizer->Add(radioOpts,0,wxGROW); dialSizer->Add( new wxStaticText(dial,-1,_T(" ")) , 0, wxGROW ); @@ -88,99 +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) -{ - printf("EED ColorLayerImageViewPanel::ColorLayerImageViewPanel start \n"); - - _spcBase[0] = _spcBase[1] = _spcBase[2] = 0; - _dimBase[0] = _dimBase[1] = _dimBase[2] = 0; +//: wxPanel(parent, -1, wxDefaultPosition, wxSize(600,100), wxBORDER_SUNKEN) -//EED01 _colorLayerImageView = new ColorLayerImageView(); - _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); +{ +printf("EED ColorLayerImageViewPanel::ColorLayerImageViewPanel Start\n"); - _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); + _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 } //---------------------------------------------------------------------------- @@ -189,26 +205,14 @@ ColorLayerImageViewPanel::~ColorLayerImageViewPanel() } -//EED01 -//EED01 //---------------------------------------------------------------------------- -//EED01 void ColorLayerImageViewPanel::SetColorLayerImageView(ColorLayerImageView* colorLayerImageView) -//EED01 { -//EED01 _colorLayerImageView = colorLayerImageView; -//EED01 } -//EED01 -//EED01 //---------------------------------------------------------------------------- -//EED01 ColorLayerImageView* ColorLayerImageViewPanel::GetColorLayerImageView() -//EED01 { -//EED01 return _colorLayerImageView; -//EED01 } - - +//---------------------------------------------------------------------------- ColorLayerImageViewManager* ColorLayerImageViewPanel::GetColorLayerImageViewManager() { return _colorLayerImageViewManager; } +//---------------------------------------------------------------------------- // This is the new spacing of the background image (1,1,1) void ColorLayerImageViewPanel::SetBaseSpacing(double spc[3]) { @@ -221,6 +225,7 @@ void ColorLayerImageViewPanel::SetBaseSpacing(double spc[3]) _spcBase[2] = 1; } +//---------------------------------------------------------------------------- // This is the Original spacing of the background image void ColorLayerImageViewPanel::SetOriginalSpacing(double spc[3]) { @@ -229,6 +234,7 @@ void ColorLayerImageViewPanel::SetOriginalSpacing(double spc[3]) _spcOrg[2] = spc[2]; } +//---------------------------------------------------------------------------- // This is the size in pixels of the background image void ColorLayerImageViewPanel::SetBaseDimension(int dim[3]) { @@ -242,7 +248,10 @@ void ColorLayerImageViewPanel::SetImage(vtkImageData *img) { if (img!=NULL) { + if (_histogramMinMaxLevel!=NULL) + { _histogramMinMaxLevel->Configure( img ); + } _colorLayerImageViewManager->SetImage( img ); double spc[3]; @@ -254,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]) @@ -278,9 +292,6 @@ void ColorLayerImageViewPanel::SetImage(vtkImageData *img) else typeOfTransformation = _fitting_mode; //EO CM - - printf("EED ColorLayerImageViewPanel::onReadImage call dialog spc size,dim...???\n"); - if (typeOfTransformation==1) // make dimensions equals { printf("EED ColorLayerImageViewPanel::onReadImage ...WARNNING.... dif size image spc*dim ofnew image ...???\n"); @@ -305,19 +316,14 @@ void ColorLayerImageViewPanel::SetImage(vtkImageData *img) img->SetSpacing(spc); } // spc !_spcBase dim!__dimBase + } // _firsttime_mode -//EED01 if (_colorLayerImageView!=NULL) -//EED01 { -//EED01 _colorLayerImageView->onThreshold(); - if (_active==true) - { - _colorLayerImageViewManager->onThreshold(); - RefreshView(); - } -//EED01 } - + if (_active==true) + { + _colorLayerImageViewManager->onThreshold(); + RefreshView(); + } // _ative - } } @@ -362,72 +368,52 @@ void ColorLayerImageViewPanel::onReadImage(wxCommandEvent& event) //---------------------------------------------------------------------------- void ColorLayerImageViewPanel::onThresholdChange(wxCommandEvent& event) { -//EED01 if (_colorLayerImageView!=NULL) -//EED01 { if (_thresholdGo) { -//EED01 _colorLayerImageView->onThresholdChange(); _colorLayerImageViewManager->onThresholdChange(); RefreshView(); //std::cout<< "Valor Min: " << minVal << " & Valor Max: " << maxVal << std::endl; } // _thresholdGo -//EED01 }//_colorLayerImageView } //---------------------------------------------------------------------------- void ColorLayerImageViewPanel::onThresholdShow(wxCommandEvent& event) { -//EED01 if (_colorLayerImageView!=NULL) -//EED01 { _thresholdGo = _cb_ShowHide->GetValue(); + _active = _thresholdGo; if (_thresholdGo) { -//EED01 _colorLayerImageView->onThreshold(); _colorLayerImageViewManager->onThreshold(); }else{ -//EED01 _colorLayerImageView->onThresholdRemove( ); _colorLayerImageViewManager->onThresholdRemove( ); } RefreshView(); -//EED01 }//_colorLayerImageView } //---------------------------------------------------------------------------- void ColorLayerImageViewPanel::onThresholdStop() { -//EED01 if (_colorLayerImageView!=NULL) -//EED01 { if (_thresholdGo) { -//EED01 _colorLayerImageView->onThresholdRemove( ); _colorLayerImageViewManager->onThresholdRemove( ); _thresholdGo=false; } -//EED01 }//_colorLayerImageView } //---------------------------------------------------------------------------- void ColorLayerImageViewPanel::onThresholdInterpolation(wxCommandEvent& event) { -//EED01 if (_colorLayerImageView!=NULL) -//EED01 { -//EED01 _colorLayerImageView->onThresholdInterpolation(_interpolationCheckBox->GetValue()); _colorLayerImageViewManager->onThresholdInterpolation(_interpolationCheckBox->GetValue()); RefreshView(); -//EED01 }//_colorLayerImageView } //---------------------------------------------------------------------------- void ColorLayerImageViewPanel::onSliceFixDinamic(wxCommandEvent& event) { -//EED01 if (_colorLayerImageView!=NULL) -//EED01 { bool fixdin = _cb_SliceFixDinamic->GetValue(); -//EED01 _colorLayerImageView->SetSliceFixDynamic( fixdin ); _colorLayerImageViewManager->SetSliceFixDynamic( fixdin ); if (fixdin==false) { -//EED01 _colorLayerImageView->SetZ2( _sl_SliceImage->GetValue() ); _colorLayerImageViewManager->SetX2( _sl_SliceImageX->GetValue() ); _colorLayerImageViewManager->SetY2( _sl_SliceImageY->GetValue() ); _colorLayerImageViewManager->SetZ2( _sl_SliceImageZ->GetValue() ); @@ -435,38 +421,26 @@ void ColorLayerImageViewPanel::onSliceFixDinamic(wxCommandEvent& event) _sl_SliceImageX->Enable(!fixdin); _sl_SliceImageY->Enable(!fixdin); _sl_SliceImageZ->Enable(!fixdin); -//EED01 _colorLayerImageView->onThreshold(); _colorLayerImageViewManager->onThreshold(); RefreshView(); -//EED01 }//_colorLayerImageView } //---------------------------------------------------------------------------- void ColorLayerImageViewPanel::onSliceImage(wxScrollEvent& event) { -//EED01 if (_colorLayerImageView!=NULL) -//EED01 { -//EED01 _colorLayerImageView->SetZ2( _sl_SliceImage->GetValue() ); -//EED01 _colorLayerImageView->onThreshold(); -//EED01 RefreshView(); - _colorLayerImageViewManager->SetX2( _sl_SliceImageX->GetValue() ); - _colorLayerImageViewManager->SetY2( _sl_SliceImageY->GetValue() ); - _colorLayerImageViewManager->SetZ2( _sl_SliceImageZ->GetValue() ); - _colorLayerImageViewManager->onThreshold(); + _colorLayerImageViewManager->SetX2( _sl_SliceImageX->GetValue() ); + _colorLayerImageViewManager->SetY2( _sl_SliceImageY->GetValue() ); + _colorLayerImageViewManager->SetZ2( _sl_SliceImageZ->GetValue() ); + _colorLayerImageViewManager->onThreshold(); RefreshView(); -//EED01 }//_colorLayerImageView } //---------------------------------------------------------------------------- void ColorLayerImageViewPanel::onChangeOpacity(wxScrollEvent& event) { -//EED01 if (_colorLayerImageView!=NULL) -//EED01 { - int opacity = _opacity->GetValue(); -//EED01 _colorLayerImageView->onThresholdChangeOpacity(opacity); - _colorLayerImageViewManager->onThresholdChangeOpacity(opacity); + int opacity = _opacity->GetValue(); + _colorLayerImageViewManager->onThresholdChangeOpacity(opacity); RefreshView(); -//EED01 }//_colorLayerImageView } @@ -479,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 ); + } }