#3185 creaImageIO Feature New Normal - Clean code

[creaImageIO.git] / src / creaImageIODicomScanner.cpp

diff --git a/src/creaImageIODicomScanner.cpp b/src/creaImageIODicomScanner.cpp
index 43706c156436c2edbf83bf1a27b74859ec3dffaa..8f7dbc1d86f884867eae8a8ef318aaf8c1da0b2e 100644 (file)
--- a/src/creaImageIODicomScanner.cpp
+++ b/src/creaImageIODicomScanner.cpp
@@ -1,20 +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 <creaImageIODicomScanner.h>
-#include "creaImageIOSystem.h"
+
 #include <boost/filesystem.hpp>
 #include "boost/algorithm/string.hpp"
-
-
-
-#include <creaImageIOSystem.h>
 #include "boost/filesystem/path.hpp"
 
-#include <creaImageIOTreeAttributeDescriptor.h>
-#include <vtkStringArray.h>
-#include <creaImageIOGimmick.h>
-#include <gdcmDirectory.h>
-
 #include <fstream>
-
+#if defined(_WIN32)
+#pragma warning(disable: 4996)
+#endif
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -133,20 +153,9 @@ void DicomImageScanner::ReadAttributes(const std::string& filename,
                  gdcm::Scanner::TagToValue::const_iterator it = mapping.begin();
 
                  std::map<std::string, std::string>::iterator i;
-                 int j= 0;
-
-                 
                  
                  for (;it != mapping.end(); ++it)
-                 {
-                                       /*std::stringstream val;
-                                       val <<  "D";
-                                       val << std::hex << it->first.GetGroup() ;
-                                       val << "_";;
-                                       val << std::hex <<  it->first.GetElement();
-                                       var >> key*/
-                                char key[12] ;
-                                 
+                 {              char key[12] ;
                                  sprintf(key,"D%04x_%04x", it->first.GetGroup(), it->first.GetElement());
                                  attr[key] = irclean(it->second);
                  }
@@ -160,7 +169,7 @@ void DicomImageScanner::ReadAttributes(const std::string& filename,
                        if ( attr.find("D0004_1500") != attr.end())
                        {
                                boost::filesystem::path full_path(filename);
-                               std::string f = full_path.leaf();
+                               std::string f = full_path.leaf().string();
                                attr["D0004_1500"] = f;
                        }
                        if ( attr.find("FullFileName")!= attr.end())