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=ca35b13e046343c8b50cbd6b833828b06c9d1608;hp=63ffd091ab6d45854ec2e5b1c15429b8cc3fc8fe;hpb=c5feadbb145eecf6d73f793535b7e23eb18db2cb;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.h
index 63ffd09..3c46e68 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.h
@@ -1,8 +1,33 @@
+/*# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------ */
+
 #ifndef _wxVTKRenderWindowInteractorEditContour_h_
 #define _wxVTKRenderWindowInteractorEditContour_h_
 
 
-#include "wxVTKRenderWindowInteractor.h"
+#include <creawxVTKRenderWindowInteractor.h>
 
 #include <vtkCommand.h> 
 #include <vtkImageData.h> 
@@ -14,7 +39,6 @@
 
 
 
-
 //------------------------------------------------------------------------
 //------------------------------------------------------------------------
 //------------------------------------------------------------------------
@@ -70,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]));
@@ -165,6 +197,7 @@ public:
   double InitialLevel;
 };
 
+//class crea::wxVTKRenderWindowInteractor;
 
 class vtkInteractorStyle2DMaracas : public vtkInteractorStyleImage{
 public:
@@ -183,7 +216,7 @@ public:
 	virtual void  OnMiddleButtonUp () ;
 	virtual void  OnRightButtonDown () ;
 	virtual void  OnRightButtonUp () ;
-			void  SetObserver( vtkCommand *obs );
+	void  SetObserver( vtkCommand *obs );
 
 private:
 	vtkCommand *_obs;
@@ -195,26 +228,26 @@ private:
 
 
 
-class wxVTKRenderWindowInteractorEditContour : public wxVTKRenderWindowInteractor{
+class wxVTKRenderWindowInteractorEditContour : public crea::wxVTKRenderWindowInteractor {
 
 public:
 
-	wxVTKRenderWindowInteractorEditContour(wxWindow *parent,wxWindowID id); 
-	~wxVTKRenderWindowInteractorEditContour(); 
+    wxVTKRenderWindowInteractorEditContour(wxWindow *parent,wxWindowID id); 
+    virtual ~wxVTKRenderWindowInteractorEditContour(); 
 
-	virtual void OnButtonDown(wxMouseEvent &event);
-	virtual void OnButtonUp(wxMouseEvent &event);
-	virtual void OnButtonDouble(wxMouseEvent &event);
+    virtual void OnButtonDown(wxMouseEvent &event);
+    virtual void OnButtonUp(wxMouseEvent &event);
+    virtual void OnButtonDouble(wxMouseEvent &event);
     virtual void OnMotion(wxMouseEvent &event);
-	virtual void OnKeyDown(wxKeyEvent &event);
+    virtual void OnKeyDown(wxKeyEvent &event);
 
-			void SetState(int state);
-			int	 GetState();
-			void SetObserver(vtkCommand *obs);
+    void SetState(int state);
+    int  GetState();
+    void SetObserver(vtkCommand *obs);
 
 private:
-	int			 _state;
-	vtkCommand	*_obs;
+    int        _state;
+    vtkCommand *_obs;
 };