Program: wxMaracas
Module: $RCSfile: wxMaracasSuperposition.cxx,v $
Language: C++
- Date: $Date: 2009/06/03 13:47:07 $
- Version: $Revision: 1.3 $
+ Date: $Date: 2009/06/08 12:35:29 $
+ Version: $Revision: 1.5 $
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)
{