X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuViewerMPR.h;h=13fdea1d34fa2570428996081acc6abd9e901dc5;hb=a7017a8ade695bd14a4c7ee70b197d63b5e76765;hp=878a9a645828338f85d9902f324e003c6038a8bc;hpb=800f29fd7e4cc70d8706b3075454e63f0b1a5717;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuViewerMPR.h b/bbtk/src/bbmaracasvisuViewerMPR.h
index 878a9a6..13fdea1 100644
--- a/bbtk/src/bbmaracasvisuViewerMPR.h
+++ b/bbtk/src/bbmaracasvisuViewerMPR.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.
+# ------------------------------------------------------------------------ */
+
 #ifdef _USE_WXWIDGETS_
 #ifndef __bbcreaMaracasVisuViewerMPR_h_INCLUDED__
 #define __bbcreaMaracasVisuViewerMPR_h_INCLUDED__
@@ -6,6 +31,7 @@
 #include "wxMaracasMPR.h"
 #include "vtkImageData.h"
 #include "vtkRenderer.h"
+#include "wxMPRWidget2.h"
 
 namespace bbcreaMaracasVisu
 {
@@ -17,7 +43,7 @@ namespace bbcreaMaracasVisu
   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 +57,12 @@ namespace bbcreaMaracasVisu
 
 		//refreshView
 		void Refresh();
+
+		void setImageData(vtkImageData* img);
+		void ConfigureVTK();
 		
 	private:
-
+		
 		ViewerMPR			*mbbViewerMPR;
 		wxMPRWidget2		*wxwidget;
 		std::vector<int>	point;
@@ -53,14 +82,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 +89,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);