#2951 BBTK Feature New Normal - Replace String box with vector functionality

[bbtk.git] / packages / gdcmvtk / src / bbgdcmvtkGetXCoherentInfoGdcmReader.cxx

diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx
index 5e927d075c4ac797505a16f5c0ba35ead05cc871..105e782da39bb023ec4b70cfa860ace18527ff23 100644 (file)
--- a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx
+++ b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx
@@ -1,3 +1,29 @@
+/*
+# ---------------------------------------------------------------------
+#
+# 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"
 
@@ -90,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();
@@ -105,16 +136,19 @@ void GetXCoherentInfoGdcmReader::Process()
 {
  // Read the *first* image file (a SET of file names is given as input) 
        gdcm::Reader *read = new gdcm::Reader();
-       reader->SetFileName( bbGetInputIn()[0].c_str());
+       reader->SetFileName( bbGetInputIn()[0].c_str() );
   
        bool res = read->Read();  
-   if ( !res )
-   {
-      delete read;
-      bbSetOutputOut(0);
-      return;
-   }
+       if ( !res )
+       {
+       delete read;
+               printf("EED GetXCoherentInfoGdcmReader::Process resultImage NULL\n");
+       bbSetOutputOut(NULL);
+       return;
+       }
     
+
+
  // Get info from the first image file
    const gdcm::File &f = read->GetFile();
    int i;
@@ -172,7 +206,6 @@ void GetXCoherentInfoGdcmReader::Process()
    }
    reader->SetFileNames(files);
    reader->Update();
-   reader->GetOutput();
    bbSetOutputOut( reader->GetOutput() );
 }
 #endif