X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=tools%2FclitkDicomInfo.cxx;h=183f09febbe63ca7eea4819590c11b57e531ad3f;hb=d9c8c6e6c759655fc24d05d47b962d2ba574b95d;hp=4c31e0922807322e19c93404cd37cb6016d6c1fc;hpb=0b7c9b1e1215634b02cbd38d4e4ba101d6111ba8;p=clitk.git

diff --git a/tools/clitkDicomInfo.cxx b/tools/clitkDicomInfo.cxx
index 4c31e09..183f09f 100644
--- a/tools/clitkDicomInfo.cxx
+++ b/tools/clitkDicomInfo.cxx
@@ -1,9 +1,9 @@
 /*=========================================================================
   Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
 
-  Authors belong to: 
+  Authors belong to:
   - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -14,7 +14,7 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
+===========================================================================**/
 /**
    -------------------------------------------------
    * @file   clitkDicomInfo.cxx
@@ -28,9 +28,16 @@
 
 // itk (gdcm) include
 #include "gdcmFile.h"
+#if GDCM_MAJOR_VERSION >= 2
+#include "gdcmReader.h"
+#include "gdcmPrinter.h"
+#include "gdcmDict.h"
+#include "gdcmStringFilter.h"
+#endif
 
 //--------------------------------------------------------------------
-int main(int argc, char * argv[]) {
+int main(int argc, char * argv[])
+{
 
   // init command line
   GGO(clitkDicomInfo, args_info);
@@ -38,16 +45,64 @@ int main(int argc, char * argv[]) {
   // check arg
   if (args_info.inputs_num == 0) return 0;
 
+  // Study ID
+ #if GDCM_MAJOR_VERSION >= 2
+ if (args_info.studyID_flag) {
+    std::set<std::string> l;
+    for(unsigned int i=0; i<args_info.inputs_num; i++) {
+      gdcm::Reader reader;
+      reader.SetFileName(args_info.inputs[i]);
+      std::set<gdcm::Tag> tags;
+      gdcm::Tag StudyInstanceUIDTag(0x0020, 0x000d);
+      gdcm::Tag SeriesDateTag(0x0008, 0x0021);
+      tags.insert(StudyInstanceUIDTag);
+      tags.insert(SeriesDateTag);
+      if (reader.ReadSelectedTags(tags)) {
+        gdcm::StringFilter sf;
+        sf.SetFile(reader.GetFile());
+        std::pair<std::string, std::string> p = sf.ToStringPair(StudyInstanceUIDTag);
+        std::pair<std::string, std::string> d = sf.ToStringPair(SeriesDateTag);
+        if (args_info.uniq_flag) {
+          if (l.insert(p.second).second == true) {
+            if (args_info.filename_flag)
+              std::cout << args_info.inputs[i] << " " << p.second << " " << d.second << std::endl;
+            else
+              std::cout << p.second << std::endl;
+          }
+        }
+        else {
+          if (args_info.filename_flag)
+            std::cout << args_info.inputs[i] << " " << p.second << " " << d.second << std::endl;
+          else
+            std::cout << p.second << std::endl;
+        }
+      } // tag not found
+    }
+  }
+#endif
+
   // Loop files
+ if (!args_info.studyID_flag)
   for(unsigned int i=0; i<args_info.inputs_num; i++) {
+    if (args_info.filename_flag) std::cout << args_info.inputs[i] << std::endl;
+#if GDCM_MAJOR_VERSION >= 2
+    gdcm::Reader reader;
+    reader.SetFileName(args_info.inputs[i]);
+    reader.Read();
+    gdcm::Printer printer;
+    printer.SetFile(reader.GetFile());
+    printer.SetStyle(gdcm::Printer::VERBOSE_STYLE);
+    printer.Print( std::cout );
+#else
     gdcm::File *header = new gdcm::File();
     header->SetFileName(args_info.inputs[i]);
-    header->SetMaxSizeLoadEntry(16384);
+    header->SetMaxSizeLoadEntry(163840);
     header->Load();
     header->Print();
+#endif
   }
 
-  // this is the end my friend  
+  // this is the end my friend
   return 0;
 }
 //--------------------------------------------------------------------