#3418 creaMaracasVisu Feature New Normal - ManualPaint_model with openmp

[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 bf823640f06f8c218929e53493565cf6c1a9cd43..517ca87925bd997bb706ddf1109daea013f4478c 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx
@@ -56,14 +56,14 @@ wxVtkMPR2DView::wxVtkMPR2DView( wxWindow *parent, int direction)
 //-------------------------------------------------------------------
 wxVtkMPR2DView::~wxVtkMPR2DView()
 {
-       if (_ptsA!=NULL)            { _ptsA                 -> Delete(); }
-       if (_lineAActor!=NULL)  { _lineAActor   -> Delete(); }
-       if (_lineAMapper!=NULL) { _lineAMapper  -> Delete(); }
-       if (_pdA!=NULL)             { _pdA                  -> Delete(); }
-       if (_ptsB!=NULL)            { _ptsB                 -> Delete(); }
-       if (_lineBActor!=NULL)  { _lineBActor   -> Delete(); }
-       if (_lineBMapper!=NULL) { _lineBMapper  -> Delete(); }
-       if (_pdB!=NULL)             { _pdB                  -> Delete(); }
+       if (_ptsA!=NULL)            { _ptsA->Delete();                  }
+       if (_lineAActor!=NULL)  { _lineAActor->Delete();        }
+       if (_lineAMapper!=NULL) { _lineAMapper->Delete();       }
+       if (_pdA!=NULL)             { _pdA->Delete();                   }
+       if (_ptsB!=NULL)            { _ptsB->Delete();                  }
+       if (_lineBActor!=NULL)  { _lineBActor->Delete();        }
+       if (_lineBMapper!=NULL) { _lineBMapper->Delete();       }
+       if (_pdB!=NULL)             { _pdB->Delete();                   }
 }
 //-------------------------------------------------------------------
 vtkMPRBaseData *wxVtkMPR2DView::GetVtkmprbasedata()
@@ -116,7 +116,14 @@ void wxVtkMPR2DView::Configure()
                _ptsA->SetPoint(1,  1000        ,  1000 ,  1000 );
                _pdA = vtkPolyData::New();
                _lineAMapper = vtkPolyDataMapper::New();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                _lineAMapper->SetInput(_pdA);
+#else
+               _lineAMapper->SetInputData(_pdA);
+#endif
+
                _lineAMapper->ImmediateModeRenderingOn();
                _lineAActor->SetMapper(_lineAMapper);
        }
@@ -155,7 +162,14 @@ void wxVtkMPR2DView::Configure()
        _pdB->SetPoints( _ptsB );
        _pdB->SetLines( linesB );
        linesB->Delete();  //do not delete lines ??
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        _lineBMapper->SetInput(_pdB);
+#else
+       _lineBMapper->SetInputData(_pdB);
+#endif
+
        _lineBMapper->ImmediateModeRenderingOn();
        if(_imageViewer2XYZ)
        {
@@ -218,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 );
@@ -234,6 +248,16 @@ void wxVtkMPR2DView::SetVisibleAxis(bool ok)
        } // ok
 }
 
+
+//-------------------------------------------------------------------
+void wxVtkMPR2DView::ResetBackXYZ()
+{
+       _backX=-9999;
+       _backY=-9999;
+       _backZ=-9999;
+}
+
+
 //-------------------------------------------------------------------
 void wxVtkMPR2DView::Refresh()
 {
@@ -260,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]);
@@ -275,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];
@@ -353,6 +373,15 @@ void wxVtkMPR2DView::Refresh()
                                focalpoint[0]   = x;    
                                focalpoint[1]   = y;                                    
                        } // if back
+                       
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+                               // ..
+#else
+                               _ptsA->Modified();
+                               _ptsB->Modified();
+#endif
+
                        if (fixAxis2D == true)
                        {
                                GetRenderer()->GetActiveCamera()->SetPosition(position);
@@ -372,6 +401,8 @@ void wxVtkMPR2DView::Refresh()
        imageactor->SetInterpolate( GetVtkBaseData()->GetInterpolate() );
 //EED 01nov2012
                UpdateColorWindowLevel();
+//EED 05juin2019
+               UpdateCameraParallelScale();
                wxVtkBaseView::Refresh();
        }
 }