From: Eduardo DAVILA Date: Mon, 2 Oct 2017 15:15:17 +0000 (+0200) Subject: #3128 creaMaracasVisu Feature New Normal - branch changeWx28to30 compilation with... X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=refs%2Fheads%2FchangeWx28to30;p=creaMaracasVisu.git #3128 creaMaracasVisu Feature New Normal - branch changeWx28to30 compilation with wxWidgets3 --- diff --git a/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.h b/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.h index 8855302..674bde4 100644 --- a/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.h +++ b/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.h @@ -65,7 +65,7 @@ PURPOSE. See the above copyright notice for more information. #include "CutModelPolygon.h" #include "vtkInteractorStyleTrackballCamera.h" #include "vtkInteractorStyleCutter.h" -#include "wxVTKRenderWindowInteractor.h" +#include "creawxVTKRenderWindowInteractor.h" #include "vtkImplicitSelectionLoop.h" #include "vtkPolyDataMapper.h" #include "vtkSampleFunction.h" diff --git a/lib/maracasVisuLib/src/interface/wxWindows/CMakeLists.txt b/lib/maracasVisuLib/src/interface/wxWindows/CMakeLists.txt index 23449a7..fb4cbf4 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/CMakeLists.txt +++ b/lib/maracasVisuLib/src/interface/wxWindows/CMakeLists.txt @@ -85,8 +85,8 @@ SET(MARACAS_LIB_SRCS - widgets/wxVTKRenderWindowInteractor.cxx - widgets/wxVTKRenderWindowInteractor.h +## widgets/wxVTKRenderWindowInteractor.cxx +## widgets/wxVTKRenderWindowInteractor.h widgets/wxVTKRenderWindowInteractorEditContour.cxx widgets/wxVTKRenderWindowInteractorEditContour.h widgets/vtk3DSurfaceWidget.cxx @@ -177,8 +177,8 @@ SET(MARACAS_LIB_SRCS_02 wxMaracasHelpDialog.h wxMaracasQuantification.cxx wxMaracasQuantification.h - widgets/wxVTKRenderWindowInteractor.cxx - widgets/wxVTKRenderWindowInteractor.h +## widgets/wxVTKRenderWindowInteractor.cxx +## widgets/wxVTKRenderWindowInteractor.h widgets/wxVTKRenderWindowInteractorEditContour.cxx widgets/wxVTKRenderWindowInteractorEditContour.h widgets/vtk3DSurfaceWidget.cxx diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx index f625d57..2549d14 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx @@ -32,7 +32,7 @@ #include "wxMPRBaseData.h" #include "wxVtk2DBaseView.h" -#include "wxVTKRenderWindowInteractor.h" +#include "creawxVTKRenderWindowInteractor.h" #include "vtkTextProperty.h" diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/include/wxImageViewerWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/include/wxImageViewerWidget.cxx index ea2808b..932e1c7 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/include/wxImageViewerWidget.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/include/wxImageViewerWidget.cxx @@ -113,7 +113,7 @@ void wxVtk2DView_TMP::Configure() // virtual interactorstylebaseview = vtkInteractorStyleBaseView2D::New(); SetInteractorStyleBaseView(interactorstylebaseview); - wxVTKRenderWindowInteractor *iren = GetWxVTKRenderWindowInteractor(); + crea::wxVTKRenderWindowInteractor *iren = GetWxVTKRenderWindowInteractor(); interactorstylebaseview->SetInteractor ( iren ); iren->SetInteractorStyle(interactorstylebaseview); interactorstylebaseview->SetwxVtkBaseView(this); @@ -124,7 +124,7 @@ void wxVtk2DView_TMP::SetWxVTKRenderWindowInteractor( wxVTKRenderWindowInteracto _wxVTKiren = wxVTKiren; } //---------------------------------------------------------------------------- -wxVTKRenderWindowInteractor *wxVtk2DView_TMP::GetWxVTKRenderWindowInteractor() // virtual +crea::wxVTKRenderWindowInteractor *wxVtk2DView_TMP::GetWxVTKRenderWindowInteractor() // virtual { return _wxVTKiren; } @@ -526,9 +526,10 @@ void wxImageViewerWidgetRoi::ExecuteEvent(vtkObject *wdg, unsigned long event, v _pts->SetPoint(2, XX , YY , p0[2]); _pts->SetPoint(3, p0[0] , YY , p0[2]); _imageViewer->Render(); - } + } // if } - if ( event == vtkCommand::LeftButtonReleaseEvent ){ + if ( event == vtkCommand::LeftButtonReleaseEvent ) + { _bboxEnabled = false; //EED} else if ( event == vtkCommand::MouseWheelForwardEvent ){ } else if ( event == wxEVT_MOUSEWHEEL+10000 ){ @@ -545,7 +546,7 @@ void wxImageViewerWidgetRoi::ExecuteEvent(vtkObject *wdg, unsigned long event, v } else { //neither ctrl nor shift has been pressed: slice += 5; - } + } // if slice = slice > min ? slice : min; slice = slice < max ? slice : max; @@ -571,7 +572,8 @@ void wxImageViewerWidgetRoi::ExecuteEvent(vtkObject *wdg, unsigned long event, v } else if ( event == wxEVT_MOUSEWHEEL+10001 ){ // _sliceEnabled = false; - if( _wxVTKiren->GetControlKey () ){ + if( _wxVTKiren->GetControlKey () ) + { slice -= 10; } else if( _wxVTKiren->GetShiftKey () ) { slice--; @@ -579,35 +581,33 @@ void wxImageViewerWidgetRoi::ExecuteEvent(vtkObject *wdg, unsigned long event, v //neither ctrl nor shift has been pressed: slice -= 5; slice = (slice /5) * 5; - } + } // if slice = slice > min ? slice : min; slice = slice < max ? slice : max; - #if (VTK_MAJOR_VERSION >= 5) _imageViewer->SetSlice( slice ); #else _imageViewer->SetZSlice( slice ); #endif - //This is not nedeed any more since vtkImageViewer2.cxx -r1.9 //imageViewer->GetRenderer()->ResetCameraClippingRange(); wxMouseEvent mouseEvent; mouseEvent.m_wheelRotation=-130; - if (_intVtkPanWid!=NULL) { + if (_intVtkPanWid!=NULL) + { _intVtkPanWid->CallBackOnMouseWheel(mouseEvent); - } + } // if _imageViewer->Render(); - } - } -//---------------------------------------------------------------------------- -void wxImageViewerWidgetRoi::ConstructVTK(vtkImageData *imageData){ +//---------------------------------------------------------------------------- +void wxImageViewerWidgetRoi::ConstructVTK(vtkImageData *imageData) +{ wxImageViewerWidget::ConstructVTK(imageData); _interactorStyle2DMaracas->SetObserver(_Observer); @@ -619,7 +619,6 @@ void wxImageViewerWidgetRoi::ConstructVTK(vtkImageData *imageData){ _pts->SetPoint(2, 1000 , 1000 , 1000 ); _pts->SetPoint(3, -1000 , 1000 , 0 ); - vtkCellArray *lines = vtkCellArray::New(); lines->InsertNextCell(5); lines->InsertCellPoint(0); @@ -633,7 +632,6 @@ void wxImageViewerWidgetRoi::ConstructVTK(vtkImageData *imageData){ _pd->SetLines( lines ); lines->Delete(); //do not delete lines ?? - _bboxActor = vtkActor::New(); _bboxMapper = vtkPolyDataMapper::New(); @@ -650,6 +648,7 @@ void wxImageViewerWidgetRoi::ConstructVTK(vtkImageData *imageData){ } //---------------------------------------------------------------------------- -bool wxImageViewerWidgetRoi::GetRoiSelected(){ +bool wxImageViewerWidgetRoi::GetRoiSelected() +{ return _RoiSelected; } diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/include/wxImageViewerWidget.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/include/wxImageViewerWidget.h index abcaa02..10d1bcb 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/include/wxImageViewerWidget.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/include/wxImageViewerWidget.h @@ -66,11 +66,11 @@ class wxVtk2DView_TMP : public wxVtkBaseView{ public: wxVtk2DView_TMP(vtkImageViewer2 *imageviewer2); ~wxVtk2DView_TMP(); - virtual vtkRenderer *GetRenderer(); - virtual vtkRenderWindow *GetRenWin(); - virtual void Configure(); - void SetWxVTKRenderWindowInteractor( wxVTKRenderWindowInteractor *wxVTKiren); - virtual wxVTKRenderWindowInteractor *GetWxVTKRenderWindowInteractor(); + virtual vtkRenderer *GetRenderer(); + virtual vtkRenderWindow *GetRenWin(); + virtual void Configure(); + void SetWxVTKRenderWindowInteractor( wxVTKRenderWindowInteractor *wxVTKiren); + virtual crea::wxVTKRenderWindowInteractor *GetWxVTKRenderWindowInteractor(); private: wxVTKRenderWindowInteractor *_wxVTKiren; diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualBaseModel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualBaseModel.h index a82afc9..5815971 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualBaseModel.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualBaseModel.h @@ -42,7 +42,7 @@ #include #include -#include "wxVTKRenderWindowInteractor.h" +#include "creawxVTKRenderWindowInteractor.h" #include #include "wxVtkBaseView.h" diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContour3DControler.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContour3DControler.cpp index 8bf0411..2682cae 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContour3DControler.cpp +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContour3DControler.cpp @@ -58,7 +58,7 @@ void manualContour3DControler::CopyAttributesTo( manualContour3DControler * clon bool manualContour3DControler::OnLeftButtonDown() { int X,Y; - wxVTKRenderWindowInteractor *wxVTKiren; + crea::wxVTKRenderWindowInteractor *wxVTKiren; wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor(); wxVTKiren->GetEventPosition(X,Y); MouseClickLeft(X,Y); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.cpp index 4475960..5b561fb 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.cpp +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.cpp @@ -87,7 +87,7 @@ bool manualContourBaseControler::OnChar() char keyCode = _vtkInteractorStyleBaseView->GetInteractor()-> GetKeyCode(); int X,Y; - wxVTKRenderWindowInteractor *_wxVTKiren; + crea::wxVTKRenderWindowInteractor *_wxVTKiren; _wxVTKiren= _vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->GetWxVTKRenderWindowInteractor(); _wxVTKiren->GetEventPosition(X, Y); //int Z = GetZ(); // JPRx @@ -169,7 +169,7 @@ bool manualContourBaseControler::OnMouseMove() if ( _vtkInteractorStyleBaseView!=NULL) { int X,Y; - wxVTKRenderWindowInteractor *_wxVTKiren; + crea::wxVTKRenderWindowInteractor *_wxVTKiren; _wxVTKiren= _vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->GetWxVTKRenderWindowInteractor(); _wxVTKiren->GetEventPosition( X , Y ); @@ -187,7 +187,7 @@ bool manualContourBaseControler::OnLeftButtonDown() if ( _vtkInteractorStyleBaseView!=NULL ) { int X,Y; - wxVTKRenderWindowInteractor *wxVTKiren; + crea::wxVTKRenderWindowInteractor *wxVTKiren; wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->GetWxVTKRenderWindowInteractor(); wxVTKiren->GetEventPosition(X,Y); @@ -201,7 +201,7 @@ bool manualContourBaseControler::OnLeftButtonUp() if ( _vtkInteractorStyleBaseView!=NULL ) { int X,Y; - wxVTKRenderWindowInteractor *wxVTKiren; + crea::wxVTKRenderWindowInteractor *wxVTKiren; wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->GetWxVTKRenderWindowInteractor(); wxVTKiren->GetEventPosition(X,Y); MouseReleaseLeft(X,Y); @@ -214,7 +214,7 @@ bool manualContourBaseControler::OnLeftDClick() if ( _vtkInteractorStyleBaseView!=NULL ) { int X,Y; - wxVTKRenderWindowInteractor *wxVTKiren; + crea::wxVTKRenderWindowInteractor *wxVTKiren; wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->GetWxVTKRenderWindowInteractor(); wxVTKiren->GetEventPosition(X,Y); @@ -229,7 +229,7 @@ bool manualContourBaseControler::OnMiddleButtonDown() if ( _vtkInteractorStyleBaseView!=NULL ) { int X,Y; - wxVTKRenderWindowInteractor *wxVTKiren; + crea::wxVTKRenderWindowInteractor *wxVTKiren; wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->GetWxVTKRenderWindowInteractor(); wxVTKiren->GetEventPosition(X,Y); GetManualViewBaseContour()->InitMove( X, Y,GetZ()); @@ -247,7 +247,7 @@ bool manualContourBaseControler::OnRightButtonDown() if( _vtkInteractorStyleBaseView!= NULL ) { int X,Y; - wxVTKRenderWindowInteractor *wxVTKiren; + crea::wxVTKRenderWindowInteractor *wxVTKiren; wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->GetWxVTKRenderWindowInteractor(); wxVTKiren->GetEventPosition(X, Y); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.h index fedb9de..8020cc4 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.h @@ -61,7 +61,7 @@ //#include "widgets/InteractorStyleMaracas.h" #include "InteractorStyleMaracas.h" -#include "wxVTKRenderWindowInteractor.h" +#include "creawxVTKRenderWindowInteractor.h" //-- diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.h index d021a32..2beb5ae 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourModel.h @@ -46,7 +46,7 @@ #include #include -#include "wxVTKRenderWindowInteractor.h" +#include "creawxVTKRenderWindowInteractor.h" //-- diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.h index 2a8a758..800e47b 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.h @@ -57,7 +57,7 @@ #include #include -#include "wxVTKRenderWindowInteractor.h" +#include "creawxVTKRenderWindowInteractor.h" //-- diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewPoint.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewPoint.h index e0a8f82..84e2b95 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewPoint.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewPoint.h @@ -44,7 +44,7 @@ #include #include -#include "wxVTKRenderWindowInteractor.h" +#include "creawxVTKRenderWindowInteractor.h" #include #include "wxVtkBaseView.h" diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualInteractorWindowLevel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualInteractorWindowLevel.cxx index f058df7..9e09456 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualInteractorWindowLevel.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualInteractorWindowLevel.cxx @@ -52,7 +52,7 @@ bool manualInteractorWindowLevel::OnMouseMove() // virtual if (_stateWindowLevel==true) { int tmpPx,tmpPy; - wxVTKRenderWindowInteractor *wxVTKiren; + crea::wxVTKRenderWindowInteractor *wxVTKiren; wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->GetWxVTKRenderWindowInteractor(); wxVTKiren->GetEventPosition( tmpPx , tmpPy ); @@ -127,7 +127,7 @@ bool manualInteractorWindowLevel::OnMiddleButtonDown() // virtual if ((_vtkInteractorStyleBaseView->GetInteractor()->GetControlKey()==0) && (_vtkInteractorStyleBaseView->GetInteractor()->GetShiftKey()==0) ){ _stateWindowLevel = true; - wxVTKRenderWindowInteractor *wxVTKiren; + crea::wxVTKRenderWindowInteractor *wxVTKiren; wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->GetWxVTKRenderWindowInteractor(); wxVTKiren->GetEventPosition( _backPx , _backPy ); _backWindow = ((wxVtk2DBaseView*)_vtkInteractorStyleBaseView->GetWxVtk2DBaseView())->_imageViewer2XYZ->GetVtkImageViewer2()->GetColorWindow(); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/vtkInteractorManualPaint.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/vtkInteractorManualPaint.cpp index b6af3ea..ae4e8b9 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/vtkInteractorManualPaint.cpp +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/vtkInteractorManualPaint.cpp @@ -26,30 +26,35 @@ #include "vtkInteractorManualPaint.h" #include "wxVtk2DBaseView.h" -#include "wxVTKRenderWindowInteractor.h" +#include "creawxVTKRenderWindowInteractor.h" -vtkInteractorManualPaint::vtkInteractorManualPaint(ManualPaintControler* mpc) { - _manualPaintControler = mpc; - _state = false; - _stateKey = false; - _stateMouse = false; +vtkInteractorManualPaint::vtkInteractorManualPaint(ManualPaintControler* mpc) +{ + _manualPaintControler = mpc; + _state = false; + _stateKey = false; + _stateMouse = false; } //--------------------------------------------------------------------------- -vtkInteractorManualPaint::~vtkInteractorManualPaint() { +vtkInteractorManualPaint::~vtkInteractorManualPaint() +{ } //--------------------------------------------------------------------------- -bool vtkInteractorManualPaint::OnChar() { +bool vtkInteractorManualPaint::OnChar() +{ vtkRenderWindowInteractor *interactor = _vtkInteractorStyleBaseView->GetInteractor(); - if (interactor->GetKeyCode() == 97) { + if (interactor->GetKeyCode() == 97) + { _stateKey = !_stateKey; } return true; } //--------------------------------------------------------------------------- -bool vtkInteractorManualPaint::OnLeftButtonDown() { +bool vtkInteractorManualPaint::OnLeftButtonDown() +{ vtkRenderWindowInteractor *interactor = _vtkInteractorStyleBaseView->GetInteractor(); if (interactor->GetControlKey() == 1) { @@ -61,9 +66,12 @@ bool vtkInteractorManualPaint::OnLeftButtonDown() { } //--------------------------------------------------------------------------- -bool vtkInteractorManualPaint::OnLeftButtonUp() { +bool vtkInteractorManualPaint::OnLeftButtonUp() +{ if((_state == true) || (_stateKey == true)) + { _manualPaintControler->SetImageUndo(); + } _state = false; return true; } @@ -75,7 +83,7 @@ bool vtkInteractorManualPaint::OnMouseMove() { wxVtk2DBaseView *wxvtk2Dbaseview = (wxVtk2DBaseView*) _vtkInteractorStyleBaseView->GetWxVtk2DBaseView(); - wxVTKRenderWindowInteractor *wxVTKiren = + crea::wxVTKRenderWindowInteractor *wxVTKiren = wxvtk2Dbaseview->GetWxVTKRenderWindowInteractor(); int px, py; wxVTKiren->GetEventPosition(px, py); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramWidget.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramWidget.h index cd5cc1a..e55575c 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramWidget.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramWidget.h @@ -185,9 +185,9 @@ private: pHistogram* histogram; pPlotter* plotter; - int idTransferenceFunction; - int histogramSize; - int idHistogram; + int idTransferenceFunction; + int histogramSize; + int idHistogram; /* if the image has already a transference function and color defines to that function diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInfoTextImageInteractor.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInfoTextImageInteractor.cxx index 2bb224a..41026ca 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInfoTextImageInteractor.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInfoTextImageInteractor.cxx @@ -51,7 +51,7 @@ void vtkInfoTextImageInteractor::SetModelVtkInfoTextImage(vtkInfoTextImage *vtki bool vtkInfoTextImageInteractor::OnMouseMove() { int X,Y; - wxVTKRenderWindowInteractor *wxVTKiren; + crea::wxVTKRenderWindowInteractor *wxVTKiren; wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->GetWxVTKRenderWindowInteractor(); wxVTKiren->GetEventPosition(X,Y); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInfoTextImageInteractorPlane2D.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInfoTextImageInteractorPlane2D.cxx index a6339c1..479c30c 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInfoTextImageInteractorPlane2D.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInfoTextImageInteractorPlane2D.cxx @@ -39,7 +39,7 @@ vtkInfoTextImageInteractorPlane2D::~vtkInfoTextImageInteractorPlane2D() bool vtkInfoTextImageInteractorPlane2D::OnMouseMove() { int X,Y; - wxVTKRenderWindowInteractor *wxVTKiren; + crea::wxVTKRenderWindowInteractor *wxVTKiren; wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk2DBaseView()->GetWxVTKRenderWindowInteractor(); wxVTKiren->GetEventPosition(X,Y); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkPlane2DView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkPlane2DView.cxx index 1016dd4..3e4c1a1 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkPlane2DView.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkPlane2DView.cxx @@ -341,7 +341,7 @@ void vtkPlane2DView::Configure( ) _stPoints = vtkStructuredPoints::New( ); _change = vtkImageChangeInformation::New(); - wxVTKRenderWindowInteractor *iren = GetWxVTKRenderWindowInteractor(); + crea::wxVTKRenderWindowInteractor *iren = GetWxVTKRenderWindowInteractor(); ExtractPlane(); // SetActive(false); _imageViewer2XYZ -> GetVtkImageViewer2() -> SetupInteractor ( iren ); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx index 99fad9d..bb9d79a 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.cxx @@ -81,7 +81,7 @@ #include "wxMPRWidget.h" -#include "wxVTKRenderWindowInteractor.h" +#include "creawxVTKRenderWindowInteractor.h" #include "UtilVtk3DGeometriSelection.h" #include "../kernel/marDicomBase.h" @@ -510,17 +510,17 @@ wxPanel* wxMPRWidget::CreateMPRPanel4View(wxWindow *parent, vtkMPRBaseData *vtkm // view 0 _vtkmpr2Dview[0] = new wxVtkMPR2DView(panel,0); _vtkmpr2Dview[0]->SetVtkBaseData(vtkmprbasedata); - wxVTKRenderWindowInteractor *iren0 = _vtkmpr2Dview[0]->GetWxVTKRenderWindowInteractor(); + crea::wxVTKRenderWindowInteractor *iren0 = _vtkmpr2Dview[0]->GetWxVTKRenderWindowInteractor(); // view 1 _vtkmpr2Dview[1] = new wxVtkMPR2DView(panel,1); _vtkmpr2Dview[1]->SetVtkBaseData(vtkmprbasedata); - wxVTKRenderWindowInteractor *iren1 = _vtkmpr2Dview[1]->GetWxVTKRenderWindowInteractor(); + crea::wxVTKRenderWindowInteractor *iren1 = _vtkmpr2Dview[1]->GetWxVTKRenderWindowInteractor(); // view 2 _vtkmpr2Dview[2] = new wxVtkMPR2DView(panel,2); _vtkmpr2Dview[2]->SetVtkBaseData(vtkmprbasedata); - wxVTKRenderWindowInteractor *iren2 = _vtkmpr2Dview[2]->GetWxVTKRenderWindowInteractor(); + crea::wxVTKRenderWindowInteractor *iren2 = _vtkmpr2Dview[2]->GetWxVTKRenderWindowInteractor(); // view 3 wxNotebook *notebook = new wxNotebook( panel, -1 ); @@ -539,7 +539,7 @@ wxPanel* wxMPRWidget::CreateMPRPanel4View(wxWindow *parent, vtkMPRBaseData *vtkm // EED // _wxsphereview = new wxSphereView( notebook , vtkmprbasedata, vtkmprbasedata->GetImageData()); _wxsphereview = new wxSphereView( notebook , vtkmprbasedata ); - wxVTKRenderWindowInteractor *iren3B = _wxsphereview->GetWxVTKRenderWindowInteractor(); + crea::wxVTKRenderWindowInteractor *iren3B = _wxsphereview->GetWxVTKRenderWindowInteractor(); notebook->AddPage( iren3B, _T("Sphere") ); // view 3.2 @@ -560,21 +560,16 @@ wxPanel* wxMPRWidget::CreateMPRPanel4View(wxWindow *parent, vtkMPRBaseData *vtkm _wxvtkclipping3Dview->SetVtkClipping3DDataViewer(vtkclipping3Ddataviewer); - wxWindow *window3D = _wxvtk3Dbaseview_MPRClipping3D->GetWxVTKRenderWindowInteractor(); - + wxWindow *window3D = _wxvtk3Dbaseview_MPRClipping3D->GetWxVTKRenderWindowInteractor(); wxPanel *panelControl = new wxPanel(panelMPR3D,-1); wxPanel *controlPanelMPR3D = _wxvtkmpr3Dview->CreateControlPanel(panelControl, false); wxPanel *controlPanelClipping3D = _wxvtkclipping3Dview->CreateSurfControlPanel(panelControl); - - - // wxBoxSizer *sizerCtrol = new wxBoxSizer(wxVERTICAL); wxFlexGridSizer *sizerCtrol = new wxFlexGridSizer(1); sizerCtrol->Add(controlPanelMPR3D , 1, wxALL|wxEXPAND, 2); sizerCtrol->Add(controlPanelClipping3D , 1, wxALL|wxEXPAND, 2); - panelControl->SetAutoLayout(true); panelControl->SetSizer(sizerCtrol); panelControl->SetSize(400,150); @@ -585,12 +580,8 @@ wxPanel* wxMPRWidget::CreateMPRPanel4View(wxWindow *parent, vtkMPRBaseData *vtkm //RaC Nov2012 Correctly resize internal panels with the window resize event panelMPR3D->SetSashGravity(0.5); panelMPR3D -> SplitHorizontally( panelControl,window3D,200 ); - notebook->AddPage( panelMPR3D, _T("MPR 3D - Clipping") ); - - Connect(notebook->GetId() , wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED , (wxObjectEventFunction) &wxMPRWidget::OnPageBChanged ); - wxBoxSizer *sizerV = new wxBoxSizer(wxVERTICAL); wxBoxSizer *sizerH1= new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *sizerH2= new wxBoxSizer(wxHORIZONTAL); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxSTLWidget_03.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxSTLWidget_03.h index 1e0b936..8b1af9a 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxSTLWidget_03.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxSTLWidget_03.h @@ -40,7 +40,7 @@ #include #include -#include "wxVTKRenderWindowInteractor.h" +#include "creawxVTKRenderWindowInteractor.h" //#include "wxSurfaceWidget.h" #include "wxVtkBaseView.h" diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractor.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractor.cxx deleted file mode 100644 index e7aa85e..0000000 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractor.cxx +++ /dev/null @@ -1,821 +0,0 @@ -/*# --------------------------------------------------------------------- -# -# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image -# pour la Sant�) -# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton -# Previous Authors : Laurent Guigues, Jean-Pierre Roux -# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil -# -# This software is governed by the CeCILL-B license under French law and -# abiding by the rules of distribution of free software. You can use, -# modify and/ or redistribute the software under the terms of the CeCILL-B -# license as circulated by CEA, CNRS and INRIA at the following URL -# http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html -# or in the file LICENSE.txt. -# -# As a counterpart to the access to the source code and rights to copy, -# modify and redistribute granted by the license, users are provided only -# with a limited warranty and the software's author, the holder of the -# economic rights, and the successive licensors have only limited -# liability. -# -# The fact that you are presently reading this means that you have had -# knowledge of the CeCILL-B license and that you accept its terms. -# ------------------------------------------------------------------------ */ - -/*========================================================================= - - Program: Visualization Toolkit - Module: $RCSfile: wxVTKRenderWindowInteractor.cxx,v $ - Language: C++ - Date: $Date: 2012/11/15 14:14:35 $ - Version: $Revision: 1.7 $ - - Copyright (c) 1993-2002 Ken Martin, Will Schroeder, Bill Lorensen - All rights reserved. - See Copyright.txt or http://www.kitware.com/Copyright.htm for details. - - This software is distributed WITHOUT ANY WARRANTY; without even - the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the above copyright notice for more information. - -=========================================================================*/ - -#include - -#include "wxVTKRenderWindowInteractor.h" - -//This is needed for vtk 3.1 : -#ifndef VTK_MAJOR_VERSION -# include "vtkVersion.h" -#endif - -#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0) -# include "vtkCommand.h" -#else -# include "vtkInteractorStyle.h" -#endif -#include "vtkDebugLeaks.h" - -#ifdef __WXMAC__ -#include "vtkCarbonRenderWindow.h" -#endif - -//Keep this for compatibilty reason, this was introduced in wxGTK 2.4.0 -#if (!wxCHECK_VERSION(2, 4, 0)) -wxWindow* wxGetTopLevelParent(wxWindow *win) -{ - while ( win && !win->IsTopLevel() ) - win = win->GetParent(); - return win; -} -#endif - -// To access objc calls on cocoa -#ifdef __WXCOCOA__ -#ifdef VTK_USE_COCOA -#import -// 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__ - - - -//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 -#if wxMAJOR_VERSION <= 2 - #ifdef __WXGTK__ - # include // GDK_WINDOW_XWINDOW is found here in wxWidgets 2.8.0 - # include "gdk/gdkprivate.h" - #if wxCHECK_VERSION(2, 8, 0) - #ifdef __WXGTK20__ - #include - #else - #include - #endif - #else - #include - #endif - #define GetXWindow(wxwin) (wxwin)->m_wxwindow ? \ - GDK_WINDOW_XWINDOW(GTK_PIZZA((wxwin)->m_wxwindow)->bin_window) : \ - GDK_WINDOW_XWINDOW((wxwin)->m_widget->window) - #endif -#else - #ifdef __WXGTK__ - #include - #include - #endif -#endif - - - - - -#ifdef __WXX11__ -#include "wx/x11/privx.h" -#define GetXWindow(wxwin) ((Window)(wxwin)->GetHandle()) -#endif - - -//For more info on this class please go to: -//http://wxvtk.sf.net -//This hack is for some buggy wxGTK version: -#if wxCHECK_VERSION(2, 3, 2) && !wxCHECK_VERSION(2, 4, 1) && defined(__WXGTK__) -# define WX_USE_X_CAPTURE 0 -#else -# define WX_USE_X_CAPTURE 1 -#endif - -#define ID_wxVTKRenderWindowInteractor_TIMER 1001 - -#if defined(__WXGTK__) && defined(USE_WXGLCANVAS) -IMPLEMENT_DYNAMIC_CLASS(wxVTKRenderWindowInteractor, wxGLCanvas) -#else -IMPLEMENT_DYNAMIC_CLASS(wxVTKRenderWindowInteractor, wxWindow) -#endif //__WXGTK__ - -//--------------------------------------------------------------------------- -#if defined(__WXGTK__) && defined(USE_WXGLCANVAS) -BEGIN_EVENT_TABLE(wxVTKRenderWindowInteractor, wxGLCanvas) -#else -BEGIN_EVENT_TABLE(wxVTKRenderWindowInteractor, wxWindow) -#endif //__WXGTK__ - //refresh window by doing a Render - EVT_PAINT (wxVTKRenderWindowInteractor::OnPaint) - EVT_ERASE_BACKGROUND(wxVTKRenderWindowInteractor::OnEraseBackground) - EVT_MOTION (wxVTKRenderWindowInteractor::OnMotion) - - //Bind the events to the event converters - EVT_LEFT_DOWN (wxVTKRenderWindowInteractor::OnButtonDown) - EVT_MIDDLE_DOWN (wxVTKRenderWindowInteractor::OnButtonDown) - EVT_RIGHT_DOWN (wxVTKRenderWindowInteractor::OnButtonDown) - EVT_LEFT_UP (wxVTKRenderWindowInteractor::OnButtonUp) - EVT_MIDDLE_UP (wxVTKRenderWindowInteractor::OnButtonUp) - EVT_RIGHT_UP (wxVTKRenderWindowInteractor::OnButtonUp) -#if !(VTK_MAJOR_VERSION == 3 && VTK_MINOR_VERSION == 1) - EVT_ENTER_WINDOW(wxVTKRenderWindowInteractor::OnEnter) - EVT_LEAVE_WINDOW(wxVTKRenderWindowInteractor::OnLeave) - EVT_MOUSEWHEEL (wxVTKRenderWindowInteractor::OnMouseWheel) - EVT_KEY_DOWN (wxVTKRenderWindowInteractor::OnKeyDown) - EVT_KEY_UP (wxVTKRenderWindowInteractor::OnKeyUp) - EVT_CHAR (wxVTKRenderWindowInteractor::OnChar) -#endif - EVT_TIMER (ID_wxVTKRenderWindowInteractor_TIMER, wxVTKRenderWindowInteractor::OnTimer) - EVT_SIZE (wxVTKRenderWindowInteractor::OnSize) -END_EVENT_TABLE() - -vtkCxxRevisionMacro(wxVTKRenderWindowInteractor, "$Revision: 1.7 $") -vtkInstantiatorNewMacro(wxVTKRenderWindowInteractor) - -//--------------------------------------------------------------------------- -#if defined(__WXGTK__) && defined(USE_WXGLCANVAS) -#if (wxCHECK_VERSION(2, 8, 0)) -wxVTKRenderWindowInteractor::wxVTKRenderWindowInteractor() : wxGLCanvas(0, -1, wxDefaultPosition), vtkRenderWindowInteractor() -#else -wxVTKRenderWindowInteractor::wxVTKRenderWindowInteractor() : wxGLCanvas(), vtkRenderWindowInteractor() -#endif -#else -wxVTKRenderWindowInteractor::wxVTKRenderWindowInteractor() : wxWindow(), vtkRenderWindowInteractor() -#endif //__WXGTK__ - , timer(this, ID_wxVTKRenderWindowInteractor_TIMER) - , ActiveButton(wxEVT_NULL) - , RenderAllowed(0) - , Stereo(0) - , Handle(0) - , Created(true) - , RenderWhenDisabled(1) - , UseCaptureMouse(0) -{ -#ifdef VTK_DEBUG_LEAKS - vtkDebugLeaks::ConstructClass("wxVTKRenderWindowInteractor"); -#endif - this->RenderWindow = NULL; - this->SetRenderWindow(vtkRenderWindow::New()); - this->RenderWindow->Delete(); -} -//--------------------------------------------------------------------------- -wxVTKRenderWindowInteractor::wxVTKRenderWindowInteractor(wxWindow *parent, - wxWindowID id, - const wxPoint &pos, - const wxSize &size, - long style, - const wxString &name) -#if defined(__WXGTK__) && defined(USE_WXGLCANVAS) - : wxGLCanvas(parent, id, pos, size, style, name), vtkRenderWindowInteractor() -#else - : wxWindow(parent, id, pos, size, style, name), vtkRenderWindowInteractor() -#endif //__WXGTK__ - , timer(this, ID_wxVTKRenderWindowInteractor_TIMER) - , ActiveButton(wxEVT_NULL) - , RenderAllowed(0) - , Stereo(0) - , Handle(0) - , Created(true) - , RenderWhenDisabled(1) - , UseCaptureMouse(0) -{ -#ifdef VTK_DEBUG_LEAKS - vtkDebugLeaks::ConstructClass("wxVTKRenderWindowInteractor"); -#endif - this->RenderWindow = NULL; - this->SetRenderWindow(vtkRenderWindow::New()); - this->RenderWindow->Delete(); -#ifdef __WXMAC__ - // On Mac (Carbon) we don't get notified of the initial window size with an EVT_SIZE event, - // so we update the size information of the interactor/renderwindow here - this->UpdateSize(size.x, size.y); -#endif -} -//--------------------------------------------------------------------------- -wxVTKRenderWindowInteractor::~wxVTKRenderWindowInteractor() -{ - SetRenderWindow(NULL); - SetInteractorStyle(NULL); -} -//--------------------------------------------------------------------------- -wxVTKRenderWindowInteractor * wxVTKRenderWindowInteractor::New() -{ - // we don't make use of the objectfactory, because we're not registered - return new wxVTKRenderWindowInteractor; -} -//--------------------------------------------------------------------------- -void wxVTKRenderWindowInteractor::Initialize() -{ - int *size = RenderWindow->GetSize(); - // 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; -} -//--------------------------------------------------------------------------- -void wxVTKRenderWindowInteractor::Enable() -{ - // if already enabled then done - if (Enabled) - return; - - // that's it - Enabled = 1; -#if defined(__WXGTK__) && defined(USE_WXGLCANVAS) - SetCurrent(); -#endif - Modified(); -} -//--------------------------------------------------------------------------- -bool wxVTKRenderWindowInteractor::Enable(bool enable) -{ -#if defined(__WXGTK__) && defined(USE_WXGLCANVAS) - return wxGLCanvas::Enable(enable); -#else - return wxWindow::Enable(enable); -#endif -} -//--------------------------------------------------------------------------- -void wxVTKRenderWindowInteractor::Disable() -{ - // if already disabled then done - if (!Enabled) - return; - - // that's it (we can't remove the event handler like it should be...) - Enabled = 0; - Modified(); -} -//--------------------------------------------------------------------------- -void wxVTKRenderWindowInteractor::Start() -{ - // the interactor cannot control the event loop - vtkErrorMacro( << "wxVTKRenderWindowInteractor::Start() " - "interactor cannot control event loop."); -} -//--------------------------------------------------------------------------- -void wxVTKRenderWindowInteractor::UpdateSize(int x, int y) -{ - if( RenderWindow ) - { - // if the size changed tell render window - if ( x != Size[0] || y != Size[1] ) - { - // adjust our (vtkRenderWindowInteractor size) - Size[0] = x; - Size[1] = y; - // and our RenderWindow's size - RenderWindow->SetSize(x, y); - } - } -} -//--------------------------------------------------------------------------- -int wxVTKRenderWindowInteractor::CreateTimer(int WXUNUSED(timertype)) -{ - // it's a one shot timer - if (!timer.Start(10, TRUE)) - assert(false); - - return 1; - -} -//--------------------------------------------------------------------------- -int wxVTKRenderWindowInteractor::DestroyTimer() -{ - // do nothing - return 1; -} -//--------------------------------------------------------------------------- -void wxVTKRenderWindowInteractor::OnTimer(wxTimerEvent& WXUNUSED(event)) -{ - if (!Enabled) - return; - -#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0) - // new style - InvokeEvent(vtkCommand::TimerEvent, NULL); -#else - // old style - InteractorStyle->OnTimer(); -#endif -} - -//--------------------------------------------------------------------------- -// NOTE on implementation: -// Bad luck you ended up in the only tricky place of this code. -// A few note, wxWidgets still refuse to provide such convenient method -// so I have to maintain it myself, eventhough this is completely integrated -// in wxPython... -// Anyway if this happen to break for you then compare to a recent version of wxPython -// and look for the function long wxPyGetWinHandle(wxWindow* win) -// in wxPython/src/helpers.cpp -long wxVTKRenderWindowInteractor::GetHandleHack() -{ - //helper function to hide the MSW vs GTK stuff - long handle_tmp = 0; - -// __WXMSW__ is for Win32 -//__WXMAC__ stands for using Carbon C-headers, using either the CarbonLib/CFM or the native Mach-O builds (which then also use the latest features available) -// __WXGTK__ is for both gtk 1.2.x and gtk 2.x -#if defined(__WXMSW__) || defined(__WXMAC__) - handle_tmp = (long)this->GetHandle(); -#endif //__WXMSW__ - -//__WXCOCOA__ stands for using the objective-c Cocoa API -#ifdef __WXCOCOA__ - // Here is how to find the NSWindow - wxTopLevelWindow* toplevel = dynamic_cast( - wxGetTopLevelParent( this ) ); - if (toplevel != NULL ) - { - handle_tmp = (long)toplevel->GetNSWindow(); - } - // The NSView will be deducted from - // [(NSWindow*)Handle contentView] - // if only I knew how to write that in c++ -#endif //__WXCOCOA__ - - // Find and return the actual X-Window. -#if defined(__WXGTK__) || defined(__WXX11__) - - //EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 - #if wxMAJOR_VERSION <= 2 - return (long)GetXWindow(this); - #else - GdkWindow* Win = gtk_widget_get_window( (GtkWidget *) GetHandle() ); - return (long int)GDK_WINDOW_XDISPLAY(Win); - #endif - -#endif - -//#ifdef __WXMOTIF__ -// handle_tmp = (long)this->GetXWindow(); -//#endif - - return handle_tmp; -} -//--------------------------------------------------------------------------- -void wxVTKRenderWindowInteractor::OnPaint(wxPaintEvent& WXUNUSED(event)) -{ - //must always be here - wxPaintDC pDC(this); - - //do it here rather than in the cstor: this is safer. - if(!Handle) - { - Handle = GetHandleHack(); - RenderWindow->SetWindowId(reinterpret_cast(Handle)); -#ifdef __WXMSW__ - RenderWindow->SetParentId(reinterpret_cast(this->GetParent()->GetHWND())); -#endif //__WXMSW__ - } - // get vtk to render to the wxWindows - Render(); -#ifdef __WXMAC__ - // This solves a problem with repainting after a window resize - // See also: http://sourceforge.net/mailarchive/forum.php?thread_id=31690967&forum_id=41789 - vtkCarbonRenderWindow* rwin = vtkCarbonRenderWindow::SafeDownCast(RenderWindow); - if( rwin ) - { - rwin->UpdateGLRegion(); - } -#endif -} -//--------------------------------------------------------------------------- -void wxVTKRenderWindowInteractor::OnEraseBackground(wxEraseEvent &event) -{ - //turn off background erase to reduce flickering on MSW - event.Skip(false); -} -//--------------------------------------------------------------------------- -void wxVTKRenderWindowInteractor::OnSize(wxSizeEvent& WXUNUSED(event)) -{ - int w, h; - GetClientSize(&w, &h); - UpdateSize(w, h); - - if (!Enabled) - { - return; - } - -#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0) - InvokeEvent(vtkCommand::ConfigureEvent, NULL); -#endif - //this will check for Handle - //Render(); -} -//--------------------------------------------------------------------------- -void wxVTKRenderWindowInteractor::OnMotion(wxMouseEvent &event) -{ - if (!Enabled) - { - return; - } -#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0) - SetEventInformationFlipY(event.GetX(), event.GetY(), - event.ControlDown(), event.ShiftDown(), '\0', 0, NULL); - - InvokeEvent(vtkCommand::MouseMoveEvent, NULL); -#else - InteractorStyle->OnMouseMove(event.ControlDown(), event.ShiftDown(), - event.GetX(), Size[1] - event.GetY() - 1); -#endif -} -//--------------------------------------------------------------------------- -#if !(VTK_MAJOR_VERSION == 3 && VTK_MINOR_VERSION == 1) -void wxVTKRenderWindowInteractor::OnEnter(wxMouseEvent &event) -{ - if (!Enabled) - { - return; - } - -#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0) - // new style - SetEventInformationFlipY(event.GetX(), event.GetY(), - event.ControlDown(), event.ShiftDown(), '\0', 0, NULL); - - InvokeEvent(vtkCommand::EnterEvent, NULL); -#else - // old style - InteractorStyle->OnEnter(event.ControlDown(), event.ShiftDown(), - event.GetX(), Size[1] - event.GetY() - 1); -#endif -} -//--------------------------------------------------------------------------- -void wxVTKRenderWindowInteractor::OnLeave(wxMouseEvent &event) -{ - if (!Enabled) - { - return; - } - -#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0) - // new style - SetEventInformationFlipY(event.GetX(), event.GetY(), - event.ControlDown(), event.ShiftDown(), '\0', 0, NULL); - - InvokeEvent(vtkCommand::LeaveEvent, NULL); -#else - // old style - InteractorStyle->OnLeave(event.ControlDown(), event.ShiftDown(), - event.GetX(), Size[1] - event.GetY() - 1); -#endif -} -//--------------------------------------------------------------------------- -void wxVTKRenderWindowInteractor::OnKeyDown(wxKeyEvent &event) -{ - if (!Enabled) - { - return; - } - -#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0) - // new style - int keycode = event.GetKeyCode(); - char key = '\0'; - if (((unsigned int)keycode) < 256) - { - // TODO: Unicode in non-Unicode mode ?? - key = (char)keycode; - } - - // we don't get a valid mouse position inside the key event on every platform - // so we retrieve the mouse position explicitly and pass it along - wxPoint mousePos = ScreenToClient(wxGetMousePosition()); - SetEventInformationFlipY(mousePos.x, mousePos.y, - event.ControlDown(), event.ShiftDown(), key, 0, NULL); - InvokeEvent(vtkCommand::KeyPressEvent, NULL); -#else - InteractorStyle->OnKeyDown(event.ControlDown(), event.ShiftDown(), - event.GetKeyCode(), 1); -#endif - event.Skip(); -} -//--------------------------------------------------------------------------- -void wxVTKRenderWindowInteractor::OnKeyUp(wxKeyEvent &event) -{ - if (!Enabled) - { - return; - } - -#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0) - // new style - int keycode = event.GetKeyCode(); - char key = '\0'; - if (((unsigned int)keycode) < 256) - { - // TODO: Unicode in non-Unicode mode ?? - key = (char)keycode; - } - - // we don't get a valid mouse position inside the key event on every platform - // so we retrieve the mouse position explicitly and pass it along - wxPoint mousePos = ScreenToClient(wxGetMousePosition()); - SetEventInformationFlipY(mousePos.x, mousePos.y, - event.ControlDown(), event.ShiftDown(), key, 0, NULL); - InvokeEvent(vtkCommand::KeyReleaseEvent, NULL); -#else - InteractorStyle->OnKeyUp(event.ControlDown(), event.ShiftDown(), - event.GetKeyCode(), 1); -#endif - event.Skip(); -} -#endif //!(VTK_MAJOR_VERSION == 3 && VTK_MINOR_VERSION == 1) - //--------------------------------------------------------------------------- -void wxVTKRenderWindowInteractor::OnChar(wxKeyEvent &event) -{ - if (!Enabled) - { - return; - } - -#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0) - // new style - int keycode = event.GetKeyCode(); - char key = '\0'; - if (((unsigned int)keycode) < 256) - { - // TODO: Unicode in non-Unicode mode ?? - key = (char)keycode; - } - - // we don't get a valid mouse position inside the key event on every platform - // so we retrieve the mouse position explicitly and pass it along - wxPoint mousePos = ScreenToClient(wxGetMousePosition()); - SetEventInformationFlipY(mousePos.x, mousePos.y, - event.ControlDown(), event.ShiftDown(), key, 0, NULL); - InvokeEvent(vtkCommand::CharEvent, NULL); -#endif - event.Skip(); -} -//--------------------------------------------------------------------------- -void wxVTKRenderWindowInteractor::OnButtonDown(wxMouseEvent &event) -{ - if (!Enabled || (ActiveButton != wxEVT_NULL)) - { - return; - } - ActiveButton = event.GetEventType(); - - // On Mac (Carbon) and Windows we don't automatically get the focus when - // you click inside the window - // we therefore set the focus explicitly - // Apparently we need that on linux (GTK) too: - this->SetFocus(); - -#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0) - SetEventInformationFlipY(event.GetX(), event.GetY(), - event.ControlDown(), event.ShiftDown(), '\0', 0, NULL); -#endif - - if(event.RightDown()) - { -#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0) - // new style - InvokeEvent(vtkCommand::RightButtonPressEvent, NULL); -#else - // old style - InteractorStyle->OnRightButtonDown(event.ControlDown(), event.ShiftDown(), - event.GetX(), Size[1] - event.GetY() - 1); -#endif - } - else if(event.LeftDown()) - { -#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0) - // new style - InvokeEvent(vtkCommand::LeftButtonPressEvent, NULL); -#else - // old style - InteractorStyle->OnLeftButtonDown(event.ControlDown(), event.ShiftDown(), - event.GetX(), Size[1] - event.GetY() - 1); -#endif - } - else if(event.MiddleDown()) - { -#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0) - // new style - InvokeEvent(vtkCommand::MiddleButtonPressEvent, NULL); -#else - // old style - InteractorStyle->OnMiddleButtonDown(event.ControlDown(), event.ShiftDown(), - event.GetX(), Size[1] - event.GetY() - 1); -#endif - } - //save the button and capture mouse until the button is released - //Only if : - //1. it is possible (WX_USE_X_CAPTURE) - //2. user decided to. - if ((ActiveButton != wxEVT_NULL) && WX_USE_X_CAPTURE && UseCaptureMouse) - { - CaptureMouse(); - } -} -//--------------------------------------------------------------------------- -void wxVTKRenderWindowInteractor::OnButtonUp(wxMouseEvent &event) -{ - //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 - //wxEVT_COMMAND_RIGHT_CLICK - if (!Enabled || (ActiveButton != (event.GetEventType()-1))) - { - return; - } - -#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0) - SetEventInformationFlipY(event.GetX(), event.GetY(), - event.ControlDown(), event.ShiftDown(), '\0', 0, NULL); -#endif - - if(ActiveButton == wxEVT_RIGHT_DOWN) - { -#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0) - // new style - InvokeEvent(vtkCommand::RightButtonReleaseEvent, NULL); -#else - // old style - InteractorStyle->OnRightButtonUp(event.ControlDown(), event.ShiftDown(), - event.GetX(), Size[1] - event.GetY() - 1); -#endif - } - else if(ActiveButton == wxEVT_LEFT_DOWN) - { -#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0) - // new style - InvokeEvent(vtkCommand::LeftButtonReleaseEvent, NULL); -#else - // old style - InteractorStyle->OnLeftButtonUp(event.ControlDown(), event.ShiftDown(), - event.GetX(), Size[1] - event.GetY() - 1); -#endif - } - else if(ActiveButton == wxEVT_MIDDLE_DOWN) - { -#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 0) - // new style - InvokeEvent(vtkCommand::MiddleButtonReleaseEvent, NULL); -#else - // old style - InteractorStyle->OnMiddleButtonUp(event.ControlDown(), event.ShiftDown(), - event.GetX(), Size[1] - event.GetY() - 1); -#endif - } - //if the ActiveButton is realeased, then release mouse capture - if ((ActiveButton != wxEVT_NULL) && WX_USE_X_CAPTURE && UseCaptureMouse) - { - ReleaseMouse(); - } - ActiveButton = wxEVT_NULL; -} -//--------------------------------------------------------------------------- -void wxVTKRenderWindowInteractor::OnMouseWheel(wxMouseEvent& event) -{ -// Mouse wheel was only added after VTK 4.4 (I think...) -#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 2) - // new style - //Set vtk event information ... The numebr of wheel rotations is stored in - //the x varible. y varible is zero - SetEventInformationFlipY(event.GetWheelRotation() / event.GetWheelDelta(), 0, - event.ControlDown(), event.ShiftDown(), '\0', 0, NULL); - if(event.GetWheelRotation() > 0) - { - //Send event to VTK - InvokeEvent(vtkCommand::MouseWheelForwardEvent, NULL); - } - else - { - //Send event to VTK - InvokeEvent(vtkCommand::MouseWheelBackwardEvent, NULL); - } -#endif - -} - -//--------------------------------------------------------------------------- -void wxVTKRenderWindowInteractor::Render() -{ - RenderAllowed = 1; - if (!RenderWhenDisabled) - { - //the user doesn't want us to render when the toplevel frame - //is disabled - first find the top level parent - wxWindow *topParent = wxGetTopLevelParent(this); - if (topParent) - { - //if it exists, check whether it's enabled - //if it's not enabeld, RenderAllowed will be false - RenderAllowed = topParent->IsEnabled(); - } - } - - if (RenderAllowed) - { - if(Handle && (Handle == GetHandleHack()) ) - { - RenderWindow->Render(); - } -#if VTK_MAJOR_VERSION > 4 || (VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 2) - else if(GetHandleHack()) - { - //this means the user has reparented us; let's adapt to the - //new situation by doing the WindowRemap dance - //store the new situation - Handle = GetHandleHack(); - RenderWindow->SetNextWindowId(reinterpret_cast(Handle)); - RenderWindow->WindowRemap(); - RenderWindow->Render(); - } -#endif - } -} -//--------------------------------------------------------------------------- -void wxVTKRenderWindowInteractor::SetRenderWhenDisabled(int newValue) -{ - //Change value of __RenderWhenDisabled ivar. - //If __RenderWhenDisabled is false (the default), this widget will not - //call Render() on the RenderWindow if the top level frame (i.e. the - //containing frame) has been disabled. - - //This prevents recursive rendering during wxSafeYield() calls. - //wxSafeYield() can be called during the ProgressMethod() callback of - //a VTK object to have progress bars and other GUI elements updated - - //it does this by disabling all windows (disallowing user-input to - //prevent re-entrancy of code) and then handling all outstanding - //GUI events. - - //However, this often triggers an OnPaint() method for wxVTKRWIs, - //resulting in a Render(), resulting in Update() being called whilst - //still in progress. - - RenderWhenDisabled = (bool)newValue; -} -//--------------------------------------------------------------------------- -// -// Set the variable that indicates that we want a stereo capable window -// be created. This method can only be called before a window is realized. -// -void wxVTKRenderWindowInteractor::SetStereo(int capable) -{ - if (Stereo != capable) - { - Stereo = capable; - RenderWindow->StereoCapableWindowOn(); - RenderWindow->SetStereoTypeToCrystalEyes(); - Modified(); - } -} - -//--------------------------------------------------------------------------- -// -// -void wxVTKRenderWindowInteractor::PrintSelf(ostream& os, vtkIndent indent) -{ - this->Superclass::PrintSelf(os, indent); -} - diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractor.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractor.h deleted file mode 100644 index 1d2279b..0000000 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractor.h +++ /dev/null @@ -1,199 +0,0 @@ -/*# --------------------------------------------------------------------- -# -# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image -# pour la Sant�) -# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton -# Previous Authors : Laurent Guigues, Jean-Pierre Roux -# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil -# -# This software is governed by the CeCILL-B license under French law and -# abiding by the rules of distribution of free software. You can use, -# modify and/ or redistribute the software under the terms of the CeCILL-B -# license as circulated by CEA, CNRS and INRIA at the following URL -# http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html -# or in the file LICENSE.txt. -# -# As a counterpart to the access to the source code and rights to copy, -# modify and redistribute granted by the license, users are provided only -# with a limited warranty and the software's author, the holder of the -# economic rights, and the successive licensors have only limited -# liability. -# -# The fact that you are presently reading this means that you have had -# knowledge of the CeCILL-B license and that you accept its terms. -# ------------------------------------------------------------------------ */ - -/*========================================================================= - - Program: Visualization Toolkit - Module: $RCSfile: wxVTKRenderWindowInteractor.h,v $ - Language: C++ - Date: $Date: 2012/11/15 14:14:35 $ - Version: $Revision: 1.5 $ - - Copyright (c) 1993-2002 Ken Martin, Will Schroeder, Bill Lorensen - All rights reserved. - See Copyright.txt or http://www.kitware.com/Copyright.htm for details. - - This software is distributed WITHOUT ANY WARRANTY; without even - the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the above copyright notice for more information. - -=========================================================================*/ - -// .NAME wxVTKRenderWindowInteractor - class to enable VTK to render to -// and interact with wxWindow. -// .SECTION Description -// wxVTKRenderWindowInteractor provide a VTK widget for wxWindow. This class -// was completely rewrote to have the 'Look & Feel' of the python version: -// wxVTKRenderWindowInteractor.py -// .SECTION Caveats -// - There is a know bug that prevent this class to works for more info see -// WX_USE_X_CAPTURE. This bug only affect wxGTK from 2.3.2 to wxGTK 2.4.0. -// - Furthermore this class is tempated over either wxWindows or wxGLCanvas, -// in wxWindows 2.3.1 and earlier, the wxGLCanvas had scroll bars, you can avoid -// this effect by playing with WX_BASE_CLASS at your risk (you might end up with -// lot of flickering.) -// - This class might not be easily readable as it tried to work with VTK 3.2 -// and 4.x. This class doesn't support reparenting with VTK 4.2 and earlier. -// .SECTION see also -// wxVTKRenderWindowInteractor.py wxVTKRenderWindow.py - -#ifndef _wxVTKRenderWindowInteractor_h_ -#define _wxVTKRenderWindowInteractor_h_ - -// For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ -# pragma hdrstop -#endif - -#ifndef WX_PRECOMP -#include -#endif - -#include -#include - -// vtk includes -#include "vtkRenderWindowInteractor.h" -#include "vtkRenderWindow.h" - -// Apparently since wxGTK 2.8.0 one can finally use wxWindow (just as in any -// other port): -// MM: tested on 2008/04/08: experienced some heavy flickering with wx-widget 2.6.0 -// using a wxWindow instead of wxGLCanvas fixed the symptoms -//#if (!wxCHECK_VERSION(2, 6, 0)) -#if (!wxCHECK_VERSION(2, 8, 0)) -#define USE_WXGLCANVAS -#endif - -#if defined(__WXGTK__) && defined(USE_WXGLCANVAS) -# if wxUSE_GLCANVAS -# include -# else -# error "problem of wxGLCanvas, you need to build wxWidgets with opengl" -# endif //wxUSE_GLCANVAS -#endif //__WXGTK__ - -// Motif version (renamed into wxX11 for wxWindow 2.4 and newer) -#if defined(__WXMOTIF__) -# error This GUI is not supported by wxVTKRenderWindowInteractor for now -#endif - -// wx forward declarations -class wxPaintEvent; -class wxMouseEvent; -class wxTimerEvent; -class wxKeyEvent; -class wxSizeEvent; - -#if defined(__WXGTK__) && defined(USE_WXGLCANVAS) -class wxVTKRenderWindowInteractor : public wxGLCanvas, public vtkRenderWindowInteractor -#else -class wxVTKRenderWindowInteractor : public wxWindow, public vtkRenderWindowInteractor -#endif //__WXGTK__ -{ - DECLARE_DYNAMIC_CLASS(wxVTKRenderWindowInteractor) - - public: - //constructors - wxVTKRenderWindowInteractor(); - - wxVTKRenderWindowInteractor(wxWindow *parent, - wxWindowID id, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = wxWANTS_CHARS | wxNO_FULL_REPAINT_ON_RESIZE, - const wxString &name = wxPanelNameStr); - vtkTypeRevisionMacro(wxVTKRenderWindowInteractor,vtkRenderWindowInteractor); - static wxVTKRenderWindowInteractor * New(); - void PrintSelf(ostream& os, vtkIndent indent); - - //destructor - ~wxVTKRenderWindowInteractor(); - - // vtkRenderWindowInteractor overrides - void Initialize(); - void Enable(); - bool Enable(bool enable); - void Disable(); - void Start(); - void UpdateSize(int x, int y); - int CreateTimer(int timertype); - int DestroyTimer(); - void TerminateApp() {}; - - // event handlers - void OnPaint(wxPaintEvent &event); - void OnEraseBackground (wxEraseEvent& event); - void OnMotion(wxMouseEvent &event); - - void OnButtonDown(wxMouseEvent &event); - void OnButtonUp(wxMouseEvent &event); -#if !(VTK_MAJOR_VERSION == 3 && VTK_MINOR_VERSION == 1) - void OnEnter(wxMouseEvent &event); - void OnLeave(wxMouseEvent &event); - void OnKeyDown(wxKeyEvent &event); - void OnKeyUp(wxKeyEvent &event); - void OnChar(wxKeyEvent &event); -#endif - void OnTimer(wxTimerEvent &event); - void OnSize(wxSizeEvent &event); - void OnMouseWheel(wxMouseEvent& event); - - void Render(); - void SetRenderWhenDisabled(int newValue); - - // Description: - // Prescribe that the window be created in a stereo-capable mode. This - // method must be called before the window is realized. Default if off. - vtkGetMacro(Stereo,int); - vtkBooleanMacro(Stereo,int); - virtual void SetStereo(int capable); - - // Description: - // As CaptureMouse could be a problem sometimes on a window box - // This method allow to set or not the CaptureMouse. - // This method actually will works only if WX_USE_X_CAPTURE was set to 1 - vtkSetMacro(UseCaptureMouse,int); - vtkBooleanMacro(UseCaptureMouse,int); - - protected: - wxTimer timer; - int ActiveButton; - int RenderAllowed; - long GetHandleHack(); - int Stereo; - - private: - long Handle; - bool Created; - int RenderWhenDisabled; - int UseCaptureMouse; - - DECLARE_EVENT_TABLE() -}; - -#endif //_wxVTKRenderWindowInteractor_h_ diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.h index 8c13f8b..2f3f9fa 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorEditContour.h @@ -27,7 +27,7 @@ #define _wxVTKRenderWindowInteractorEditContour_h_ -#include +#include #include #include @@ -189,7 +189,7 @@ public: double InitialLevel; }; -class wxVTKRenderWindowInteractor; +class crea::wxVTKRenderWindowInteractor; class vtkInteractorStyle2DMaracas : public vtkInteractorStyleImage{ public: @@ -220,7 +220,7 @@ private: -class wxVTKRenderWindowInteractorEditContour : public wxVTKRenderWindowInteractor { +class wxVTKRenderWindowInteractorEditContour : public crea::wxVTKRenderWindowInteractor { public: diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorPlus.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorPlus.h index 864041d..0b333e5 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorPlus.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorPlus.h @@ -29,10 +29,10 @@ //class wxVtkBaseView; #include "wxVtkBaseView.h" -#include "wxVTKRenderWindowInteractor.h" +#include "creawxVTKRenderWindowInteractor.h" -class creaMaracasVisu_EXPORT wxVTKRenderWindowInteractorPlus : public wxVTKRenderWindowInteractor +class creaMaracasVisu_EXPORT wxVTKRenderWindowInteractorPlus : public crea::wxVTKRenderWindowInteractor { public: wxVTKRenderWindowInteractorPlus(wxWindow *parent ,wxVtkBaseView *_wxvtkbaseview); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx index bd26d12..175c074 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx @@ -105,7 +105,7 @@ void wxVtk2DBaseView::ResetView() int x1 = 1,x2 = 1,y1 = 1,y2 = 1,z1 = 1,z2 = 1; wxVtkBaseView::Configure(); - wxVTKRenderWindowInteractor *iren = GetWxVTKRenderWindowInteractor(); + crea::wxVTKRenderWindowInteractor *iren = GetWxVTKRenderWindowInteractor(); vtkImageData *imageData = GetVtkBaseData()->GetImageData(); if(imageData){ imageData->UpdateInformation(); @@ -166,7 +166,7 @@ void wxVtk2DBaseView::Configure(bool okimage) if (_imageViewer2XYZ==NULL) { _imageViewer2XYZ = new vtkImageViewer2_XYZ(); - wxVTKRenderWindowInteractor *iren = GetWxVTKRenderWindowInteractor(); + crea::wxVTKRenderWindowInteractor *iren = GetWxVTKRenderWindowInteractor(); _imageViewer2XYZ -> GetVtkImageViewer2()->SetupInteractor ( iren ); ////////////// @@ -313,7 +313,7 @@ void wxVtk2DBaseView::Refresh() void wxVtk2DBaseView::SetInteractorStyleImage(vtkInteractorStyleBaseView *interactorstylebaseview) { SetInteractorStyleBaseView(interactorstylebaseview); - wxVTKRenderWindowInteractor *iren = GetWxVTKRenderWindowInteractor(); + crea::wxVTKRenderWindowInteractor *iren = GetWxVTKRenderWindowInteractor(); interactorstylebaseview->SetInteractor ( iren ); iren->SetInteractorStyle(interactorstylebaseview); interactorstylebaseview->SetwxVtkBaseView(this); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx index 88ce1ac..82b4b22 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx @@ -45,7 +45,7 @@ wxVtkBaseView::wxVtkBaseView() wxVtkBaseView::wxVtkBaseView(wxWindow *parent) { _parent = parent; - _iren = (wxVTKRenderWindowInteractor*)new wxVTKRenderWindowInteractorPlus(_parent,this); + _iren = (crea::wxVTKRenderWindowInteractor*)new wxVTKRenderWindowInteractorPlus(_parent,this); // _iren->UseCaptureMouseOn(); // _iren = new wxVTKRenderWindowInteractor(_parent,-1); _interactorStyle = NULL; @@ -58,11 +58,12 @@ wxVtkBaseView::~wxVtkBaseView() //_iren=NULL; } //------------------------------------------------------------------- -wxVTKRenderWindowInteractor* wxVtkBaseView::GetWxVTKRenderWindowInteractor() throw (char*) +crea::wxVTKRenderWindowInteractor* wxVtkBaseView::GetWxVTKRenderWindowInteractor() throw (char*) { - if(_iren==NULL){ - throw "wxVtkBaseView::GetWxVTKRenderWindowInteractor() _iren wxVTKRenderWindowInteractorPlus =NULL"; + if(_iren==NULL) + { + throw "wxVtkBaseView::GetWxVTKRenderWindowInteractor() _iren cwxVTKRenderWindowInteractorPlus =NULL"; } return _iren; } diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h index 0ecedb5..54d036f 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h @@ -53,7 +53,7 @@ #include #include "marTypes.h" -#include "wxVTKRenderWindowInteractor.h" +#include "creawxVTKRenderWindowInteractor.h" //#include "include/vtkImageViewer2_XYZ.h" /* JCP 14/05/09 @@ -69,7 +69,7 @@ public: wxVtkBaseView( ); wxVtkBaseView( wxWindow *parent ); virtual ~wxVtkBaseView(); - wxVTKRenderWindowInteractor *GetWxVTKRenderWindowInteractor() throw (char*); + crea::wxVTKRenderWindowInteractor *GetWxVTKRenderWindowInteractor() throw (char*); virtual void Configure(); virtual void Refresh(); virtual void RefreshView(); @@ -95,16 +95,16 @@ public: void SetVtkBaseData(vtkBaseData *vtkbasedata); private: - wxWindow *_parent; - wxVTKRenderWindowInteractor *_iren; + wxWindow *_parent; + crea::wxVTKRenderWindowInteractor *_iren; /** * JCP 04/05/09 - * vtkInteractorStyleImage *_interactorStyle; + * vtkInteractorStyleImage *_interactorStyle; */ - vtkInteractorStyleImage *_interactorStyle; + vtkInteractorStyleImage *_interactorStyle; // EED Nov 15 2014 - vtkBaseData *_vtkbasedata; + vtkBaseData *_vtkbasedata; protected: