X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreawxVTKRenderWindowInteractor.mm;h=33f4e84002409d8f58ae5eb0f438765da9699652;hb=f19db1f9b569fa0b965cb79728b153510ad6f92b;hp=4f63d149db47ddebd16e61c7adf75752cad4cd24;hpb=a47e92c81210557bc19441faef4afd1cf28a84d3;p=crea.git diff --git a/src/creawxVTKRenderWindowInteractor.mm b/src/creawxVTKRenderWindowInteractor.mm index 4f63d14..33f4e84 100644 --- a/src/creawxVTKRenderWindowInteractor.mm +++ b/src/creawxVTKRenderWindowInteractor.mm @@ -53,6 +53,7 @@ # include "vtkVersion.h" #endif + #if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0) # include "vtkCommand.h" #else @@ -81,8 +82,7 @@ #ifdef VTK_USE_TDX -// #import "vtkTDxMacDevice.h" -#import "/Users/davila/Creatis/C11/tpli/include/vtk-8.2/vtkTDxMacDevice.h" +#import "vtkTDxMacDevice.h" #endif @@ -107,12 +107,16 @@ wxWindow* wxGetTopLevelParent(wxWindow *win) // To access objc calls on cocoa #ifdef __WXCOCOA__ -#ifdef VTK_USE_COCOA -// This trick is no longer need in VTK CVS, should get rid of that: + #define id Id -#else -#error Build mismatch you need both wxWidgets and VTK to be configure against Cocoa to work -#endif //VTK_USE_COCOA + +// #ifdef VTK_USE_COCOA +// // This trick is no longer need in VTK CVS, should get rid of that: +// #define id Id +// #else +// #error Build mismatch you need both wxWidgets and VTK to be configure against Cocoa to work +// #endif //VTK_USE_COCOA + #endif //__WXCOCOA__ #if wxMAJOR_VERSION <= 2 @@ -266,6 +270,7 @@ wxVTKRenderWindowInteractor::wxVTKRenderWindowInteractor() , RenderWhenDisabled(1) , UseCaptureMouse(0) { + #ifdef VTK_DEBUG_LEAKS vtkDebugLeaks::ConstructClass("wxVTKRenderWindowInteractor"); #endif @@ -280,7 +285,6 @@ wxVTKRenderWindowInteractor::wxVTKRenderWindowInteractor() this->Device=vtkTDxMacDevice::New(); #endif - } //--------------------------------------------------------------------------- wxVTKRenderWindowInteractor::wxVTKRenderWindowInteractor(wxWindow *parent, @@ -307,6 +311,7 @@ wxVTKRenderWindowInteractor::wxVTKRenderWindowInteractor(wxWindow *parent, , RenderWhenDisabled(1) , UseCaptureMouse(0) { + #ifdef VTK_DEBUG_LEAKS vtkDebugLeaks::ConstructClass("wxVTKRenderWindowInteractor"); #endif @@ -327,8 +332,8 @@ wxVTKRenderWindowInteractor::wxVTKRenderWindowInteractor(wxWindow *parent, this->Device=vtkTDxMacDevice::New(); #endif - } + //--------------------------------------------------------------------------- wxVTKRenderWindowInteractor::~wxVTKRenderWindowInteractor() { @@ -341,14 +346,15 @@ wxVTKRenderWindowInteractor::~wxVTKRenderWindowInteractor() #ifdef VTK_USE_TDX this->Device->Delete(); #endif - } + //--------------------------------------------------------------------------- wxVTKRenderWindowInteractor * wxVTKRenderWindowInteractor::New() { // we don't make use of the objectfactory, because we're not registered return new wxVTKRenderWindowInteractor; } + //--------------------------------------------------------------------------- void wxVTKRenderWindowInteractor::Initialize() { @@ -356,13 +362,11 @@ void wxVTKRenderWindowInteractor::Initialize() // enable everything and start rendering Enable(); //RenderWindow->Start(); - // set the size in the render window interactor Size[0] = size[0]; Size[1] = size[1]; - // this is initialized - Initialized = 1; + Initialized = 1; } //--------------------------------------------------------------------------- void wxVTKRenderWindowInteractor::Enable() @@ -386,14 +390,12 @@ void wxVTKRenderWindowInteractor::Enable() } #endif - - Modified(); + } //--------------------------------------------------------------------------- bool wxVTKRenderWindowInteractor::Enable(bool enable) { - #ifdef VTK_USE_TDX if(this->UseTDx) { @@ -402,8 +404,6 @@ bool wxVTKRenderWindowInteractor::Enable(bool enable) } #endif - - #if defined(__WXGTK__) && defined(USE_WXGLCANVAS) return wxGLCanvas::Enable(enable); #else @@ -415,8 +415,9 @@ void wxVTKRenderWindowInteractor::Disable() { // if already disabled then done if (!Enabled) + { return; - + } #ifdef VTK_USE_TDX if(this->Device->GetInitialized()) { @@ -439,7 +440,6 @@ 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 @@ -451,9 +451,9 @@ void wxVTKRenderWindowInteractor::UpdateSize(int x, int y) // and our RenderWindow's size #ifdef __WXCOCOA__ - #ifdef VTK_USE_COCOA - #else - #endif //VTK_USE_COCOA +// #ifdef VTK_USE_COCOA +// #else +// #endif //VTK_USE_COCOA #else RenderWindow->SetSize(x, y); #endif //__WXCOCOA__ @@ -463,26 +463,27 @@ 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)) { // it's a one shot timer if (!timer.Start(10, TRUE)) + { return 0; - + } return 1; - } + #if VTK_MAJOR_VERSION > 5 || (VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION >= 2) //------------------------------------------------------------------ int wxVTKRenderWindowInteractor::InternalCreateTimer(int timerId, int timerType, unsigned long duration) { if (!timer.Start(duration, timerType == OneShotTimer)) + { return 0; - + } return ID_wxVTKRenderWindowInteractor_TIMER; } //------------------------------------------------------------------ @@ -492,12 +493,14 @@ int wxVTKRenderWindowInteractor::InternalDestroyTimer(int platformTimerId) return 1; } #endif + //--------------------------------------------------------------------------- int wxVTKRenderWindowInteractor::DestroyTimer() { // do nothing return 1; } + //--------------------------------------------------------------------------- void wxVTKRenderWindowInteractor::OnTimer(wxTimerEvent& WXUNUSED(event)) { @@ -567,8 +570,6 @@ long wxVTKRenderWindowInteractor::GetHandleHack() //--------------------------------------------------------------------------- void wxVTKRenderWindowInteractor::OnPaint(wxPaintEvent& WXUNUSED(event)) { -printf("EED wxVTKRenderWindowInteractor::OnPaint Start\n"); - //must always be here //EED2021-08-26 #ifdef __WXCOCOA__ @@ -634,7 +635,6 @@ printf("EED wxVTKRenderWindowInteractor::OnPaint Start\n"); #endif #endif -printf("EED wxVTKRenderWindowInteractor::OnPaint End\n"); } //--------------------------------------------------------------------------- void wxVTKRenderWindowInteractor::OnEraseBackground(wxEraseEvent &event) @@ -721,7 +721,7 @@ void wxVTKRenderWindowInteractor::OnLeave(wxMouseEvent &event) //--------------------------------------------------------------------------- void wxVTKRenderWindowInteractor::OnKeyDown(wxKeyEvent &event) { - if (!Enabled) + if (!Enabled) { return; } @@ -751,7 +751,6 @@ void wxVTKRenderWindowInteractor::OnKeyDown(wxKeyEvent &event) //--------------------------------------------------------------------------- void wxVTKRenderWindowInteractor::OnKeyUp(wxKeyEvent &event) { -printf("EED wxVTKRenderWindowInteractor::OnKeyUp Start\n"); if (!Enabled) { return; @@ -778,14 +777,12 @@ printf("EED wxVTKRenderWindowInteractor::OnKeyUp Start\n"); 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) + if (!Enabled) { return; } @@ -808,12 +805,10 @@ printf("EED wxVTKRenderWindowInteractor::OnKeyUp Start\n"); 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; @@ -872,12 +867,10 @@ printf("EED wxVTKRenderWindowInteractor::OnButtonDown Start\n"); { 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 @@ -934,12 +927,10 @@ printf("EED wxVTKRenderWindowInteractor::OnButtonDown Start\n"); 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 @@ -958,7 +949,6 @@ printf("EED wxVTKRenderWindowInteractor::OnMouseWheel Start\n"); InvokeEvent(vtkCommand::MouseWheelBackwardEvent, NULL); } #endif - printf("EED wxVTKRenderWindowInteractor::OnMouseWheel End\n"); } @@ -982,7 +972,6 @@ void wxVTKRenderWindowInteractor::OnMouseCaptureLost(wxMouseCaptureLostEvent& ev //--------------------------------------------------------------------------- void wxVTKRenderWindowInteractor::Render() { -printf("EED wxVTKRenderWindowInteractor::Render Start\n"); #if wxCHECK_VERSION(2, 8, 0) int renderAllowed = !IsFrozen(); #else @@ -1023,7 +1012,6 @@ printf("EED wxVTKRenderWindowInteractor::Render Start\n"); } #endif } // if renderAllowed -printf("EED wxVTKRenderWindowInteractor::Render Start\n"); } //--------------------------------------------------------------------------- void wxVTKRenderWindowInteractor::SetRenderWhenDisabled(int newValue)