X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FManualPaintControler.cpp;fp=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FManualPaintControler.cpp;h=dc4fea127419f1bfb89f3b726e1dfa45afdf20e0;hb=897b3f6aeec3179a0afed6b1657ed426693c80de;hp=c23e6f4f42804a1d9f1db795169e8c2b3ba9b872;hpb=23b33a3a7e3f42eacbaad218510fb77e27aa9c2f;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintControler.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintControler.cpp index c23e6f4..dc4fea1 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintControler.cpp +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintControler.cpp @@ -1,13 +1,13 @@ #include "ManualPaintControler.h" #include "vtkInteractorManualPaint.h" -#include "wxVtk2DBaseView.h" #include "vtkImageActor.h" //--------------------------------------------------------------------------- ManualPaintControler::ManualPaintControler() { auxZ=0; + _wxvtk2Dbaseview=NULL; } //--------------------------------------------------------------------------- @@ -28,16 +28,19 @@ void ManualPaintControler::SetManualPaintPanel(ManualPaintPanel* manualPaintPane } //--------------------------------------------------------------------------- -void ManualPaintControler::SetWxVtkBaseView(wxVtkBaseView *baseview) +void ManualPaintControler::SetWxVtk2DBaseView(wxVtk2DBaseView *wxvtk2Dbaseview) { - _wxvtkbaseview = baseview; + _wxvtk2Dbaseview = wxvtk2Dbaseview; } //--------------------------------------------------------------------------- void ManualPaintControler::Config() { - vtkInteractorStyleBaseView *isbv = (vtkInteractorStyleBaseView*)(_wxvtkbaseview->GetInteractorStyleBaseView()); - isbv->AddInteractorStyleMaracas( new vtkInteractorManualPaint(this) ); + if (_wxvtk2Dbaseview!=NULL) + { + vtkInteractorStyleBaseView *isbv = (vtkInteractorStyleBaseView*)(_wxvtk2Dbaseview->GetInteractorStyleBaseView()); + isbv->AddInteractorStyleMaracas( new vtkInteractorManualPaint(this) ); + } } @@ -45,10 +48,11 @@ void ManualPaintControler::Config() //--------------------------------------------------------------------------- void ManualPaintControler::PaintImage(int px,int py, int pz) { + _manualPaintModel->SetDirection( _wxvtk2Dbaseview->GetDirection() ); _manualPaintModel->PaintImage(px,py,pz); - //The refresh mechanisme is made in the vtkInteractorManualPaint -// RefreshView(); + // The refresh mechanisme is made in the vtkInteractorManualPaint + // RefreshView(); } //---------------------------------------------------------------------------