X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FManualPaintControler.cpp;h=dc4fea127419f1bfb89f3b726e1dfa45afdf20e0;hb=3eef3f302abd6996a4eaebb0536770bca9bf428d;hp=6cab0776e94f0126a6f235a6800f31fd9b8e6222;hpb=965c602117e9de99019d49bd78ca1d707a1a6bd2;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 6cab077..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,17 +28,19 @@ void ManualPaintControler::SetManualPaintPanel(ManualPaintPanel* manualPaintPane
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintControler::SetWxVtkBaseView(wxVtkBaseView *baseview)
+void ManualPaintControler::SetWxVtk2DBaseView(wxVtk2DBaseView *wxvtk2Dbaseview)
 {
-    _wxvtkbaseview = baseview;
+    _wxvtk2Dbaseview = wxvtk2Dbaseview;
 }
 
 //---------------------------------------------------------------------------
 void ManualPaintControler::Config()
 {
-    vtkInteractorManualPaint *imp       = new vtkInteractorManualPaint(this);
-    vtkInteractorStyleBaseView *isbv    = (vtkInteractorStyleBaseView*)(_wxvtkbaseview->GetInteractorStyleBaseView());
-    isbv->AddInteractorStyleMaracas(imp);
+    if (_wxvtk2Dbaseview!=NULL)
+    {
+        vtkInteractorStyleBaseView *isbv = (vtkInteractorStyleBaseView*)(_wxvtk2Dbaseview->GetInteractorStyleBaseView());
+        isbv->AddInteractorStyleMaracas( new vtkInteractorManualPaint(this) );
+    }
 }
 
 
@@ -46,16 +48,12 @@ void ManualPaintControler::Config()
 //---------------------------------------------------------------------------
 void ManualPaintControler::PaintImage(int px,int py, int pz)
 {
+    _manualPaintModel->SetDirection( _wxvtk2Dbaseview->GetDirection() );
     _manualPaintModel->PaintImage(px,py,pz);
-    RefreshView();
+
+    // The refresh mechanisme is made in the vtkInteractorManualPaint
+    //    RefreshView();
 }
 
 //---------------------------------------------------------------------------
-void ManualPaintControler::RefreshView()
-{
-    wxVtk2DBaseView *wxvtk2Dbaseview     = (wxVtk2DBaseView*)_wxvtkbaseview;
-    vtkImageViewer2 *vtkimageviewer2    = wxvtk2Dbaseview->_imageViewer2XYZ->GetVtkImageViewer2();
-    vtkimageviewer2->GetWindowLevel()->Modified();
-
-}