X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxSTLWidget_03.h;h=8b1af9aae7fb5a429bd3c3f4d9b889727e73a82c;hb=659bcd2c2a608cfb8c5854ffe84e9248871df9a1;hp=916ca395d252a37104542472e27cdb5be2d98222;hpb=e6b030ceb3ee4eea1f012e7d5c47503cf6322c61;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxSTLWidget_03.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxSTLWidget_03.h
index 916ca39..8b1af9a 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxSTLWidget_03.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxSTLWidget_03.h
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# 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 WX_STL_WIDGET_03
 #define WX_STL_WIDGET_03
@@ -15,7 +40,7 @@
 #include <vtkImageSeedConnectivity.h>
 #include <vtkImageCast.h>
 
-#include "wxVTKRenderWindowInteractor.h"
+#include "creawxVTKRenderWindowInteractor.h"
 //#include "wxSurfaceWidget.h"
 #include "wxVtkBaseView.h"
 
@@ -24,11 +49,11 @@
 #include "pPlotter/mBarRange.h"//SIL//
 
 //#include <marInterface.h>
-#include <axisExtractor02.h>
+//#include <include/axisExtractor02.h>
 
 
 #include "vtkSTLExtractor.h"    
-#include "vtkJoiner.h"
+#include "include/vtkJoiner.h"
 
 #include "marTypes.h"
 
@@ -98,6 +123,7 @@ private:
 	vtkImageCast				*cast4; // binary segmentation result
 	vtkImageThreshold			*_thresh;
 	vtkImageThreshold			*_thresh2;
+	vtkImageCast * _cast;
 	vtkImageSeedConnectivity	*_connect;
 	vtkImageSeedConnectivity	*_connect2;
 
@@ -152,7 +178,7 @@ private:
 	//---------------------
 	// Processing
 	//---------------------
-	void ConfigureProcessing(marImageData *marimagedata, int x, int y, int z);
+	void ConfigureProcessing(vtkImageData *img, int x, int y, int z);
 
 
 	//---------------------