X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fgdcmvtk%2Fsrc%2FbbgdcmvtkGetXCoherentInfoGdcmReader.cxx;h=5c309ae42f2f6e3cdf787ab2dc82596eb7852b7e;hb=501ddfbdce64c1cab01deeb4b7d0634ae2236c1d;hp=eb9a13454a71d5fb92d88f4331e1037c610a98bd;hpb=a26b760bbfe886312cbe54bd83b7211f621edf80;p=bbtk.git

diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx
index eb9a134..5c309ae 100644
--- a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx
+++ b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx
@@ -1,12 +1,40 @@
+/*
+# ---------------------------------------------------------------------
+#
+# 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 "bbgdcmvtkGetXCoherentInfoGdcmReader.h"
 #include "bbgdcmvtkPackage.h"
 
 #include "gdcmFile.h"
 #include "vtkImageData.h"
 #include <vtkIndent.h>
+
 #if defined USE_GDCM
-#include "gdcmFileHelper.h"
+	#include "gdcmFileHelper.h"
 #endif
+
 #if defined USE_GDCM2
 	#include <gdcmReader.h>
 	#include <gdcmImageHelper.h>
@@ -88,6 +116,11 @@ void GetXCoherentInfoGdcmReader::Process()
       reader=NULL;
    }
    reader = vtkGdcmReader::New();
+	
+	//EED 21 mars 2012  FLIP probleme  ..PLOP..
+	reader->SetFlipY(false);
+
+	
    //reader->SetFileName( bbGetInputIn().c_str() );
    reader->SetCoherentFileList(l);
    reader->Update();
@@ -95,7 +128,8 @@ void GetXCoherentInfoGdcmReader::Process()
 
    bbSetOutputOut( reader->GetOutput() );
 }
-#endif USE_GDCM
+#endif
+// endif USE_GDCM
 
 #if defined USE_GDCM2
 void GetXCoherentInfoGdcmReader::Process()
@@ -166,20 +200,21 @@ void GetXCoherentInfoGdcmReader::Process()
    {
 	  const std::string &f = *it;
       files->InsertNextValue( f.c_str() );
-    }
+   }
    reader->SetFileNames(files);
    reader->Update();
    reader->GetOutput();
    bbSetOutputOut( reader->GetOutput() );
 }
-#endif USE_GDCM2
+#endif
+// endif USE_GDCM2
 
 void GetXCoherentInfoGdcmReader::bbUserSetDefaultValues()
 {
    std::vector<std::string> init;
    init.push_back("");
    bbSetInputIn(init);  
-   reader=NULL;
+   //reader=NULL;   /// \TODO fixme JPR
 }
 
 void GetXCoherentInfoGdcmReader::bbUserInitializeProcessing()