X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvSurfaceViewerDialog.h;h=9601e9af51a4d270a2b150a6a21feeb6bb19e2b6;hb=c99626f17e07dbde440eb40a25683ce441a49a6e;hp=797b8c2bc9fe6fe75f0018bc1eec3af89c8aba97;hpb=0b7c9b1e1215634b02cbd38d4e4ba101d6111ba8;p=clitk.git diff --git a/vv/vvSurfaceViewerDialog.h b/vv/vvSurfaceViewerDialog.h index 797b8c2..9601e9a 100644 --- a/vv/vvSurfaceViewerDialog.h +++ b/vv/vvSurfaceViewerDialog.h @@ -3,7 +3,7 @@ Authors belong to: - University of LYON http://www.universite-lyon.fr/ - - Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr + - Léon Bérard cancer center http://www.centreleonberard.fr - CREATIS CNRS laboratory http://www.creatis.insa-lyon.fr This software is distributed WITHOUT ANY WARRANTY; without even @@ -14,16 +14,25 @@ - BSD See included LICENSE.txt file - CeCILL-B http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html -======================================================================-====*/ +===========================================================================**/ #ifndef _vvSurfaceViewerDialog_H #define _vvSurfaceViewerDialog_H +#include +#if (VTK_MAJOR_VERSION == 8 && VTK_MINOR_VERSION >= 2) || VTK_MAJOR_VERSION >= 9 #include "ui_vvSurfaceViewerDialog.h" +#else +#include "ui_vvSurfaceViewerDialogVTK7.h" +#endif class vtkPolyDataMapper; class vtkActor; class vtkOBJReader; +#if QT_VERSION >= 0x050000 +#include +#else #include +#endif #include //==================================================================== @@ -46,7 +55,7 @@ private : vtkPolyDataMapper* mMapper; vtkActor* mActor; vtkRenderer * mRenderer; - unsigned int mCurrentTime; + int mCurrentTime; }; // end class vvSurfaceViewerDialog //====================================================================