X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxSTLWidget_03.h;h=1e0b93665bb2314a4134400a5f2a83ea8292b041;hb=05c4abbebf824bbbbaaab135acf6c888662dff69;hp=f120b4fdc6417777e4a39f08a822c0e420e1a676;hpb=c5feadbb145eecf6d73f793535b7e23eb18db2cb;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 f120b4f..1e0b936 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
@@ -16,19 +41,21 @@
 #include <vtkImageCast.h>
 
 #include "wxVTKRenderWindowInteractor.h"
-#include "wxSurfaceWidget.h"
+//#include "wxSurfaceWidget.h"
 #include "wxVtkBaseView.h"
 
 
 #include "../wxMaracasMPR.h"
 #include "pPlotter/mBarRange.h"//SIL//
 
-#include <kernel/marInterface.h>
-#include <kernel/axisExtractor02.h>
+//#include <marInterface.h>
+//#include <include/axisExtractor02.h>
+
 
+#include "vtkSTLExtractor.h"    
+#include "include/vtkJoiner.h"
 
-#include "kernel/vtkSTLExtractor.h"    
-#include "kernel/vtkJoiner.h"
+#include "marTypes.h"
 
 
 
@@ -37,9 +64,9 @@
 //------------------------------------------------------------------
 //------------------------------------------------------------------
 
-class wxSTLWidget_03: public wxPanel{
+class creaMaracasVisu_EXPORT wxSTLWidget_03: public wxPanel{
 public:
-	wxSTLWidget_03(wxWindow *parentmar,marInterface *mar);
+	wxSTLWidget_03(wxWindow *parentmar);//,marInterface *mar);
 	~wxSTLWidget_03();
 	void ConfigureVTK();
 	void Refresh();
@@ -83,6 +110,9 @@ public:
 	//---------------------------------------
 	void OnJoinRegions(wxCommandEvent& event);
 
+	//JCP 01-03-08
+	void setImage(vtkImageData* img);
+
 private:
 
 	//Processing
@@ -93,6 +123,7 @@ private:
 	vtkImageCast				*cast4; // binary segmentation result
 	vtkImageThreshold			*_thresh;
 	vtkImageThreshold			*_thresh2;
+	vtkImageCast * _cast;
 	vtkImageSeedConnectivity	*_connect;
 	vtkImageSeedConnectivity	*_connect2;
 
@@ -133,7 +164,7 @@ private:
 	wxPanel				*CreateViewPanel(wxWindow *parent);
 
 	//Maracas
-	marInterface		*_mar;
+	//marInterface		*_mar;
 	wxMaracasMPR		*_wxMaracasMPR;
 
 	void ResetTree2_JF();
@@ -147,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);
 
 
 	//---------------------