X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=bbtk%2Fsrc%2FbbmaracasvisuViewerMPR.h;h=882fa43962a9c386d13dcc24b48acec2455d3e0a;hb=f010d4e7f1754243c513cc659372169c42560d5f;hp=8f004ea7e8ad06533ccb72386dd54cfc59ac5bde;hpb=44e4be7013ea566bd2bdefb9d48e1da0071c3d91;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuViewerMPR.h b/bbtk/src/bbmaracasvisuViewerMPR.h
index 8f004ea..882fa43 100644
--- a/bbtk/src/bbmaracasvisuViewerMPR.h
+++ b/bbtk/src/bbmaracasvisuViewerMPR.h
@@ -1,13 +1,14 @@
 #ifdef _USE_WXWIDGETS_
-#ifndef __bbmaracasvisuViewerMPR_h_INCLUDED__
-#define __bbmaracasvisuViewerMPR_h_INCLUDED__
+#ifndef __bbcreaMaracasVisuViewerMPR_h_INCLUDED__
+#define __bbcreaMaracasVisuViewerMPR_h_INCLUDED__
 #include "bbtkWxBlackBox.h"
 
 #include "wxMaracasMPR.h"
 #include "vtkImageData.h"
 #include "vtkRenderer.h"
+#include "wxMPRWidget2.h"
 
-namespace bbmaracasvisu
+namespace bbcreaMaracasVisu
 {
 
 
@@ -17,7 +18,7 @@ namespace bbmaracasvisu
   class wxWidgetMPR : public wxPanel
   {
 	public:
-		wxWidgetMPR(ViewerMPR* box,wxWindow* parent, marImageData	*marimagedata);
+		wxWidgetMPR(ViewerMPR* box,wxWindow* parent, marImageData	*marimagedata=NULL);
 		~wxWidgetMPR();
 	    
 		//if the MPR had generated the refresh event
@@ -31,9 +32,12 @@ namespace bbmaracasvisu
 
 		//refreshView
 		void Refresh();
+
+		void setImageData(vtkImageData* img);
+		void ConfigureVTK();
 		
 	private:
-
+		
 		ViewerMPR			*mbbViewerMPR;
 		wxMPRWidget2		*wxwidget;
 		std::vector<int>	point;
@@ -53,14 +57,6 @@ class /*BBTK_EXPORT*/ ViewerMPR
    public bbtk::WxBlackBox
 {
   BBTK_BLACK_BOX_INTERFACE(ViewerMPR,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_OUTPUT(Renderer,vtkRenderer *);
@@ -68,10 +64,11 @@ virtual void bbUserDestructor();
   BBTK_PROCESS(Process);
   void Process();
   BBTK_CREATE_WIDGET(CreateWidget);
-  void CreateWidget();
+  void CreateWidget(wxWindow* parent);
 
 private:
-  wxWidgetMPR *mwxwidgetmpr;
+  wxWidgetMPR *wxwidget;
+  vtkImageData	*_img;
 };
 
 BBTK_BEGIN_DESCRIBE_BLACK_BOX(ViewerMPR,bbtk::WxBlackBox);
@@ -86,8 +83,8 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(ViewerMPR,bbtk::WxBlackBox);
 
 BBTK_END_DESCRIBE_BLACK_BOX(ViewerMPR);
 }
-// EO namespace bbmaracasvisu
+// EO namespace bbcreaMaracasVisu
 
-#endif // __bbmaracasvisuViewerMPR_h_INCLUDED__
+#endif // __bbcreaMaracasVisuViewerMPR_h_INCLUDED__
 #endif // _USE_WXWIDGETS_