X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Fkernel%2FmarDicomBase.cpp;h=9d376c0b00b0324fbff611012020a881e856459d;hb=f9901e756bb82bd333310b47607875331616bb29;hp=ef8300b113077c6b878a64002fb4f51042a52b9f;hpb=3fdde2fc9525d85df4fcdd49dab89ab19266cf84;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/kernel/marDicomBase.cpp b/lib/maracasVisuLib/src/kernel/marDicomBase.cpp
index ef8300b..9d376c0 100644
--- a/lib/maracasVisuLib/src/kernel/marDicomBase.cpp
+++ b/lib/maracasVisuLib/src/kernel/marDicomBase.cpp
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 
 #include "marDicomBase.h"
 
@@ -189,7 +214,7 @@ void marRAWFiles::loadActualSerie(wxGauge* gauge )
 
 	fscanf(ff,"%s",tmp);
 	fscanf(ff,"%s",tmp);
-	//int type =	atoi(tmp);  // 0
+	//int type =	atoi(tmp);  // 0 // JPRx
 
 	fscanf(ff,"%s",tmp);
 	fscanf(ff,"%s",tmp);
@@ -312,7 +337,7 @@ void marRAW2AsciiFiles::loadActualSerie(wxGauge* gauge )
 	// type
 	fscanf(ff,"%s",tmp);
 	fscanf(ff,"%s",tmp);
-	//int type =	atoi(tmp);  // 300
+	//int type =	atoi(tmp);  // 300  // JPRx
 
 	//size x,y,z
 	fscanf(ff,"%s",tmp);
@@ -435,7 +460,7 @@ void marRAW2Files::loadActualSerie(wxGauge* gauge )
 	// type
 	fscanf(ff,"%s",tmp);
 	fscanf(ff,"%s",tmp);
-	//int type =	atoi(tmp);  // 200
+	//int type =	atoi(tmp);  // 200  // JPRx
 
 	//size x,y,z
 	fscanf(ff,"%s",tmp);
@@ -608,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;
@@ -637,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
 
 }
 // -------------------------------------------------------------------------
@@ -650,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();
 
@@ -663,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] );
@@ -680,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( );