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=7763924fdad8c41fcf58465913689da140dc1997;hpb=f21fba620841086c95c71e58d1b4bbcf67ba3548;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 7763924..af7317c 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewPanel.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewPanel.cxx @@ -120,7 +120,6 @@ ColorLayerImageViewPanel::ColorLayerImageViewPanel(wxWindow* parent, int min, in { -printf("EED ColorLayerImageViewPanel::ColorLayerImageViewPanel Start\n"); _spcBase[0] = _spcBase[1] = _spcBase[2] = 0; _dimBase[0] = _dimBase[1] = _dimBase[2] = 0; @@ -304,6 +303,15 @@ void ColorLayerImageViewPanel::SetImage(vtkImageData *img) _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]) ) @@ -316,7 +324,7 @@ void ColorLayerImageViewPanel::SetImage(vtkImageData *img) 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,spc,spc,dim,dim,msg,typeOfTransformation,transformOkDlg); + 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) { @@ -326,8 +334,6 @@ void ColorLayerImageViewPanel::SetImage(vtkImageData *img) typeOfTransformation = _fitting_mode; } // _fitting_mode -1 -printf("EED ColorLayerImageViewPanel::SetImage %d\n", typeOfTransformation ); - //EO CM if (typeOfTransformation==1) // make dimensions equals {