X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FThresholdImageView%2FColorLayerImageViewPanel.cxx;h=af7317cc5877fadcfdfe33a2bbf51de04b092ad7;hb=b73d56cf9e0aeee77ac87df7b5e401fc0ba87504;hp=eb38e0966c00663226f01f21cfcd55284522aab8;hpb=794fbd4c4e96dd9792942301bd31dd0262eda5e2;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 eb38e09..af7317c 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewPanel.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewPanel.cxx @@ -31,7 +31,7 @@ #include "ColorLayerImageViewPanel.h" #include "OpenImageDialog.h" - +#include //--------------------------------------------------------- //--------------------------------------------------------- @@ -46,9 +46,17 @@ wxDlgTransformByDimensionBySpacingByPixel::~wxDlgTransformByDimensionBySpacingBy } -void wxDlgTransformByDimensionBySpacingByPixel::GetTransformType(wxWindow *parent , wxString message,int &typeOfTransformation,bool &dlgWxOK) +void wxDlgTransformByDimensionBySpacingByPixel::GetTransformType( + wxWindow *parent , + double baseSpc[3], + double layerSpc[3], + int baseDim[3], + int layerDim[3], + wxString message, + int &typeOfTransformation, + bool &dlgWxOK) { - wxDialog* dial = new wxDialog (parent,-1,_T("Tools"),wxDefaultPosition, wxSize(590,190)); + wxDialog* dial = new wxDialog (parent,-1,_T("Tools"),wxDefaultPosition, wxSize(500,550),wxRESIZE_BORDER); wxSizer* buttonsSizer = dial->CreateSeparatedButtonSizer(wxOK|wxCANCEL); wxBoxSizer *dialSizer = new wxBoxSizer(wxVERTICAL); @@ -56,25 +64,43 @@ void wxDlgTransformByDimensionBySpacingByPixel::GetTransformType(wxWindow *paren lstOptOperation[0]=_T("By Dimension"); lstOptOperation[1]=_T("By Spacing"); lstOptOperation[2]=_T("By Pixel"); - 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 ); + wxRadioBox * radioOpts = new wxRadioBox(dial, -1, _T("Type of Transformation"), wxDefaultPosition, wxSize(250,90), 3 , lstOptOperation, 3, wxRA_SPECIFY_COLS); + + wxString str; + wxString strBaseSpc(str); + wxString strLayerSpc; + wxString strBaseDim; + wxString strLayerDim; + + strBaseSpc.Printf(wxT("Base spacing: %f %f %f"), baseSpc[0],baseSpc[1],baseSpc[2] ); + strLayerSpc.Printf(wxT("Layer spacing: %f %f %f"), layerSpc[0],layerSpc[1],layerSpc[2] ); + strBaseDim.Printf(wxT("Base dimension: %d %d %d"), baseDim[0],baseDim[1],baseDim[2] ); + strLayerDim.Printf(wxT("Layer dimension: %d %d %d"), layerDim[0],layerDim[1],layerDim[2] ); + + dialSizer->Add( new wxStaticText(dial,-1,message ) , 0, wxGROW ); + dialSizer->Add( new wxStaticText(dial,-1,_T(" ") ) , 0, wxGROW ); + dialSizer->Add( new wxStaticText(dial,-1, strBaseSpc ) , 0, wxGROW ); + dialSizer->Add( new wxStaticText(dial,-1, strLayerSpc ) , 0, wxGROW ); + dialSizer->Add( new wxStaticText(dial,-1,_T(" ") ) , 0, wxGROW ); + dialSizer->Add( new wxStaticText(dial,-1, strBaseDim ) , 0, wxGROW ); + dialSizer->Add( new wxStaticText(dial,-1, strLayerDim ) , 0, wxGROW ); + dialSizer->Add( new wxStaticText(dial,-1,_T(" ") ) , 0, wxGROW ); + dialSizer->Add( new wxStaticText(dial,-1,message ) , 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 ); + dialSizer->Add( new wxStaticText(dial,-1,_T(" ") ) , 0, wxGROW ); dialSizer->Add(buttonsSizer,0,wxGROW); dial->SetSizer(dialSizer, true); dial->Layout(); dial->ShowModal(); typeOfTransformation = -1; - dlgWxOK = false; + dlgWxOK = false; if (dial->GetReturnCode() == wxID_OK) { typeOfTransformation = radioOpts->GetSelection() + 1; - dlgWxOK = true; + dlgWxOK = true; } } @@ -88,98 +114,120 @@ void wxDlgTransformByDimensionBySpacingByPixel::GetTransformType(wxWindow *paren ** Begin of the threshold panel **/ ColorLayerImageViewPanel::ColorLayerImageViewPanel(wxWindow* parent, int min, int max, int type) -: wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize, 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); +{ - _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); + _spcBase[0] = _spcBase[1] = _spcBase[2] = 0; + _dimBase[0] = _dimBase[1] = _dimBase[2] = 0; - _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); + _cb_ShowHide = NULL; + _sl_SliceImageX = NULL; + _sl_SliceImageY = NULL; + _sl_SliceImageZ = NULL; + _histogram = NULL; + _histogramMinMaxLevel = NULL; - if (type==0) - { - } + wxFlexGridSizer * sizer = NULL; + _colorLayerImageViewManager = new ColorLayerImageViewManager(); if (type==1) { - } - - - 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 = new wxFlexGridSizer(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("Interpole") ); + _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 ); + + } // type==1 + + + if (type==2) + { + sizer = new wxFlexGridSizer(2); + _interpolationCheckBox = new wxCheckBox(this, -1, _T("Interpolate") ); + _interpolationCheckBox->SetValue(true); + _opacity = new wxSlider(this, wxID_ANY, 6, 0, 10, wxDefaultPosition, wxSize(2,40), wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator); + Connect( _interpolationCheckBox->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &ColorLayerImageViewPanel::onThresholdInterpolation ); + 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( _interpolationCheckBox , 1, wxGROW ); + sizer->AddGrowableCol(0); + } // 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 ); 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 } //---------------------------------------------------------------------------- @@ -188,26 +236,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]) { @@ -220,6 +256,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]) { @@ -228,6 +265,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]) { @@ -241,6 +279,10 @@ void ColorLayerImageViewPanel::SetImage(vtkImageData *img) { if (img!=NULL) { + if (_histogramMinMaxLevel!=NULL) + { + _histogramMinMaxLevel->Configure( img ); + } _colorLayerImageViewManager->SetImage( img ); double spc[3]; @@ -252,33 +294,47 @@ 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] ); + } + +//printf("EED ColorLayerImageViewPanel::SetImage UUPPSS----------------------\n" ); +//printf("EED ColorLayerImageViewPanel::SetImage UUPPSS----------------------\n" ); +//printf("EED ColorLayerImageViewPanel::SetImage UUPPSS----------------------\n" ); +//printf("EED ColorLayerImageViewPanel::SetImage UUPPSS----------------------\n" ); +//printf(" Here I have to analyse the spacing and size image to calculate new spacingvv\n" ); +//printf(" I need the caracteristics of the base image\n" ); +// GetColorLayerImageViewManager()->GetwxVtkBaseView(0); + 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]) ) { - // CM - int typeOfTransformation; - // In case of the option is set to create a dialog box. - if (_fitting_mode == -1) - { - bool transformOkDlg; - wxString msg = _T("The image resolution of both images are not compatible. Do you want to tranform it? "); - wxDlgTransformByDimensionBySpacingByPixel dlg; - dlg.GetTransformType(this,msg,typeOfTransformation,transformOkDlg); - // CM Reset the default value (Pixel i.e. 3) if the dialog box returned an inappropriate value. - if (transformOkDlg == false) - typeOfTransformation = 3; - } - else - typeOfTransformation = _fitting_mode; - //EO CM - - printf("EED ColorLayerImageViewPanel::onReadImage call dialog spc size,dim...???\n"); - + // CM + int typeOfTransformation; + // In case of the option is set to create a dialog box. + if (_fitting_mode == -1) + { + bool transformOkDlg; + wxString msg = _T("The image resolution of both images are not compatible. Do you want to tranform it? "); + wxDlgTransformByDimensionBySpacingByPixel dlg; + dlg.GetTransformType(this,_spcBase,spc,_dimBase,dim,msg,typeOfTransformation,transformOkDlg); + // CM Reset the default value (Pixel i.e. 3) if the dialog box returned an inappropriate value. + if (transformOkDlg == false) + { + typeOfTransformation = 3; + } + } else { + typeOfTransformation = _fitting_mode; + } // _fitting_mode -1 + + //EO CM if (typeOfTransformation==1) // make dimensions equals { printf("EED ColorLayerImageViewPanel::onReadImage ...WARNNING.... dif size image spc*dim ofnew image ...???\n"); @@ -303,19 +359,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 - } } @@ -360,72 +411,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()); + _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() ); @@ -433,38 +464,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 } @@ -477,8 +496,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 ); + } }