X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasSuperposition.h;h=17f4549702f4fd84107bf8ee7116180ccaae39d0;hb=f9901e756bb82bd333310b47607875331616bb29;hp=eb88f6d76e5b2169600fb69e338cbb5ec89312ed;hpb=5bdd0c13157e0b246fa5f391dd181b2012357c31;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSuperposition.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSuperposition.h
index eb88f6d..17f4549 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSuperposition.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSuperposition.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: wxMaracasSuperposition.h,v $
   Language:  C++
-  Date:      $Date: 2009/05/28 16:39:51 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2012/11/15 14:14:35 $
+  Version:   $Revision: 1.5 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -15,19 +40,20 @@
 
 =========================================================================*/
 
-#ifndef __wxMaracasSuperpositionPanelH__
-#define __wxMaracasSuperpositionPanelH__
+#ifndef __wxMaracasSuperpositionH__
+#define __wxMaracasSuperpositionH__
 
 #include <vector>
 #include <wx/wx.h>
 #include "wx/aui/aui.h"
+#include "wxMaracasSuperpositionPanel.h"
 #include "vtkMetaImageReader.h"
 #include "vtkImageData.h"
 
 
 
 
-class  creaMaracasVisu_EXPORT  wxMaracasSuperposition : public wxPanel
+class creaMaracasVisu_EXPORT wxMaracasSuperposition : public wxPanel
 {	
 
 public:
@@ -43,18 +69,18 @@ public:
 	wxAuiNotebook * createNotebook();
 
 	void createPanels();
-	
-	void createSuperpositionPanel(int type);
 
 	void configurePanels();
 
-	void changeImages(vtkImageData* img1, vtkImageData* img2);
+	void changeImages(std::vector<vtkImageData*> imgs);
 
 	std::vector<vtkImageData*> getImages( );
 
 	
 private:
 
+	static wxMaracasSuperposition * instance;
+
 	wxAuiManager m_mgr;
 	
 	wxAuiNotebook * _notebook;