-#include <creaImageIODicomImageReader.h>
-
-#include <vtkGdcmReader.h>
-
+/*
+# ---------------------------------------------------------------------
+#
+# 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 <creaImageIODicomImageReader.h>
+#include <vtkGdcmReader.h>
#include <creaImageIOSystem.h>
#include "boost/filesystem/path.hpp"
GDCM_NAME_SPACE::Document*doc;
GDCM_NAME_SPACE::File* file = GDCM_NAME_SPACE::File::New();
file->SetLoadMode( GDCM_NAME_SPACE::LD_ALL);
- file->SetFileName(filename.c_str());
+ file->SetFileName( filename );
file->Load();
bool ok = file->IsReadable();
if(!ok)
{
doc = (GDCM_NAME_SPACE::Document*)file;
ok = doc->IsReadable();
- }
+ } // if ok
file->Delete();
return ok;
}
//=====================================================================
vtkImageData* DicomImageReader::ReadImage(const std::string& filename)
{
+printf("EED DicomImageReader::ReadImage Start\n");
vtkImageData* im = 0;
try
- {
- mReader->SetFileName(filename.c_str());
- mReader->Update();
- im = vtkImageData::New();
- im->ShallowCopy(mReader->GetOutput());
- }
- catch (...)
- {
- if (im!=0) im->Delete();
- im = 0;
- }
+ {
+printf("EED DicomImageReader::ReadImage 1\n");
+ mReader->SetFileName(filename.c_str());
+printf("EED DicomImageReader::ReadImage 2 aaaaaaaaaaaaaaaaaaaaaaaaaaa\n");
+ mReader->Update();
+printf("EED DicomImageReader::ReadImage 3 bbbbbbbbbbbbbbbbbbbbbbbbbbb\n");
+ im = vtkImageData::New();
+printf("EED DicomImageReader::ReadImage 4\n");
+ im->ShallowCopy(mReader->GetOutput());
+printf("EED DicomImageReader::ReadImage 5\n");
+ } catch (...) {
+printf("EED DicomImageReader::ReadImage 6\n");
+ if (im!=0) im->Delete();
+ im = 0;
+ }
+printf("EED DicomImageReader::ReadImage End\n");
+
return im;
}
if ( i->first == "D0004_1500" )
{
boost::filesystem::path full_path(filename);
- std::string f = full_path.leaf();
+ std::string f = full_path.leaf().string();
i->second = f;
}
else if ( i->first == "FullFileName" )