Clean code

[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 f35206765b43494bb0fc6c36e5063b224b5656d7..cb1dc1e54e6b971f4456fed694c69f6fe4cc45e0 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkMPR3DDataViewer.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkMPR3DDataViewer.cxx
@@ -34,7 +34,6 @@ vtkMPR3DDataViewer::vtkMPR3DDataViewer()
        _visiblePosition[2]=false;
        _ctfun                  = NULL;
        _vtkmprbasedata = NULL;
-
        _ctfun                  = NULL;
        _saggitalColors = NULL;
        _saggital               = NULL;
@@ -144,13 +143,15 @@ 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() );
+       _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() );
+       _saggitalColors ->SetInputData( _vtkmprbasedata->GetImageData() );
+       _axialColors    ->SetInputData( _vtkmprbasedata->GetImageData() );
+       _coronalColors  ->SetInputData( _vtkmprbasedata->GetImageData() );
+       _outlineData    ->SetInputData((vtkDataSet *) _vtkmprbasedata->GetImageData() );
 #endif
 }
 
@@ -182,10 +183,8 @@ void vtkMPR3DDataViewer::Configure()
     _satLut->SetValueRange (1, 1);
 */
 
-
        double range[2];
        double delta;
-       
        if(_vtkmprbasedata->GetImageData())
        {
 //EED 2017-01-01 Migration VTK7
@@ -281,6 +280,7 @@ void vtkMPR3DDataViewer::Configure()
                        _saggitalColors = vtkImageMapToColors::New();
                }
                _saggitalColors->RemoveAllInputs();
+
        //    _saggitalColors->SetLookupTable(_bwLut);
                _saggitalColors->SetLookupTable(_ctfun);
 //EED 2017-01-01 Migration VTK7
@@ -292,7 +292,6 @@ void vtkMPR3DDataViewer::Configure()
 #endif
                
                
-
                if(_saggital==NULL)
                {
                        _saggital = vtkImageActor::New();
@@ -305,21 +304,18 @@ void vtkMPR3DDataViewer::Configure()
                }       
                //_saggitalColors->Update();
        
-
-
        // Create the second (axial) plane of the three planes. We use the
        // same approach as before except that the extent differs.
 
-               
                if(_axialColors==NULL)
                {
                        _axialColors = vtkImageMapToColors::New();
                }
-
                _axialColors->RemoveAllInputs();
        //    _axialColors->SetLookupTable(_hueLut);
                _axialColors->SetLookupTable(_ctfun);
 
+               
 //EED 2017-01-01 Migration VTK7
 #if VTK_MAJOR_VERSION <= 5
                _axialColors->SetInput( _vtkmprbasedata->GetImageData() );
@@ -328,7 +324,6 @@ void vtkMPR3DDataViewer::Configure()
                _axialColors->Update();
 #endif
 
-
                if(_axial==NULL)
                {
                        _axial = vtkImageActor::New();
@@ -343,8 +338,6 @@ void vtkMPR3DDataViewer::Configure()
                }
                
                //_axialColors->Update();
-       
-
                // Create the third (coronal) plane of the three planes. We use 
        // the same approach as before except that the extent differs.
                if(_coronalColors==NULL)
@@ -355,6 +348,7 @@ void vtkMPR3DDataViewer::Configure()
        //    _coronalColors->SetLookupTable(_satLut);
                _coronalColors->SetLookupTable(_ctfun);
 
+               
 //EED 2017-01-01 Migration VTK7
 #if VTK_MAJOR_VERSION <= 5
                _coronalColors->SetInput( _vtkmprbasedata->GetImageData() );
@@ -377,8 +371,6 @@ void vtkMPR3DDataViewer::Configure()
 
                } // if _coronal
                
-       
-
        // An outline provides context around the data.
        //
                if(_outlineData==NULL)
@@ -419,7 +411,6 @@ void vtkMPR3DDataViewer::Configure()
                        _outline->GetProperty()->SetColor(0,0,0);
                }
        }
-       
        //int ext[6];
        //_vtkmprbasedata->GetImageData()->GetExtent(ext);
 }