#3474 Refresh optimization DrawAxisTree3D Box

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkMPR3DDataViewer.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkMPR3DDataViewer.cxx
index 45e4f3869ec476ca0f8295b8eca3fc199be8c3c7..189bdfaeac5523108b4271a7e1a01a9310ede443 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkMPR3DDataViewer.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkMPR3DDataViewer.cxx
@@ -48,27 +48,27 @@ vtkMPR3DDataViewer::vtkMPR3DDataViewer()
 //-------------------------------------------------------------------
 vtkMPR3DDataViewer::~vtkMPR3DDataViewer()
 {
-       if(_outlineData) {_outlineData-> Delete();}
-       if(_mapOutline)  {_mapOutline-> Delete();}
-       if(_outline)     {_outline-> Delete();}
-
-//     if (_bwLut)                             _bwLut->Delete();
-//     if (_hueLut)                    _hueLut->Delete();
-//     if (_satLut)                    _satLut->Delete();
-       if (_ctfun)                             _ctfun->Delete();
-       if (_saggitalColors)    _saggitalColors ->Delete();
-       if (_saggital)                  _saggital->Delete();
-       if (_axialColors)               _axialColors->Delete();
-       if (_axial)                             _axial->Delete();
-       if (_coronalColors)             _coronalColors->Delete();
-       if (_coronal)                   _coronal->Delete();
-
+       if(_outlineData)                {_outlineData           -> Delete();}
+       if(_mapOutline)                 {_mapOutline            -> Delete();}
+       if(_outline)                    {_outline                       -> Delete();}
+//     if (_bwLut)                             {_bwLut                         -> Delete();}
+//     if (_hueLut)                    {_hueLut                        -> Delete();}
+//     if (_satLut)                    {_satLut                        -> Delete();}
+       if (_ctfun)                             {_ctfun                         -> Delete();}
+       if (_saggitalColors)    {_saggitalColors        -> Delete();}
+       if (_saggital)                  {_saggital                      -> Delete();}
+       if (_axialColors)               {_axialColors           -> Delete();}
+       if (_axial)                             {_axial                         -> Delete();}
+       if (_coronalColors)             {_coronalColors         -> Delete();}
+       if (_coronal)                   {_coronal                       -> Delete();}
 }
+
 //-------------------------------------------------------------------
 vtkActor* vtkMPR3DDataViewer::GetOutlineActor()
 {
        return _outline;
 }
