X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwxvtk%2Fsrc%2FwxvtkImageViewer2.h;h=47867584fb5103009e0fe3cf340f5cbf6db663d7;hb=08ce916eba56a6111014712fc931a1cce7e8f877;hp=19e7245b9a2cf46cc9c811c884d452e643f75bc5;hpb=911e9825791b3ed1777a80ffc1185970bd051193;p=bbtk.git

diff --git a/packages/wxvtk/src/wxvtkImageViewer2.h b/packages/wxvtk/src/wxvtkImageViewer2.h
index 19e7245..4786758 100644
--- a/packages/wxvtk/src/wxvtkImageViewer2.h
+++ b/packages/wxvtk/src/wxvtkImageViewer2.h
@@ -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
@@ -65,11 +92,18 @@ class vtkRenderWindow;
 class vtkRenderer;
 class vtkRenderWindowInteractor;
 
-class VTK_RENDERING_EXPORT wxvtkImageViewer2 : public vtkObject 
+class /*VTK_RENDERING_EXPORT*/ wxvtkImageViewer2 : public vtkObject 
 {
 public:
   static wxvtkImageViewer2 *New();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
   vtkTypeRevisionMacro(wxvtkImageViewer2,vtkObject);
+#else
+  vtkTypeMacro(wxvtkImageViewer2,vtkObject);
+#endif
+
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
@@ -130,7 +164,9 @@ public:
   virtual int GetSliceMin();
   virtual int GetSliceMax();
   virtual void GetSliceRange(int range[2])
-    { this->GetSliceRange(range[0], range[1]); }
+  	{ 
+		this->GetSliceRange(range[0], range[1]); 
+	}
   virtual void GetSliceRange(int &min, int &max);
   virtual int* GetSliceRange();
   
@@ -151,7 +187,10 @@ public:
   // Set/Get the position in screen coordinates of the rendering window.
   virtual int* GetPosition();
   virtual void SetPosition(int a,int b);
-  virtual void SetPosition(int a[2]) { this->SetPosition(a[0],a[1]); }
+  virtual void SetPosition(int a[2]) 
+	{ 
+		this->SetPosition(a[0],a[1]); 
+	}
   
   // Description:
   // Set/Get the size of the window in screen coordinates in pixels.