X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvSurfaceViewerDialog.h;h=9601e9af51a4d270a2b150a6a21feeb6bb19e2b6;hb=d786b4f836c0f12ba4a6dd06803cbe771ac371e3;hp=41eff5af085049a976e6f4c32a81b6e8c2be045c;hpb=931a42358442f4ee4f314613c991c838d4b4e3b7;p=clitk.git
diff --git a/vv/vvSurfaceViewerDialog.h b/vv/vvSurfaceViewerDialog.h
index 41eff5a..9601e9a 100644
--- a/vv/vvSurfaceViewerDialog.h
+++ b/vv/vvSurfaceViewerDialog.h
@@ -1,41 +1,38 @@
-#ifndef _vvSurfaceViewerDialog_H
-#define _vvSurfaceViewerDialog_H
-
/*=========================================================================
+ Program: vv http://www.creatis.insa-lyon.fr/rio/vv
-Program: vv
-Module: $RCSfile: vvSurfaceViewerDialog.h,v $
-Language: C++
-Date: $Date: 2010/01/06 13:31:57 $
-Version: $Revision: 1.1 $
-Author : David Sarrut (david.sarrut@gmail.com)
-
-Copyright (C) 2008
-Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr
-CREATIS-LRMN http://www.creatis.insa-lyon.fr
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 3 of the License.
+ Authors belong to:
+ - University of LYON http://www.universite-lyon.fr/
+ - Léon Bérard cancer center http://www.centreleonberard.fr
+ - CREATIS CNRS laboratory http://www.creatis.insa-lyon.fr
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-
-=========================================================================*/
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the copyright notices for more information.
+ It is distributed under dual licence
+ - 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
//====================================================================
@@ -58,7 +55,7 @@ private :
vtkPolyDataMapper* mMapper;
vtkActor* mActor;
vtkRenderer * mRenderer;
- unsigned int mCurrentTime;
+ int mCurrentTime;
}; // end class vvSurfaceViewerDialog
//====================================================================