X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FmakeDicomDir.cxx;h=948e24f7e38758ba7cb6d09f5b0f9b5aef3819df;hb=6e9466fd9b712361db37c64dfc5d8a7efaae59f0;hp=02146feb4caf13e1ae7d82a48d9eadde0fb8fc43;hpb=a12b9768f8dad74ef6b76c5c77b312ebab679625;p=gdcm.git

diff --git a/Example/makeDicomDir.cxx b/Example/makeDicomDir.cxx
index 02146feb..948e24f7 100644
--- a/Example/makeDicomDir.cxx
+++ b/Example/makeDicomDir.cxx
@@ -1,34 +1,26 @@
-#include <iostream>
-#include "gdcm.h"
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: makeDicomDir.cxx,v $
+  Language:  C++
+  Date:      $Date: 2005/01/18 07:55:16 $
+  Version:   $Revision: 1.11 $
+                                                                                
+  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
+  l'Image). All rights reserved. See Doc/License.txt or
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
 #include "gdcmDocEntry.h"
 #include "gdcmDicomDir.h"
 #include "gdcmDicomDirPatient.h"
 #include "gdcmDirList.h"
 
-#include <fstream>
-#ifdef GDCM_NO_ANSI_STRING_STREAM
-#  include <strstream>
-#  define  ostringstream ostrstream
-# else
-#  include <sstream>
-#endif
-
-#define  ostringstream ostrstream
-
-#include <sys/types.h>
-#include <errno.h>
-
-// for Directory pb
-#ifdef _MSC_VER 
-   #include <windows.h> 
-   #include <direct.h>
-#else
-   #include <dirent.h>   
-   #include <unistd.h>
-#endif
-
-#include <vector>
-#include <algorithm>
+#include <iostream>
 
 // ---
 void StartMethod(void *toto) {
@@ -52,7 +44,7 @@ void EndMethod(void *toto) {
   */  
 
 int main(int argc, char* argv[]) {
-   gdcmDicomDir *dcmdir;
+   gdcm::DicomDir *dcmdir;
    std::string dirName;   
 
    if (argc > 1)
@@ -60,33 +52,21 @@ int main(int argc, char* argv[]) {
    else
       dirName = GDCM_DATA_ROOT;
 
-   dcmdir=new gdcmDicomDir(dirName);
-      
+   dcmdir = new gdcm::DicomDir(dirName, true); // we ask for Directory parsing
+
    dcmdir->SetStartMethod(StartMethod, (void *) NULL);
    dcmdir->SetEndMethod(EndMethod);
-    std::cout << "---before ParseDirectory------------------" << std::endl;   
-   dcmdir->ParseDirectory();   
-   std::cout << "---after ParseDirectory------------------" << std::endl;
    
-   ListDicomDirPatient lp = dcmdir->GetDicomDirPatients();
-   if (! lp.size() ) 
+   if ( !dcmdir->GetFirstEntry() ) 
    {
       std::cout << "makeDicomDir: no patient list present. Exiting."
                 << std::endl;
       return 1;
    }
-   gdcmDicomDirPatient *p = *(lp.begin());
-   dcmdir->SetPrintLevel(2);
-   p->Print();
-   std::cout << "---------------------" << std::endl;   
-
-   dcmdir->SetPrintLevel(-1);
-   dcmdir->Print();
-
-   dcmdir->Write("NewDICOMDIR");
+    
+   dcmdir->WriteDicomDir("NewDICOMDIR");
    std::cout<<std::flush;
 
    delete dcmdir;
-
    return 0;
 }