X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasSuperposition.h;h=6b12c3f2c613bccaa03c50070013a057066bbc06;hb=eb86c7c842400ac8bdc1c23c64efd407f83e6811;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..6b12c3f 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSuperposition.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSuperposition.h
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracasSuperposition.h,v $
   Language:  C++
-  Date:      $Date: 2009/05/28 16:39:51 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2009/06/05 16:44:25 $
+  Version:   $Revision: 1.4 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -15,19 +15,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 +44,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;