X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FmakeDicomDir.cxx;h=4ffd464bf6af83313f0ce96a2457076a350e25a9;hb=8da9df62c47908e7b9a67238a6c12b92ba6cae7a;hp=8b0c920847aefc069129fa09344d5c9752413aa9;hpb=81fe774739a1629471fcc2705549fa56dad44a70;p=gdcm.git

diff --git a/Example/makeDicomDir.cxx b/Example/makeDicomDir.cxx
index 8b0c9208..4ffd464b 100644
--- a/Example/makeDicomDir.cxx
+++ b/Example/makeDicomDir.cxx
@@ -1,3 +1,20 @@
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: makeDicomDir.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/11/16 04:26:18 $
+  Version:   $Revision: 1.8 $
+                                                                                
+  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 <iostream>
 #include "gdcm.h"
 #include "gdcmDocEntry.h"
@@ -5,31 +22,6 @@
 #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>
-
 // ---
 void StartMethod(void *toto) {
   (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,38 +52,22 @@ int main(int argc, char* argv[]) {
    else
       dirName = GDCM_DATA_ROOT;
 
-   dcmdir=new gdcmDicomDir(dirName);
-   std::cout << "---after constructor; Print as a gdcmDocument ------" << std::endl;
-   ((gdcmDocument *)dcmdir)->Print();
-   std::cout << "---after constructor; Print as a DICOMDIR     ------" << std::endl;
-   dcmdir->Print();
+   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();
+   gdcm::ListDicomDirPatient lp = dcmdir->GetDicomDirPatients();
    if (! lp.size() ) 
    {
       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;
 }