#3474 Refresh optimization DrawAxisTree3D Box

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / manualPaint / vtkInteractorManualPaint.cpp

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/vtkInteractorManualPaint.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/vtkInteractorManualPaint.cpp
index 122eccf2f9e551153215930e6f93b248b0e47f34..609acfe51020464111eacd4572f98761f6fd3eb3 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/vtkInteractorManualPaint.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/vtkInteractorManualPaint.cpp
@@ -26,44 +26,51 @@
 #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() {
-       vtkRenderWindowInteractor *interactor =
-                       _vtkInteractorStyleBaseView->GetInteractor();
+bool vtkInteractorManualPaint::OnLeftButtonDown() 
+{
+       vtkRenderWindowInteractor *interactor = _vtkInteractorStyleBaseView->GetInteractor();
        if (interactor->GetControlKey() == 1) {
                _state = true;
-//        wxVtk2DBaseView             *wxvtk2Dbaseview    = (wxVtk2DBaseView*)_vtkInteractorStyleBaseView->GetWxVtk2DBaseView();
-//        _Z      =   wxvtk2Dbaseview->GetActualSlice();
+//      wxVtk2DBaseView             *wxvtk2Dbaseview    = (wxVtk2DBaseView*)_vtkInteractorStyleBaseView->GetWxVtk2DBaseView();
+//      _Z      =   wxvtk2Dbaseview->GetActualSlice();
        }
        return true;
 }
 
 //---------------------------------------------------------------------------
-bool vtkInteractorManualPaint::OnLeftButtonUp() {
+bool vtkInteractorManualPaint::OnLeftButtonUp() 
+{
     if((_state == true) || (_stateKey == true))
-       _manualPaintControler->SetImageUndo();
+       {
+//     _manualPaintControler->SetImageUndo();
+       }
        _state = false;
        return true;
 }
@@ -71,37 +78,19 @@ bool vtkInteractorManualPaint::OnLeftButtonUp() {
 //---------------------------------------------------------------------------
 bool vtkInteractorManualPaint::OnMouseMove() 
 {
-printf("EED vtkInteractorManualPaint::OnMouseMove \n");
-       if ((_state == true) || (_stateKey == true)) {
-               wxVtk2DBaseView *wxvtk2Dbaseview =
-                               (wxVtk2DBaseView*) _vtkInteractorStyleBaseView->GetWxVtk2DBaseView();
-               wxVTKRenderWindowInteractor *wxVTKiren =
-                               wxvtk2Dbaseview->GetWxVTKRenderWindowInteractor();
+       if ((_state == true) || (_stateKey == true)) 
+       {
+               wxVtk2DBaseView                                         *wxvtk2Dbaseview        = (wxVtk2DBaseView*) _vtkInteractorStyleBaseView->GetWxVtk2DBaseView();
+               crea::wxVTKRenderWindowInteractor       *wxVTKiren                      = wxvtk2Dbaseview->GetWxVTKRenderWindowInteractor();
                int px, py;
                wxVTKiren->GetEventPosition(px, py);
-
-//        int     typeView = 1;
                double X = (double) px;
                double Y = (double) py;
                double Z = wxvtk2Dbaseview->GetActualSlice();
-//        wxvtk2Dbaseview->TransFromCoordScreenToWorld(X, Y, Z,true, typeView);
                wxvtk2Dbaseview->TransFromCoordScreenToWorld(X, Y, Z, true);
-
-printf("EED vtkInteractorManualPaint::OnMouseMove A  %d %d %d\n", (int) X, (int) Y, (int) Z);
-               _manualPaintControler->PaintImage((int) X, (int) Y, (int) Z);
+               _manualPaintControler->PaintImage((int) X, (int) Y, (int) Z,  wxvtk2Dbaseview->GetDirection() );
                this->_vtkInteractorStyleBaseView->SetParent_refresh_waiting();
-
-               /*
-                wxvtk2Dbaseview->_imageViewer2XYZ->GetVtkImageViewer2()->Modified();
-                wxvtk2Dbaseview->_imageViewer2XYZ->GetVtkImageViewer2()->GetImageActor()->Modified();
-                wxvtk2Dbaseview->_imageViewer2XYZ->GetVtkImageViewer2()->GetImageActor()->SetDisplayExtent(0, 50+_auxZ, 0, 50,_Z, _Z );
-                wxvtk2Dbaseview->Refresh();
-                wxvtk2Dbaseview->RefreshView();
-                //        wxvtk2Dbaseview->SetActualSlice(_Z+_auxZ);
-                _auxZ=(_auxZ+1)%2;
-                wxvtk2Dbaseview->_imageViewer2XYZ->GetVtkImageViewer2()->GetRenderer()->Render();
-                this->_vtkInteractorStyleBaseView->SetParent_refresh_waiting();
-                */
+       _manualPaintControler->SetImageUndo();
        } // if _state
        return true;
 }