X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxSTLWidget_03.h;h=dde0d2434d98a7040610500c5bba470d0d7d20e9;hb=65c158dc171f8d3114ee3544b2a94a1f41880df0;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..dde0d24 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxSTLWidget_03.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxSTLWidget_03.h
@@ -16,19 +16,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 "kernel/vtkSTLExtractor.h"    
-#include "kernel/vtkJoiner.h"
+#include "vtkSTLExtractor.h"    
+#include "include/vtkJoiner.h"
+
+#include "marTypes.h"
 
 
 
@@ -37,9 +39,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 +85,9 @@ public:
 	//---------------------------------------
 	void OnJoinRegions(wxCommandEvent& event);
 
+	//JCP 01-03-08
+	void setImage(vtkImageData* img);
+
 private:
 
 	//Processing
@@ -93,6 +98,7 @@ private:
 	vtkImageCast				*cast4; // binary segmentation result
 	vtkImageThreshold			*_thresh;
 	vtkImageThreshold			*_thresh2;
+	vtkImageCast * _cast;
 	vtkImageSeedConnectivity	*_connect;
 	vtkImageSeedConnectivity	*_connect2;
 
@@ -133,7 +139,7 @@ private:
 	wxPanel				*CreateViewPanel(wxWindow *parent);
 
 	//Maracas
-	marInterface		*_mar;
+	//marInterface		*_mar;
 	wxMaracasMPR		*_wxMaracasMPR;
 
 	void ResetTree2_JF();
@@ -147,7 +153,7 @@ private:
 	//---------------------
 	// Processing
 	//---------------------
-	void ConfigureProcessing(marImageData *marimagedata, int x, int y, int z);
+	void ConfigureProcessing(vtkImageData *img, int x, int y, int z);
 
 
 	//---------------------