X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuContourVOI.h;h=47b8cbd720645cf60985a75b5ebf79e69140b39c;hb=35a5d83be3d84f9d1544b8d3ad0de044f1e65286;hp=4f55e46e71c3cab1c1a7a5ab7b6c01cea7f906ac;hpb=44e4be7013ea566bd2bdefb9d48e1da0071c3d91;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuContourVOI.h b/bbtk/src/bbmaracasvisuContourVOI.h
index 4f55e46..47b8cbd 100644
--- a/bbtk/src/bbmaracasvisuContourVOI.h
+++ b/bbtk/src/bbmaracasvisuContourVOI.h
@@ -1,8 +1,8 @@
 
 
 #ifdef _USE_WXWIDGETS_
-#ifndef __bbmaracasvisuContourVOI_h_INCLUDED__
-#define __bbmaracasvisuContourVOI_h_INCLUDED__
+#ifndef __bbcreaMaracasVisuContourVOI_h_INCLUDED__
+#define __bbcreaMaracasVisuContourVOI_h_INCLUDED__
 #include "bbtkWxBlackBox.h"
 
 
@@ -10,7 +10,7 @@
 
 #include "Contour/ContourVOIWidget.h"
 
-namespace bbmaracasvisu
+namespace bbcreaMaracasVisu
 {
 
 
@@ -19,7 +19,7 @@ namespace bbmaracasvisu
   class wxWidgetVOI : public wxPanel
   {
 	public:
-		wxWidgetVOI(wxWindow* parent, wxVtkBaseView *wxvtkbaseview, vtkImageData	*imagedata);
+		wxWidgetVOI(wxWindow* parent, wxVtkBaseView *wxvtkbaseview=NULL, vtkImageData	*imagedata=NULL);
 		~wxWidgetVOI();
 	    
 		//if the MPR had generated the refresh event
@@ -31,11 +31,22 @@ namespace bbmaracasvisu
 
 		ContourVOIWidget* GetContourVOIWidget();
 
+  	    void setImageData(vtkImageData * imagedata);
+		void setBaseView(wxVtkBaseView * wxvtkbaseview);
+
+		void initializeVOIWidget();
+
 	private:
 
 //		ContourVOI			*mbbViewerMPR;
 		ContourVOIWidget	*mcontourvoiwidget;
 
+		wxVtkBaseView * wxvtkbaseview;
+		vtkImageData * imagedata;
+		
+
+		
+
 	DECLARE_EVENT_TABLE( );	    
   };
   
@@ -53,23 +64,21 @@ class /*BBTK_EXPORT*/ ContourVOI
    public bbtk::WxBlackBox
 {
   BBTK_BLACK_BOX_INTERFACE(ContourVOI,bbtk::WxBlackBox);
-//==================================================================
-/// User callback called in the box contructor
-virtual void bbUserConstructor();
-/// User callback called in the box copy constructor
-virtual void bbUserCopyConstructor();
-/// User callback called in the box destructor
-virtual void bbUserDestructor();
-//==================================================================
   BBTK_DECLARE_INPUT(Title,std::string);
     BBTK_DECLARE_INPUT(In, vtkImageData*);
     BBTK_DECLARE_INPUT(wxVtkBaseView, wxVtkBaseView*);
 	BBTK_DECLARE_OUTPUT(Index,std::string);
 	BBTK_DECLARE_OUTPUT(Size,std::string);
+	BBTK_DECLARE_OUTPUT(VOI,vtkImageData*);
   BBTK_PROCESS(Process);
   void Process();
   BBTK_CREATE_WIDGET(CreateWidget);
-  void CreateWidget();
+  void CreateWidget(wxWindow*);
+
+private:
+	vtkImageData* _img;
+	wxVtkBaseView* _base;
+//EED 20Juin2011	vtkExtractVOI*	_extract;
 
 };
 
@@ -83,10 +92,11 @@ BBTK_DESCRIPTION("define VOI widget");
 	BBTK_INPUT(ContourVOI,wxVtkBaseView,"maracas visu wxVtkBaseView",wxVtkBaseView*,"");
 	BBTK_OUTPUT(ContourVOI,Index, "Index"	,	std::string,"");
 	BBTK_OUTPUT(ContourVOI,Size, "Size"	,	std::string,"");
+	BBTK_OUTPUT(ContourVOI,VOI,"Region of interest",vtkImageData*,"");
 BBTK_END_DESCRIBE_BLACK_BOX(ContourVOI);
 }
-// EO namespace bbmaracasvisu
+// EO namespace bbcreaMaracasVisu
 
-#endif // __bbmaracasvisuContourVOI_h_INCLUDED__
+#endif // __bbcreaMaracasVisuContourVOI_h_INCLUDED__
 #endif // _USE_WXWIDGETS_