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=11e8c474ce88693bf286ea3fc40d015304f0b277;hp=ff51f73da70c462b3278514da246dc32cb6a825c;hpb=f9e9505b254e2cdee67e8eab439b22af9a86b292;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 ff51f73..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/23 16:03:30 $ - Version: $Revision: 1.7 $ + 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,11 +152,11 @@ void wxMaracas_N_ViewersWidget::UpdateLayout(vtkImageData* imagedata){ wxWindow *wxwindow = NULL; - wxSizer *sizer = this->GetSizer(); - - if(currentwxwindow!=NULL){ - currentwxwindow->Show(false); - delete currentwxwindow; + wxSizer *sizer = this->GetSizer(); + + if(_currentwxw != NULL){ + _currentwxw->Show(false); + delete _currentwxw; //sizer->Remove(currentwxwindow); //delete currentwxwindow; } @@ -164,6 +165,7 @@ if (nTypeView->size()==1) { wxwindow1 = new wxMaracas_ViewerWidget(this, imagedata, (*nTypeView)[0]); + wxwindow1->ConfigureVTK(); wxwindow = wxwindow1; }else if (nTypeView->size()==2) { @@ -210,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();