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

[creaMaracasVisu.git] / lib / maracasVisuLib / src / kernel / marDicomBase.cpp

diff --git a/lib/maracasVisuLib/src/kernel/marDicomBase.cpp b/lib/maracasVisuLib/src/kernel/marDicomBase.cpp
index 6d0bb372da6c95acabef4af8243043f7677457c5..9d376c0b00b0324fbff611012020a881e856459d 100644 (file)
--- a/lib/maracasVisuLib/src/kernel/marDicomBase.cpp
+++ b/lib/maracasVisuLib/src/kernel/marDicomBase.cpp
@@ -633,7 +633,12 @@ void marRAW2Files::loadActualSerie(wxGauge* gauge )
 void marRAW2Files::FlipY(vtkImageData *imagedata)
 {
        vtkImageData *vtkimagedata = imagedata;
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        vtkimagedata->Update();
+#else
+  //...
+#endif
        int dim[3];
        vtkimagedata->GetDimensions(dim);
        unsigned short tmp;
@@ -662,7 +667,12 @@ void marRAW2Files::FlipY(vtkImageData *imagedata)
                                }
                        }
                }
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
    vtkimagedata->Update();
+#else
+   vtkimagedata->Modified();
+#endif
 
 }
 // -------------------------------------------------------------------------
@@ -675,7 +685,13 @@ void marRAW2Files::saveVolume( std::string directory, std::string name, vtkImage
 
                // Crop
        vtkExtractVOI *crop = vtkExtractVOI::New();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        crop->SetInput( imagedata );
+#else
+       crop->SetInputData( imagedata );
+#endif
        crop->SetVOI( voi );
        crop->Update();
 
@@ -688,7 +704,12 @@ void marRAW2Files::saveVolume( std::string directory, std::string name, vtkImage
 
 
        vtkImageChangeInformation* change = vtkImageChangeInformation::New();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        change->SetInput( crop->GetOutput() );
+#else
+       change->SetInputData( crop->GetOutput() );
+#endif
 
 
 //     change->SetExtentTranslation( -ext[0], -ext[2], -ext[4] );
@@ -705,7 +726,14 @@ void marRAW2Files::saveVolume( std::string directory, std::string name, vtkImage
    std::string nameMW           = filename+".mhd";
 
        vtkMetaImageWriter *writer = vtkMetaImageWriter::New( );
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        writer->SetInput( change->GetOutput() );
+#else
+       writer->SetInputData( change->GetOutput() );
+#endif
+
        writer->SetFileName( nameMW.c_str() );
        writer->SetFileDimensionality( 3 );
        writer->Write( );