#3109 creaMaracasVisu Bug New Normal - branch vtk7itk4 compilation with vtk7

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx
index 6f3762475dc2af6b361714d32f42af060db51341..1e402d3b35785d86341c215e7f797ca9285c2487 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx
@@ -191,8 +191,15 @@ void LayerImageBase::SetImage(vtkImageData* image)
        spcBase[5]=0;
 
        _image = image;
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        _image->Update();
        _image->GetWholeExtent(ext);
+#else
+       _image->GetExtent(ext);
+#endif
+
        dimensionOriginalLayer[0] = ext[1]-ext[0]+1;
        dimensionOriginalLayer[1] = ext[3]-ext[2]+1;
        dimensionOriginalLayer[2] = ext[5]-ext[4]+1;
@@ -205,7 +212,14 @@ void LayerImageBase::SetImage(vtkImageData* image)
                vtkImageData    *imagebase              =       GetwxVtkBaseView()->GetVtkBaseData()->GetImageData();
                if (imagebase!=NULL) 
                {       
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                        imagebase->GetWholeExtent(ext);
+#else
+                       imagebase->GetExtent(ext);
+#endif
+
                        dimBase[0]=ext[1]-ext[0]+1;                             
                        dimBase[1]=ext[3]-ext[2]+1;                             
                        dimBase[2]=ext[5]-ext[4]+1;                             
@@ -223,7 +237,14 @@ void LayerImageBase::SetImage(vtkImageData* image)
        _image->GetScalarRange( _range );
        _thresholdTable = vtkLookupTable::New();
 
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        _imageChangeInformation->SetInput(_image);
+#else
+       _imageChangeInformation->SetInputData(_image);
+#endif
+
 }
 
 //------------------------------------------------------------------------------
@@ -450,7 +471,7 @@ void LayerImageBase::onThreshold()
                                        _scalarbarActor->SetDisplayPosition(0,0);
                                }
 
-                               _thresholdActor->SetOpacity( 0 );
+                               _thresholdActor->SetOpacity( 1 );
                                _thresholdActor->InterpolateOn(  );
                                
                                if (directionViewer==0)
@@ -474,7 +495,14 @@ void LayerImageBase::onThreshold()
                }  // !GetActorPresent()
 
                ConfigLookupTable();  // virtual method
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                _imageReslicer->SetInput( GetImage() );
+#else
+               _imageReslicer->SetInputData( GetImage() );
+#endif
+
                _imageReslicer->SetInformationInput( GetImage() );
 
                if (directionViewer==0)
@@ -506,9 +534,24 @@ void LayerImageBase::onThreshold()
 //             img->UpdateInformation();
 
 //             _thresholdTable->Update();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                _thresholdMapper->SetInput( img );
+#else
+               _thresholdMapper->SetInputData( img );
+#endif
+
                _thresholdMapper->SetLookupTable( _thresholdTable );
+
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                _thresholdActor->SetInput( _thresholdMapper->GetOutput() );
+#else
+               _thresholdActor->SetInputData( _thresholdMapper->GetOutput() );
+#endif
+
                
                _scalarbarActor->SetLookupTable( _thresholdTable );
 //             _scalarbarActor->SetLookupTable( _thresholdMapper->GetLookupTable() );