+
 //-------------------------------------------------------------------
 vtkImageActor* vtkMPR3DDataViewer::GetImageActor(int id)
 {
@@ -141,12 +141,27 @@ std::vector<double>*     vtkMPR3DDataViewer::GetctFunVectorBlue()
 //-------------------------------------------------------------------
 void vtkMPR3DDataViewer::SetImage()
 {
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        _saggitalColors -> SetInput( _vtkmprbasedata->GetImageData() );
        _axialColors    -> SetInput( _vtkmprbasedata->GetImageData() );
        _coronalColors  -> SetInput( _vtkmprbasedata->GetImageData() );
        _outlineData    -> SetInput((vtkDataSet *) _vtkmprbasedata->GetImageData() );
+#else
+       _saggitalColors -> SetInputData( _vtkmprbasedata->GetImageData() );
+       _axialColors    -> SetInputData( _vtkmprbasedata->GetImageData() );
+       _coronalColors  -> SetInputData( _vtkmprbasedata->GetImageData() );
+
+//EED 2020-01-27  this is to slow ??? how can we accelerated
+//     _saggitalColors -> Update();
+//     _axialColors    -> Update();
+//     _coronalColors  -> Update();
+
+       _outlineData    -> SetInputData((vtkDataSet *) _vtkmprbasedata->GetImageData() );
+#endif
 }
 
+
 //-------------------------------------------------------------------
 void vtkMPR3DDataViewer::Configure()
 {
@@ -179,7 +194,12 @@ void vtkMPR3DDataViewer::Configure()
        double delta;
        if(_vtkmprbasedata->GetImageData())
        {
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                _vtkmprbasedata->GetImageData()->Update();
+#else
+               // ..
+#endif
                _vtkmprbasedata->GetImageData()->Modified();
                _vtkmprbasedata->GetImageData()->GetScalarRange(range);
                delta = range[1]-range[0];
@@ -267,13 +287,27 @@ void vtkMPR3DDataViewer::Configure()
                        _saggitalColors = vtkImageMapToColors::New();
                }
                _saggitalColors->RemoveAllInputs();
-               _saggitalColors->SetInput( _vtkmprbasedata->GetImageData() );
+
        //    _saggitalColors->SetLookupTable(_bwLut);
                _saggitalColors->SetLookupTable(_ctfun);
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+               _saggitalColors->SetInput( _vtkmprbasedata->GetImageData() );
+#else
+               _saggitalColors->SetInputData( _vtkmprbasedata->GetImageData() );
+               _saggitalColors->Update();
+#endif
+               
+               
                if(_saggital==NULL)
                {
                        _saggital = vtkImageActor::New();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                        _saggital->SetInput(_saggitalColors->GetOutput());
+#else
+                       _saggital->SetInputData(_saggitalColors->GetOutput());
+#endif
                }       
                //_saggitalColors->Update();
        
@@ -285,13 +319,29 @@ void vtkMPR3DDataViewer::Configure()
                        _axialColors = vtkImageMapToColors::New();
                }
                _axialColors->RemoveAllInputs();
-               _axialColors->SetInput( _vtkmprbasedata->GetImageData() );
        //    _axialColors->SetLookupTable(_hueLut);
                _axialColors->SetLookupTable(_ctfun);
+
+               
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+               _axialColors->SetInput( _vtkmprbasedata->GetImageData() );
+#else
+               _axialColors->SetInputData( _vtkmprbasedata->GetImageData() );
+               _axialColors->Update();
+#endif
+
                if(_axial==NULL)
                {
                        _axial = vtkImageActor::New();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                        _axial->SetInput(_axialColors->GetOutput());
+#else
+                       _axial->SetInputData(_axialColors->GetOutput());
+#endif
+
                }
                
                //_axialColors->Update();
@@ -302,31 +352,61 @@ void vtkMPR3DDataViewer::Configure()
                        _coronalColors = vtkImageMapToColors::New();
                }
                _coronalColors->RemoveAllInputs();
-               _coronalColors->SetInput( _vtkmprbasedata->GetImageData() );
        //    _coronalColors->SetLookupTable(_satLut);
                _coronalColors->SetLookupTable(_ctfun);
+
+               
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+               _coronalColors->SetInput( _vtkmprbasedata->GetImageData() );
+#else
+               _coronalColors->SetInputData( _vtkmprbasedata->GetImageData() );
+               _coronalColors->Update();
+#endif
+
+
                if(_coronal==NULL)
                {
                        _coronal = vtkImageActor::New();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                        _coronal->SetInput(_coronalColors->GetOutput());
-               }
+#else
+                       _coronal->SetInputData(_coronalColors->GetOutput());
+#endif
+
+               } // if _coronal
                
        // An outline provides context around the data.
        //
                if(_outlineData==NULL)
                {
                        _outlineData = vtkOutlineFilter::New();
-               }
+               } // if _outlineData
                _outlineData->RemoveAllInputs();
                if(_vtkmprbasedata->GetImageData())
                {
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                        _outlineData->SetInput((vtkDataSet *) _vtkmprbasedata->GetImageData() );
-               }
+#else
+                       _outlineData->SetInputData((vtkDataSet *) _vtkmprbasedata->GetImageData() );
+                       _outlineData->Update();    
+#endif
+               } // if _image
 
                if(_mapOutline==NULL)
                {
                        _mapOutline = vtkPolyDataMapper::New();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                        _mapOutline->SetInput(_outlineData->GetOutput());
+#else
+                       _mapOutline->SetInputData(_outlineData->GetOutput());
+#endif
+
                }
                _mapOutline->Update();    
                //_mapOutline->RemoveAllInputs();