X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracas_N_ViewersWidget.cxx;h=d791fd378dcf97b3149349b6cf986e22744b5458;hb=efe55c8afe89bd1d090c59513f2be82ad3ab9b0d;hp=8057ae28b196636a0bb0e2f1a3cf9c45e9e0fa4e;hpb=bf59a58c8e18d27d491ce9681c06e50c8213cb23;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.cxx
index 8057ae2..d791fd3 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.cxx
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracas_N_ViewersWidget.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/04/01 16:16:59 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2009/05/14 13:54:35 $
+  Version:   $Revision: 1.9 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -49,7 +49,8 @@
 		wxwindow2	= NULL;
 		wxwindow3	= NULL;
 		wxwindow4	= NULL;
-		currentwxwindow = NULL;
+
+		_currentwxw = NULL;
 
 		wxSizer *sizer	= new wxBoxSizer(wxVERTICAL);
 		this->SetSizer(sizer);
@@ -151,10 +152,11 @@
  void wxMaracas_N_ViewersWidget::UpdateLayout(vtkImageData* imagedata){
 
 		wxWindow				*wxwindow	= NULL;
-		wxSizer *sizer	= this->GetSizer();
-	
-		if(currentwxwindow!=NULL){
-			currentwxwindow->Show(false);
+		wxSizer *sizer	= this->GetSizer();	
+		
+		if(_currentwxw != NULL){
+			_currentwxw->Show(false);
+			delete _currentwxw;
 			//sizer->Remove(currentwxwindow);			
 			//delete currentwxwindow;
 		}
@@ -162,9 +164,8 @@
 		//std::cout<<"size "<<nTypeView->size()<<std::endl;
 		if (nTypeView->size()==1)
 		{
-
-			std::cout<<"type "<<(*nTypeView)[0]<<std::endl;
 			wxwindow1 = new wxMaracas_ViewerWidget(this, imagedata, (*nTypeView)[0]);
+
 			wxwindow1->ConfigureVTK();
 			wxwindow = wxwindow1;
 		}else	if (nTypeView->size()==2)	{
@@ -211,8 +212,8 @@
 		//panel->SetDimension()
 		sizer->Add( wxwindow , 1, wxEXPAND);
 		sizer->Layout();
-		currentwxwindow = wxwindow;		
-		currentwxwindow->Show(true);
+		_currentwxw = wxwindow;		
+		_currentwxw->Show(true);
 		
 		this->Layout();
 		this->Refresh();