X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxVTKRenderWindowInteractorEditContour.h;h=3c46e68c78607bd799c6dafd87e582119460c42c;hb=e263b7ace0f53d647a731553a3f67700838ad146;hp=8c13f8b907d4369013f66bc96ef55da00e4ad308;hpb=e4ef2b5df5aac431ff3b806f83b7dd5e55e89d86;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.h index 8c13f8b..3c46e68 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.h @@ -27,7 +27,7 @@ #define _wxVTKRenderWindowInteractorEditContour_h_ -#include +#include #include #include @@ -94,10 +94,18 @@ public: if (event == vtkCommand::ResetWindowLevelEvent) { + + +//EED 2017-01-01 Migration VTK7 +#if VTK_MAJOR_VERSION <= 5 this->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])); @@ -189,7 +197,7 @@ public: double InitialLevel; }; -class wxVTKRenderWindowInteractor; +//class crea::wxVTKRenderWindowInteractor; class vtkInteractorStyle2DMaracas : public vtkInteractorStyleImage{ public: @@ -220,7 +228,7 @@ private: -class wxVTKRenderWindowInteractorEditContour : public wxVTKRenderWindowInteractor { +class wxVTKRenderWindowInteractorEditContour : public crea::wxVTKRenderWindowInteractor { public: