From a47e92c81210557bc19441faef4afd1cf28a84d3 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Wed, 3 Nov 2021 11:13:01 +0100 Subject: [PATCH] #3389 Stuck Render macOS --- src/creawxVTKRenderWindowInteractor.mm | 28 ++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/src/creawxVTKRenderWindowInteractor.mm b/src/creawxVTKRenderWindowInteractor.mm index 578c3a3..4f63d14 100644 --- a/src/creawxVTKRenderWindowInteractor.mm +++ b/src/creawxVTKRenderWindowInteractor.mm @@ -44,7 +44,6 @@ =========================================================================*/ - #include #include "creawxVTKRenderWindowInteractor.h" @@ -440,6 +439,7 @@ void wxVTKRenderWindowInteractor::Start() //--------------------------------------------------------------------------- void wxVTKRenderWindowInteractor::UpdateSize(int x, int y) { +//printf("EED wxVTKRenderWindowInteractor::UpdateSize Start\n"); if( RenderWindow ) { // if the size changed tell render window @@ -463,6 +463,7 @@ void wxVTKRenderWindowInteractor::UpdateSize(int x, int y) #endif //__WXMSW__ } // if x y } // if RenderWindow +printf("EED wxVTKRenderWindowInteractor::UpdateSize End\n"); } //--------------------------------------------------------------------------- int wxVTKRenderWindowInteractor::CreateTimer(int WXUNUSED(timertype)) @@ -566,6 +567,8 @@ long wxVTKRenderWindowInteractor::GetHandleHack() //--------------------------------------------------------------------------- void wxVTKRenderWindowInteractor::OnPaint(wxPaintEvent& WXUNUSED(event)) { +printf("EED wxVTKRenderWindowInteractor::OnPaint Start\n"); + //must always be here //EED2021-08-26 #ifdef __WXCOCOA__ @@ -630,6 +633,8 @@ void wxVTKRenderWindowInteractor::OnPaint(wxPaintEvent& WXUNUSED(event)) } #endif #endif + +printf("EED wxVTKRenderWindowInteractor::OnPaint End\n"); } //--------------------------------------------------------------------------- void wxVTKRenderWindowInteractor::OnEraseBackground(wxEraseEvent &event) @@ -746,7 +751,8 @@ void wxVTKRenderWindowInteractor::OnKeyDown(wxKeyEvent &event) //--------------------------------------------------------------------------- void wxVTKRenderWindowInteractor::OnKeyUp(wxKeyEvent &event) { - if (!Enabled) +printf("EED wxVTKRenderWindowInteractor::OnKeyUp Start\n"); + if (!Enabled) { return; } @@ -772,11 +778,13 @@ void wxVTKRenderWindowInteractor::OnKeyUp(wxKeyEvent &event) event.GetKeyCode(), 1); #endif event.Skip(); +printf("EED wxVTKRenderWindowInteractor::OnKeyUp End\n"); } #endif //!(VTK_MAJOR_VERSION == 3 && VTK_MINOR_VERSION == 1) //--------------------------------------------------------------------------- void wxVTKRenderWindowInteractor::OnChar(wxKeyEvent &event) { +printf("EED wxVTKRenderWindowInteractor::OnKeyUp Start\n"); if (!Enabled) { return; @@ -800,10 +808,12 @@ void wxVTKRenderWindowInteractor::OnChar(wxKeyEvent &event) InvokeEvent(vtkCommand::CharEvent, NULL); #endif event.Skip(); +printf("EED wxVTKRenderWindowInteractor::OnKeyUp End\n"); } //--------------------------------------------------------------------------- void wxVTKRenderWindowInteractor::OnButtonDown(wxMouseEvent &event) { +printf("EED wxVTKRenderWindowInteractor::OnButtonDown Start\n"); if (!Enabled || (ActiveButton != wxEVT_NULL)) { return; @@ -862,10 +872,12 @@ void wxVTKRenderWindowInteractor::OnButtonDown(wxMouseEvent &event) { CaptureMouse(); } +printf("EED wxVTKRenderWindowInteractor::OnButtonDown End\n"); } //--------------------------------------------------------------------------- void wxVTKRenderWindowInteractor::OnButtonUp(wxMouseEvent &event) { +printf("EED wxVTKRenderWindowInteractor::OnButtonDown Start\n"); //EVT_xxx_DOWN == EVT_xxx_UP - 1 //This is only needed if two mouse buttons are pressed at the same time. //In wxWindows 2.4 and later: better use of wxMOUSE_BTN_RIGHT or @@ -922,10 +934,12 @@ void wxVTKRenderWindowInteractor::OnButtonUp(wxMouseEvent &event) ReleaseMouse(); } ActiveButton = wxEVT_NULL; +printf("EED wxVTKRenderWindowInteractor::OnButtonDown End\n"); } //--------------------------------------------------------------------------- void wxVTKRenderWindowInteractor::OnMouseWheel(wxMouseEvent& event) { +printf("EED wxVTKRenderWindowInteractor::OnMouseWheel Start\n"); // Mouse wheel was only added after VTK 4.4 (I think...) #if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 4) // new style @@ -944,7 +958,8 @@ void wxVTKRenderWindowInteractor::OnMouseWheel(wxMouseEvent& event) InvokeEvent(vtkCommand::MouseWheelBackwardEvent, NULL); } #endif - + printf("EED wxVTKRenderWindowInteractor::OnMouseWheel End\n"); + } //--------------------------------------------------------------------------- @@ -967,6 +982,7 @@ void wxVTKRenderWindowInteractor::OnMouseCaptureLost(wxMouseCaptureLostEvent& ev //--------------------------------------------------------------------------- void wxVTKRenderWindowInteractor::Render() { +printf("EED wxVTKRenderWindowInteractor::Render Start\n"); #if wxCHECK_VERSION(2, 8, 0) int renderAllowed = !IsFrozen(); #else @@ -983,7 +999,7 @@ void wxVTKRenderWindowInteractor::Render() //if it's not enabeld, renderAllowed will be false renderAllowed = topParent->IsEnabled(); } - } + } // if renderAllowed && !RenderWhenDisabled if (renderAllowed) { @@ -1006,8 +1022,8 @@ void wxVTKRenderWindowInteractor::Render() RenderWindow->Render(); } #endif - - } + } // if renderAllowed +printf("EED wxVTKRenderWindowInteractor::Render Start\n"); } //--------------------------------------------------------------------------- void wxVTKRenderWindowInteractor::SetRenderWhenDisabled(int newValue) -- 2.45.1