+/*# ---------------------------------------------------------------------
+#
+# 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/06/03 13:47:07 $
- Version: $Revision: 1.3 $
+ Date: $Date: 2012/11/15 14:14:35 $
+ Version: $Revision: 1.6 $
Copyright: (c) 2002, 2003
License:
wxMaracasSuperposition::~wxMaracasSuperposition()
{
_notebook->Destroy();
- m_mgr.UnInit();
+ instance = NULL;
+ m_mgr.UnInit();
}
wxMaracasSuperposition* wxMaracasSuperposition :: getInstance ( wxWindow* parent, std::vector<vtkImageData*> imgs)
{
if( _superposition1==NULL )
{
- createSuperpositionPanel(1);
+ _superposition1 = new wxMaracasSuperpositionPanel ( _images, 1, _notebook );
}
else if( _superposition1!=NULL )
if( _superposition2==NULL )
{
- createSuperpositionPanel(2);
+ _superposition2 = new wxMaracasSuperpositionPanel ( _images, 2, _notebook );
}
else if( _superposition2!=NULL )
if( _superposition3==NULL )
{
- createSuperpositionPanel(3);
+ _superposition3 = new wxMaracasSuperpositionPanel ( _images, 3, _notebook );
}
else if( _superposition3!=NULL )
}
}
-
-void wxMaracasSuperposition :: createSuperpositionPanel(int type)
-{
- if (type=1)
- {
- _superposition1 = new wxMaracasSuperpositionPanel ( _images, _notebook );
- }
- if (type=2)
- {
- _superposition2 = new wxMaracasSuperpositionPanel ( _images, _notebook );
- }
- if (type=3)
- {
- _superposition3 = new wxMaracasSuperpositionPanel ( _images, _notebook );
- }
-}
+
void wxMaracasSuperposition :: changeImages(std::vector<vtkImageData*> imgs)
{