X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIODicomImageReader2.cpp;h=5b6861ccf46fc63ce510dfa4f6526c9ba41cbee0;hb=239bc68ced8df17fbab55fa97c826e2cb20aec76;hp=fc7f56b7cee601b21c03d7eb3bc53a0bd177d5d9;hpb=9f388912ec5438d32d4da941152eaae550f796ed;p=creaImageIO.git

diff --git a/src/creaImageIODicomImageReader2.cpp b/src/creaImageIODicomImageReader2.cpp
index fc7f56b..5b6861c 100644
--- a/src/creaImageIODicomImageReader2.cpp
+++ b/src/creaImageIODicomImageReader2.cpp
@@ -1,14 +1,42 @@
-#include <creaImageIODicomImageReader2.h>
-#include "gdcmStringFilter.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 <creaImageIOSystem.h>
+#include "creaImageIODicomImageReader2.h"
+#include <creaImageIOTreeAttributeDescriptor.h>
+#include "gdcmStringFilter.h"
+#include "gdcmUIDs.h"
 #include "boost/filesystem/path.hpp"
 
-#include <creaImageIOTreeAttributeDescriptor.h>
+#include "vtkGDCMImageReader.h"
 #include <vtkStringArray.h>
-#include <creaImageIOGimmick.h>
-
+#if defined(_WIN32)
+#pragma warning(disable: 4996)
+#endif
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -59,6 +87,16 @@ namespace creaImageIO
 	  im = 0;
       }
     return im;
+    //gdcm::Tag grouplength(0x0000,0x0000);
+    //gdcm::DataElement de(gdcm::Tag(0x0000, 0x0000));
+    //de.SetByteValue("0",gdcm::VR::UL);
+    //
+    //
+    //gdcm::UIDs::GetUIDString(gdcm::UIDS::uid_1_2_840_10008_1_1),gdcm::VR::UI);
+
+    //std::ostream os;
+    //de.Write(&os);
+
   }
 
   //=====================================================================
@@ -118,8 +156,6 @@ namespace creaImageIO
   void DicomImageReader::ReadAttributes(const std::string& filename, 
 		      std::map<std::string,std::string>& attr)
   {
-    GimmickMessage(2,"Reading attributes from DICOM file '"
-		   <<filename<<"'"<<std::endl);
 
    
       gdcm::Reader reader;
@@ -134,7 +170,7 @@ namespace creaImageIO
 			  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" )
@@ -151,6 +187,12 @@ namespace creaImageIO
 			  {
 				  uint16_t el;
 				  uint16_t gr;
+                      {
+            gdcm::Attribute<  0x0008,0x103e> at;
+            std::string sr;
+            at.SetValue(sr);
+            
+        }
 				  tree::AttributeDescriptor::GetDicomGroupElementFromKey(i->first,gr,el);
 				  //if ( ( gr!=0 ) && ( el!=0 ) )
 				  const gdcm::Tag tag(gr, el);
@@ -201,7 +243,7 @@ void DicomImageReader::ReadAttributes2(const std::string& filename,
 			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" )