#3470 merge vtk8itk5wx3-mingw64

[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 e93a929c13f929e37590b9d358028d9ddb2e6ed8..0b3e8ea32a1001b66bfa264262acf0c6adaced7a 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx
@@ -232,9 +232,9 @@ void wxVtkMPR2DView::Configure()
 
 void wxVtkMPR2DView::SetVisibleAxis(bool ok)
 {
-       if (ok!=_visibleAxis)
+       if (ok != _visibleAxis)
        {
-               _visibleAxis=ok;
+               _visibleAxis = ok;
                if (_visibleAxis==true)
                {
                        _imageViewer2XYZ->GetVtkImageViewer2()->GetRenderer()->AddActor( _lineAActor );
@@ -248,6 +248,16 @@ void wxVtkMPR2DView::SetVisibleAxis(bool ok)
        } // ok
 }
 
+
+//-------------------------------------------------------------------
+void wxVtkMPR2DView::ResetBackXYZ()
+{
+       _backX = -9999;
+       _backY = -9999;
+       _backZ = -9999;
+}
+
+
 //-------------------------------------------------------------------
 void wxVtkMPR2DView::Refresh()
 {
@@ -274,12 +284,12 @@ void wxVtkMPR2DView::Refresh()
                y2 += origin[1];
                z1 += origin[2];
                z2 += origin[2];
-               xx1 =           x1*spc[0];
-               yy1 =           y1*spc[1];
-               zz1 =           z1*spc[2];
-               xx2 =           x2*spc[0];
-               yy2 =           y2*spc[1];
-               zz2 =           z2*spc[2];
+               xx1 = x1*spc[0];
+               yy1 = y1*spc[1];
+               zz1 = z1*spc[2];
+               xx2 = x2*spc[0];
+               yy2 = y2*spc[1];
+               zz2 = z2*spc[2];
                x1      = (int)(x1*spc[0]);
                y1      = (int)(y1*spc[1]);
                z1      = (int)(z1*spc[2]);
@@ -289,10 +299,6 @@ void wxVtkMPR2DView::Refresh()
                xx      = (int)(GetVtkmprbasedata()->GetX());
                yy      = (int)(GetVtkmprbasedata()->GetY());
                zz      = (int)(GetVtkmprbasedata()->GetZ());
-//EED 02/08/2013
-//             x =  round(xx*spc[0]);
-//             y =  round(yy*spc[1]);
-//             z =  round(zz*spc[2]);
                x       =  xx*spc[0];
                y       =  yy*spc[1];
                z       =  zz*spc[2];
@@ -314,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;    
@@ -333,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;    
@@ -358,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;    
@@ -383,6 +391,7 @@ void wxVtkMPR2DView::Refresh()
                        } // if GetFixAxis2D
                        _lineAActor->GetProperty()->SetOpacity( opacityAxis );
                        _lineBActor->GetProperty()->SetOpacity( opacityAxis );
+                       SetOpacityText( opacityAxis );
                        _backX                  = xx;
                        _backY                  = yy;
                        _backZ                  = zz;
@@ -395,6 +404,8 @@ void wxVtkMPR2DView::Refresh()
        imageactor->SetInterpolate( GetVtkBaseData()->GetInterpolate() );
 //EED 01nov2012
                UpdateColorWindowLevel();
+//EED 05juin2019
+               UpdateCameraParallelScale();
                wxVtkBaseView::Refresh();
        }
 }