Feature #1764

[creaImageIO.git] / src / creaImageIODicomImageReader2.cpp

diff --git a/src/creaImageIODicomImageReader2.cpp b/src/creaImageIODicomImageReader2.cpp
index 7ae643b89696b20da733a34c3c9d59337343031c..5e8b5705c75bc68538fb4a5d3818520cb6a8649a 100644 (file)
--- a/src/creaImageIODicomImageReader2.cpp
+++ b/src/creaImageIODicomImageReader2.cpp
@@ -1,6 +1,34 @@
+/*
+# ---------------------------------------------------------------------
+#
+# 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 <creaImageIODicomImageReader2.h>
 #include "gdcmStringFilter.h"
-
+#include "vtkGDCMImageReader.h"
 
 #include <creaImageIOSystem.h>
 #include "boost/filesystem/path.hpp"
@@ -9,7 +37,7 @@
 #include <vtkStringArray.h>
 #include <creaImageIOGimmick.h>
 
-
+#include "gdcmUIDs.h"
 #ifdef _DEBUG
 #define new DEBUG_NEW
 #endif
@@ -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);
+
   }
 
   //=====================================================================
@@ -94,7 +132,7 @@ namespace creaImageIO
   
 
        void DicomImageReader::getAttributes(const std::string filename, 
-               std::map <std::string , std::string> &infos,std::vector<std::string> i_attr)
+               std::map <std::string , std::string> &infos, std::vector<std::string> i_attr)
        {
                gdcm::Reader reader;
                reader.SetFileName( filename.c_str() );
@@ -112,8 +150,8 @@ namespace creaImageIO
                                }
                        }
                }
-               
        }
+
   //=====================================================================
   void DicomImageReader::ReadAttributes(const std::string& filename, 
                      std::map<std::string,std::string>& attr)
@@ -151,6 +189,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);