#3473 Stuck Render macOS

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / wxVtkMPR2DView.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx
index bd0582eb3e0afeee6ef0654c4cc11481c2dfa406..0b3e8ea32a1001b66bfa264262acf0c6adaced7a 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx
@@ -120,11 +120,11 @@ void wxVtkMPR2DView::Configure()
 //EED 2017-01-01 Migration VTK7
 #if VTK_MAJOR_VERSION <= 5
                _lineAMapper->SetInput(_pdA);
+               _lineAMapper->ImmediateModeRenderingOn();
 #else
                _lineAMapper->SetInputData(_pdA);
 #endif
 
-               _lineAMapper->ImmediateModeRenderingOn();
                _lineAActor->SetMapper(_lineAMapper);
        }
 
@@ -166,11 +166,11 @@ void wxVtkMPR2DView::Configure()
 //EED 2017-01-01 Migration VTK7
 #if VTK_MAJOR_VERSION <= 5
        _lineBMapper->SetInput(_pdB);
+       _lineBMapper->ImmediateModeRenderingOn();
 #else
        _lineBMapper->SetInputData(_pdB);
 #endif
 
-       _lineBMapper->ImmediateModeRenderingOn();
        if(_imageViewer2XYZ)
        {
                _imageViewer2XYZ->GetVtkImageViewer2()->GetRenderer()->AddActor( _lineAActor );
@@ -252,9 +252,9 @@ void wxVtkMPR2DView::SetVisibleAxis(bool ok)
 //-------------------------------------------------------------------
 void wxVtkMPR2DView::ResetBackXYZ()
 {
-       _backX=-9999;
-       _backY=-9999;
-       _backZ=-9999;
+       _backX = -9999;
+       _backY = -9999;
+       _backZ = -9999;
 }
 
 
@@ -320,10 +320,10 @@ void wxVtkMPR2DView::Refresh()
                                //_ptsA->SetPoint(1, x2, y2  , z );
                                //_ptsB->SetPoint(0, x2, y   , z1);
                                //_ptsB->SetPoint(1, x2, y   , z2);
-                               _ptsA->SetPoint(0, xx2, yy1  , z  );
-                               _ptsA->SetPoint(1, xx2, yy2  , z  );
-                               _ptsB->SetPoint(0, xx2, y    , zz1);
-                               _ptsB->SetPoint(1, xx2, y    , zz2);
+                               _ptsA->SetPoint(0, xx2+1, yy1  , z  );
+                               _ptsA->SetPoint(1, xx2+1, yy2  , z  );
+                               _ptsB->SetPoint(0, xx2+1, y    , zz1);
+                               _ptsB->SetPoint(1, xx2+1, y    , zz2);
                                position[1]             = y;    
                                position[2]             = z;    
                                focalpoint[1]   = y;    
@@ -339,10 +339,10 @@ void wxVtkMPR2DView::Refresh()
                                //_ptsA->SetPoint(1, x2 , y2 , z );
                                //_ptsB->SetPoint(0, x  , y2 , z1);
                                //_ptsB->SetPoint(1, x  , y2 , z2);
-                           _ptsA->SetPoint(0, xx1 , y1 , z  );
-                               _ptsA->SetPoint(1, xx2 , y1 , z  );
-                               _ptsB->SetPoint(0, x   , y1 , zz1);
-                               _ptsB->SetPoint(1, x   , y1 , zz2);
+                           _ptsA->SetPoint(0, xx1 , y1-1 , z  );
+                               _ptsA->SetPoint(1, xx2 , y1-1 , z  );
+                               _ptsB->SetPoint(0, x   , y1-1 , zz1);
+                               _ptsB->SetPoint(1, x   , y1-1 , zz2);
                                position[0]             = x;    
                                position[2]             = z;    
                                focalpoint[0]   = x;    
@@ -364,10 +364,12 @@ void wxVtkMPR2DView::Refresh()
                                //_ptsA->SetPoint(1, x2 , y , z2 );
                                //_ptsB->SetPoint(0, x  , y1, z2 );
                                //_ptsB->SetPoint(1, x  , y2, z2 );
-                               _ptsA->SetPoint(0, xx1 , y  , z1 );
-                               _ptsA->SetPoint(1, xx2 , y  , z1 );
-                               _ptsB->SetPoint(0, x   , yy1, z1 );
-                               _ptsB->SetPoint(1, x   , yy2, z1 );
+
+                               _ptsA->SetPoint(0, xx1 , y  , z1-1 );
+                               _ptsA->SetPoint(1, xx2 , y  , z1-1 );
+                               _ptsB->SetPoint(0, x   , yy1, z1-1 );
+                               _ptsB->SetPoint(1, x   , yy2, z1-1 );
+                               
                                position[0]             = x;    
                                position[1]             = y;    
                                focalpoint[0]   = x;    
@@ -389,10 +391,7 @@ void wxVtkMPR2DView::Refresh()
                        } // if GetFixAxis2D
                        _lineAActor->GetProperty()->SetOpacity( opacityAxis );
                        _lineBActor->GetProperty()->SetOpacity( opacityAxis );
-                       
                        SetOpacityText( opacityAxis );
-
-                       
                        _backX                  = xx;
                        _backY                  = yy;
                        _backZ                  = zz;