From: jpr <jpr>
Date: Mon, 17 Jul 2006 13:24:59 +0000 (+0000)
Subject: Minor changes
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=ed8f0888f5c1f2bfb64d5759a5dc9590858b31f2;p=gdcm.git

Minor changes
---

diff --git a/Example/AnonymizeNoLoad.cxx b/Example/AnonymizeNoLoad.cxx
index 12a24e48..5e66ae82 100644
--- a/Example/AnonymizeNoLoad.cxx
+++ b/Example/AnonymizeNoLoad.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: AnonymizeNoLoad.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/03/27 19:02:43 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2006/07/17 13:25:00 $
+  Version:   $Revision: 1.18 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -43,7 +43,7 @@ int main(int argc, char *argv[])
    "       noshadowseq: user doesn't want to load Private Sequences           ",
    "       noshadow   : user doesn't want to load Private groups (odd number) ",
    "       noseq      : user doesn't want to load Sequences                   ",
-   "       debug      : user wants to run the program in 'debug mode'         ",
+   "       debug      : developper wants to run the program in 'debug mode'   ",
    FINISH_USAGE
 
    // ----- Initialize Arguments Manager ------
diff --git a/Example/MakeDicomDir.cxx b/Example/MakeDicomDir.cxx
index 2fc7051e..2cb6d118 100644
--- a/Example/MakeDicomDir.cxx
+++ b/Example/MakeDicomDir.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: MakeDicomDir.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/01/26 15:52:42 $
-  Version:   $Revision: 1.20 $
+  Date:      $Date: 2006/07/17 13:25:00 $
+  Version:   $Revision: 1.21 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -22,6 +22,8 @@
 #include "gdcmDebug.h"
 #include "gdcmArgMgr.h"
 
+#include <sys/times.h>
+
 #include <iostream>
 
 /**
@@ -97,6 +99,8 @@ int main(int argc, char *argv[])
 
    gdcm::DicomDir *dcmdir;
 
+
+   
    // we ask for Directory parsing
 
    dcmdir = gdcm::DicomDir::New( );
@@ -104,7 +108,14 @@ int main(int argc, char *argv[])
    dcmdir->SetLoadMode(loadMode);
    dcmdir->SetDirectoryName(dirName);
    //dcmdir->SetParseDir(true);
+   
+      struct tms tms1, tms2; // Time measurements
+      times(&tms1);   
    dcmdir->Load();
+      times(&tms2);      
+      std::cout 
+        << (long) ((tms2.tms_utime)  - (tms1.tms_utime)) 
+        << std::endl;
 
    if ( gdcm::Debug::GetDebugFlag() )
       std::cout << "======================= End Parsing Directory" << std::endl;
diff --git a/Example/PrintDicomDir.cxx b/Example/PrintDicomDir.cxx
index dc82ec88..76fb0b51 100644
--- a/Example/PrintDicomDir.cxx
+++ b/Example/PrintDicomDir.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: PrintDicomDir.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/01/18 15:45:21 $
-  Version:   $Revision: 1.32 $
+  Date:      $Date: 2006/07/17 13:27:04 $
+  Version:   $Revision: 1.33 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -145,6 +145,7 @@ int main(int argc, char* argv[])
             { // on degouline les STUDY de ce patient
                std::cout << "--- Stud.descr:["    << st->GetEntryString(0x0008, 0x1030) << "]"; // Study Description 
                std::cout << " Stud.ID:["          << st->GetEntryString(0x0020, 0x0010) << "]"; // Study ID
+               std::cout << " Stud.Inst.UID:["    << st->GetEntryString(0x0020, 0x000d) << "]"; // Study Instance UID
                std::cout << std::endl; 
                st = pa->GetNextStudy();
             }
@@ -170,6 +171,7 @@ int main(int argc, char* argv[])
             { // on degouline les STUDY de ce patient
                std::cout << "--- Stud.descr:["    << st->GetEntryString(0x0008, 0x1030) << "]"; // Study Description 
                std::cout << " Stud.ID:["          << st->GetEntryString(0x0020, 0x0010) << "]"; // Study ID
+               std::cout << " Stud.Inst.UID:["    << st->GetEntryString(0x0020, 0x000d) << "]"; // Study Instance UID       
                std::cout << std::endl;
 
                se = st->GetFirstSerie();
@@ -178,6 +180,7 @@ int main(int argc, char* argv[])
                   std::cout << "--- --- Ser.Descr:["<< se->GetEntryString(0x0008, 0x103e)<< "]";  // Series Description
                   std::cout << " Ser.nb:["          << se->GetEntryString(0x0020, 0x0011);        // Series number
                   std::cout << "] Mod.:["           << se->GetEntryString(0x0008, 0x0060) << "]"; // Modality
+                  std::cout << " Serie Inst.UID.:[" <<  se->GetEntryString(0x0020, 0x000e) << "]";  // Series Instance UID
                   std::cout << std::endl;    
                   se = st->GetNextSerie();   
                }
diff --git a/Example/ToInTag.cxx b/Example/ToInTag.cxx
index dde01a4c..85b08587 100755
--- a/Example/ToInTag.cxx
+++ b/Example/ToInTag.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: ToInTag.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/06/30 09:58:08 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2006/07/17 13:24:59 $
+  Version:   $Revision: 1.7 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -68,7 +68,7 @@ int main(int argc, char *argv[])
    "           0x0021, 0x1040 : 'FRAME INDEX'                                 ",
    "           0x0020, 0x0012 : 'SESSION INDEX'  (Acquisition Number)         ",
    " usage:                                                                   ",
-   " PhilipsToBrucker dirin=rootDirectoryName                                 ",
+   " ToInTag          dirin=rootDirectoryName                                 ",
    "                  dirout=outputDirectoryName                              ",
    "                  {  [keep= list of seriesNumber to process]              ",
    "                   | [drop= list of seriesNumber to ignore] }             ",