X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2FwxMaracasMPR.h;h=06cbd8f1ec823fdb9c7f2e96ac817028df6c47f2;hb=b2ac7f59e78e33f8e11065cffa2f2072aa9a9ee5;hp=68d6f4de25e8165f40a368e7f660f5182c5de17b;hpb=b299d0edface430f0b0ed6221987593bb123f513;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/wxMaracasMPR.h b/lib/maracasVisuLib/src/interface/wxWindows/wxMaracasMPR.h
index 68d6f4d..06cbd8f 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/wxMaracasMPR.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/wxMaracasMPR.h
@@ -1,10 +1,35 @@
+/*# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------ */
+
 /*=========================================================================
 
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracasMPR.h,v $
   Language:  C++
-  Date:      $Date: 2008/11/24 10:47:10 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2012/11/15 14:16:51 $
+  Version:   $Revision: 1.7 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -27,17 +52,19 @@
 #include "widgets/wxMPRWidget.h"
 
 
-class  MARACASVISULIB_EXPORTS  wxMaracasMPR : public wxPanel
+class  creaMaracasVisu_EXPORT  wxMaracasMPR : public wxPanel
 {
 public:
-    wxMaracasMPR( wxWindow* parent, marImageData* marimagedata,double voxelSize);
+    wxMaracasMPR( wxWindow* parent, marImageData* marimagedata=NULL,double voxelSize=-1);
     ~wxMaracasMPR( );
 	void ConfigureVTK();
 	vtkMPRBaseData	*GetVtkMPRBaseData();
 	vtkPlane2DView	*GetVtkPlane2DView();
-	wxVtkMPR3DView  *GetWxvtkmpr3Dview_BB();
+	wxVtkMPR3DView  *GetWxvtkmpr3Dview_BB()throw(char*);
 	void			RefreshView();
 
+	void setImageData(vtkImageData *img, double voxelsize);
+
 private:
 	 wxMPRWidget* _MPR;
 };