From a456f0613e3f1ad1df666f97a85a1805c1ef98f9 Mon Sep 17 00:00:00 2001 From: "eduardo.davila@creatis.insa-lyon.fr" Date: Mon, 20 Jan 2025 17:59:11 +0100 Subject: [PATCH] #3574 Bug Windows. Sync in creation process --- bbtk/src/bbmaracasvisuViewerNV.cxx | 1 - .../wxWindows/widgets/wxMaracas_N_ViewersWidget.cxx | 11 ++--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/bbtk/src/bbmaracasvisuViewerNV.cxx b/bbtk/src/bbmaracasvisuViewerNV.cxx index 6956c52..74bf209 100644 --- a/bbtk/src/bbmaracasvisuViewerNV.cxx +++ b/bbtk/src/bbmaracasvisuViewerNV.cxx @@ -141,7 +141,6 @@ void ViewerNV::Process() bbSetOutputwxVtkBaseView2( wvbv2 ); bbSetOutputwxVtkBaseView3( wvbv3 ); bbSetOutputwxVtkBaseView4( wvbv4 ); - printf("EED ViewerNV::Process export renderer\n"); if (wvbv1!=NULL) { bbSetOutputRenderer1( wvbv1->GetRenderer() ); } if (wvbv2!=NULL) { bbSetOutputRenderer2( wvbv2->GetRenderer() ); } if (wvbv3!=NULL) { bbSetOutputRenderer3( wvbv3->GetRenderer() ); } 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 9890f92..52364c1 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.cxx @@ -208,8 +208,8 @@ //------------------------------------------------------------------------- wxVtkBaseView *wxMaracas_N_ViewersWidget::GetwxVtkBaseView(int iWin) { - wxVtkBaseView *wxvtkbaseview=NULL; - wxMaracas_ViewerWidget *tmpWin=GetWindow(iWin); + wxVtkBaseView *wxvtkbaseview = NULL; + wxMaracas_ViewerWidget *tmpWin = GetWindow(iWin); if (tmpWin!=NULL){ wxvtkbaseview = tmpWin->GetwxVtkBaseView(); } return wxvtkbaseview; } @@ -225,23 +225,19 @@ { wxWindow *wxwindow = NULL; wxSizer *sizer = this->GetSizer(); - if (mvtkmprbasedata!=NULL) { delete mvtkmprbasedata; } - marImageData *marimagedata = new marImageData( imagedata ); mvtkmprbasedata = new vtkMPRBaseData(); mvtkmprbasedata->SetMarImageData(marimagedata); - if(_currentwxw != NULL){ _currentwxw->Show(false); delete _currentwxw; //sizer->Remove(currentwxwindow); //delete currentwxwindow; } - //std::cout<<"size "<size()<size()==1) { @@ -300,10 +296,8 @@ spliterB-> SplitHorizontally( wxwindow2 , wxwindow1 ); wxwindow = spliter; } - //panel->SetDimension() sizer->Add( wxwindow , 1, wxGROW); - //EED 2024-11-13 // sizer->Layout(); @@ -320,7 +314,6 @@ if (wxwindow1!=NULL) {wxwindow1->ConfigureVTK(); } } - //----------------------------------------------------------------------------------- void wxMaracas_N_ViewersWidget::SetType(std::vector* type) { -- 2.49.0