X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwxvtk%2Fsrc%2FwxvtkImageViewer2.cxx;h=dc3dcfc69586b494efc07ca0b875ca8f7ad4c952;hb=d19c5512748aa8e2dd5c3d01d9ec680ded1f17ce;hp=533677cc130ffaceecfe62a55c45a7653bdbd26b;hpb=67837fa48c205487fbb9e5d6134d028c142867bc;p=bbtk.git diff --git a/packages/wxvtk/src/wxvtkImageViewer2.cxx b/packages/wxvtk/src/wxvtkImageViewer2.cxx index 533677c..dc3dcfc 100644 --- a/packages/wxvtk/src/wxvtkImageViewer2.cxx +++ b/packages/wxvtk/src/wxvtkImageViewer2.cxx @@ -1,3 +1,30 @@ +/* + # --------------------------------------------------------------------- + # + # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image + # pour la SantÈ) + # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton + # Previous Authors : Laurent Guigues, Jean-Pierre Roux + # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil + # + # This software is governed by the CeCILL-B license under French law and + # abiding by the rules of distribution of free software. You can use, + # modify and/ or redistribute the software under the terms of the CeCILL-B + # license as circulated by CEA, CNRS and INRIA at the following URL + # http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html + # or in the file LICENSE.txt. + # + # As a counterpart to the access to the source code and rights to copy, + # modify and redistribute granted by the license, users are provided only + # with a limited warranty and the software's author, the holder of the + # economic rights, and the successive licensors have only limited + # liability. + # + # The fact that you are presently reading this means that you have had + # knowledge of the CeCILL-B license and that you accept its terms. + # ------------------------------------------------------------------------ */ + + /*========================================================================= Program: Visualization Toolkit @@ -21,12 +48,18 @@ #include "vtkImageData.h" #include "vtkImageMapToWindowLevelColors.h" #include "vtkInteractorStyleImage.h" -#include "vtk.h" +#include "vtkObjectFactory.h" #include "vtkRenderWindow.h" #include "vtkRenderWindowInteractor.h" #include "vtkRenderer.h" -vtkCxxRevisionMacro(wxvtkImageViewer2, "$Revision: 1.4 $"); +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 +vtkCxxRevisionMacro(wxvtkImageViewer2, "$Revision: 1.8 $"); +#else + //... +#endif + vtkStandardNewMacro(wxvtkImageViewer2); //---------------------------------------------------------------------------- @@ -195,8 +228,15 @@ void wxvtkImageViewer2::GetSliceRange(int &min, int &max) vtkImageData *input = this->GetInput(); if (input) { + +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 input->UpdateInformation(); int *w_ext = input->GetWholeExtent(); +#else + int *w_ext = input->GetExtent(); +#endif + min = w_ext[this->SliceOrientation * 2]; max = w_ext[this->SliceOrientation * 2 + 1]; } @@ -208,8 +248,15 @@ int* wxvtkImageViewer2::GetSliceRange() vtkImageData *input = this->GetInput(); if (input) { +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 input->UpdateInformation(); +printf("EED Warning wxvtkImageViewer2::GetSliceRange GetWholeExtent()[2] ??? /n"); return input->GetWholeExtent() + this->SliceOrientation * 2; +#else +printf("EED Warning wxvtkImageViewer2::GetSliceRange GetExtent()[2] ??? /n"); + return input->GetExtent() + this->SliceOrientation * 2; +#endif } return NULL; } @@ -310,26 +357,54 @@ void wxvtkImageViewer2::UpdateOrientation() vtkCamera *cam = this->Renderer ? this->Renderer->GetActiveCamera() : NULL; if (cam) { + +// EED 21 mars FLIP problem ..PLOP.. switch (this->SliceOrientation) - { - case wxvtkImageViewer2::SLICE_ORIENTATION_XY: - cam->SetFocalPoint(0,0,0); - cam->SetPosition(0,0,1); // -1 if medical ? - cam->SetViewUp(0,1,0); - break; - - case wxvtkImageViewer2::SLICE_ORIENTATION_XZ: - cam->SetFocalPoint(0,0,0); - cam->SetPosition(0,-1,0); // 1 if medical ? - cam->SetViewUp(0,0,1); - break; - - case wxvtkImageViewer2::SLICE_ORIENTATION_YZ: - cam->SetFocalPoint(0,0,0); - cam->SetPosition(1,0,0); // -1 if medical ? - cam->SetViewUp(0,0,1); - break; + { + case wxvtkImageViewer2::SLICE_ORIENTATION_YZ: + cam->SetViewUp(0,0,1); + cam->SetPosition(1,0,0); // -1 if medical ? + cam->SetFocalPoint(0,0,0); + break; + + case wxvtkImageViewer2::SLICE_ORIENTATION_XZ: + cam->SetViewUp(0,0,1); + cam->SetPosition(0,-1,0); // 1 if medical ? + cam->SetFocalPoint(0,0,0); + break; + + case wxvtkImageViewer2::SLICE_ORIENTATION_XY: + cam->SetViewUp(0,-1,0); + cam->SetPosition(0,0,-1); + cam->SetFocalPoint(0,0,0); + break; } + +/* + switch (this->SliceOrientation) + { + case wxvtkImageViewer2::SLICE_ORIENTATION_YZ: + cam->SetViewUp(0,0,1); + cam->SetPosition(1,0,0); // -1 if medical ? + cam->SetFocalPoint(0,0,0); + break; + + case wxvtkImageViewer2::SLICE_ORIENTATION_XZ: + cam->SetViewUp(0,0,1); + cam->SetPosition(0,-1,0); // 1 if medical ? + cam->SetFocalPoint(0,0,0); + break; + + case wxvtkImageViewer2::SLICE_ORIENTATION_XY: + cam->SetViewUp(0,1,0); + cam->SetPosition(0,0,1); // -1 if medical ? + cam->SetFocalPoint(0,0,0); + break; + + + } +*/ + } } @@ -343,8 +418,13 @@ void wxvtkImageViewer2::UpdateDisplayExtent() } // std::cout << "--- wxvtkImageViewer2::UpdateDisplayExtent()"<UpdateInformation(); int *w_ext = input->GetWholeExtent(); +#else + int *w_ext = input->GetExtent(); +#endif // std::cout << "ext = " // <IV->GetInput()->UpdateInformation(); this->IV->GetInput()->SetUpdateExtent (this->IV->GetInput()->GetWholeExtent()); this->IV->GetInput()->Update(); +#else + //... +#endif + double *range = this->IV->GetInput()->GetScalarRange(); this->IV->SetColorWindow(range[1] - range[0]); this->IV->SetColorLevel(0.5 * (range[1] + range[0])); @@ -613,7 +700,12 @@ void wxvtkImageViewer2::InstallPipeline() if (this->ImageActor && this->WindowLevel) { +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 this->ImageActor->SetInput(this->WindowLevel->GetOutput()); +#else + this->ImageActor->SetInputData(this->WindowLevel->GetOutput()); +#endif } } @@ -622,7 +714,12 @@ void wxvtkImageViewer2::UnInstallPipeline() { if (this->ImageActor) { +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 this->ImageActor->SetInput(NULL); +#else + this->ImageActor->SetInputData(NULL); +#endif } if (this->Renderer && this->ImageActor) @@ -654,8 +751,15 @@ void wxvtkImageViewer2::Render() input) { + +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 input->UpdateInformation(); int *w_ext = input->GetWholeExtent(); +#else + int *w_ext = input->GetExtent(); +#endif + int xs = 0, ys = 0; // std::cout << "wxvtkImageViewer2::Render ext = " @@ -729,7 +833,13 @@ int wxvtkImageViewer2::GetOffScreenRendering() void wxvtkImageViewer2::SetInput(vtkImageData *in) { // std::cout << "### wxvtkImageViewer2::SetInput"<WindowLevel->SetInput(in); +#else + this->WindowLevel->SetInputData(in); +#endif + this->UpdateDisplayExtent(); // LG 03/12/08 // FirstRender = 1;