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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSuperposition.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSuperposition.cxx
index 98f20f7..afbb44e 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSuperposition.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSuperposition.cxx
@@ -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.cxx,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.6 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -17,11 +42,14 @@
 
 #include "wxMaracasSuperposition.h"
 #include "creaWx.h"
+#include "vtkMetaImageReader.h"
+#include "wx/artprov.h"
+
+
 
 wxMaracasSuperposition* wxMaracasSuperposition::instance=NULL;
 
-wxMaracasSuperposition::wxMaracasSuperposition( wxWindow* parent, std::vector<vtkImageData*> imgs);
-: wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize)
+wxMaracasSuperposition::wxMaracasSuperposition( wxWindow* parent, std::vector<vtkImageData*> imgs): wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize)
 {	
 	m_mgr.SetManagedWindow(this);
 	
@@ -29,10 +57,10 @@ wxMaracasSuperposition::wxMaracasSuperposition( wxWindow* parent, std::vector<vt
 	_superposition2 = NULL;
 	_superposition3 = NULL;	
 	
-	_images = img;
+	_images = imgs;
 	
 	// set up default notebook style
-	m_notebook_style =wxAUI_NB_TAB_SPLIT | wxAUI_NB_TAB_EXTERNAL_MOVE | wxNO_BORDER | wxAUI_NB_CLOSE_ON_ACTIVE_TAB;
+	m_notebook_style =wxAUI_NB_TAB_SPLIT | wxAUI_NB_TAB_EXTERNAL_MOVE | wxNO_BORDER;
 	m_notebook_theme = 0;
 	_notebook = this->createNotebook();
 	
@@ -42,7 +70,9 @@ wxMaracasSuperposition::wxMaracasSuperposition( wxWindow* parent, std::vector<vt
 
 wxMaracasSuperposition::~wxMaracasSuperposition()
 {
-	
+	_notebook->Destroy();
+	instance = NULL;
+	m_mgr.UnInit();
 }
 
 wxMaracasSuperposition* wxMaracasSuperposition :: getInstance ( wxWindow* parent, std::vector<vtkImageData*> imgs)
@@ -56,15 +86,14 @@ wxMaracasSuperposition* wxMaracasSuperposition :: getInstance ( wxWindow* parent
 	
 wxMaracasSuperposition* wxMaracasSuperposition :: getInstance()
 {
-	
+	return instance;
 }
 
 //------------------------------------------------------------------------------------------------------------
 // Creational and initialization methods using WxAui
 //------------------------------------------------------------------------------------------------------------
-//
-wxAuiNotebook * IRMMainFrame :: createNotebook()
 
+wxAuiNotebook * wxMaracasSuperposition :: createNotebook()
 {
 	wxSize client_size = GetClientSize();
 	wxAuiNotebook* noteBook = new wxAuiNotebook(this, -1, wxPoint(client_size.x, client_size.y), wxSize(430,200), m_notebook_style);
@@ -77,19 +106,19 @@ void wxMaracasSuperposition :: configurePanels()
 {
 	if( _superposition1!=NULL )
 	{
-		notebook->AddPage( _superposition1, wxT("       Superoposition 1       ") );		
+		_notebook->AddPage( _superposition1, wxT("       Superoposition 1       ") );		
 		m_mgr.Update();
 	}
 
 	if( _superposition2!=NULL )
 	{
-		notebook->AddPage( _superposition2, wxT("       Superoposition 2       ") );
+		_notebook->AddPage( _superposition2, wxT("       Superoposition 2       ") );
 		m_mgr.Update();
 	}
 	
 	if( _superposition3!=NULL )
 	{
-		notebook->AddPage( _superposition3, wxT(("       Superoposition 3       ") );
+		_notebook->AddPage( _superposition3, wxT("       Superoposition 3       ") );
 		m_mgr.Update();
 	}
 	
@@ -105,7 +134,7 @@ void wxMaracasSuperposition :: createPanels()
 {
 	if( _superposition1==NULL )
 	{
-		createSuperpositionPanel(1)
+		_superposition1 = new wxMaracasSuperpositionPanel ( _images, 1, _notebook );
 	}
 	
 	else if( _superposition1!=NULL )
@@ -115,7 +144,7 @@ void wxMaracasSuperposition :: createPanels()
 
 	if( _superposition2==NULL )
 	{
-		createSuperpositionPanel(2)
+		_superposition2 = new wxMaracasSuperpositionPanel ( _images, 2, _notebook );
 	}
 	
 	else if( _superposition2!=NULL )
@@ -125,7 +154,7 @@ void wxMaracasSuperposition :: createPanels()
 	
 	if( _superposition3==NULL )
 	{
-		createSuperpositionPanel(3)
+		_superposition3 = new wxMaracasSuperpositionPanel ( _images, 3, _notebook );
 	}
 	
 	else if( _superposition3!=NULL )
@@ -133,11 +162,7 @@ void wxMaracasSuperposition :: createPanels()
 		
 	}	
 }
-	
-void wxMaracasSuperposition :: createSuperpositionPanel(int type)
-{
-	
-}
+
 
 void wxMaracasSuperposition :: changeImages(std::vector<vtkImageData*> imgs)
 {