User may now choose whether he wants to load Shadow Groups and Sequences or not

diff --git a/Example/PrintDocument.cxx b/Example/PrintDocument.cxx
index c2a6ceec709e6e60d26d5e5a91e50b081c9b2e7f..4d3a2e3831962736882fd4b5c703a9d6dafb062a 100644 (file)
--- a/Example/PrintDocument.cxx
+++ b/Example/PrintDocument.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: PrintDocument.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/02 10:06:31 $
-  Version:   $Revision: 1.11 $
+  Date:      $Date: 2005/04/05 10:28:59 $
+  Version:   $Revision: 1.12 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,20 +16,24 @@
                                                                                 
 =========================================================================*/
 #include "gdcmFile.h"
+#include "gdcmDebug.h"
 
 #include <iostream>
 
 int main(int argc, char *argv[])
 {
  
-   gdcm::File *e1;
+   gdcm::File *e1= new gdcm::File();;
    std::string fileName;   
 
-   if (argc != 2) {
+   if (argc == 1) {
       std::cout << " Usage : "
                 << argv[0] 
-                << " filename."
+                << " filename"
+                << " printLevel debug "
+                << "short (=NOSEQ + NOSHADOW)" 
                 << std::endl;
+       return 0;
    }
 
    if (argc > 1) {
@@ -38,11 +42,21 @@ int main(int argc, char *argv[])
       fileName += GDCM_DATA_ROOT;
       fileName += "/test.acr";
    }
-   
-   e1= new gdcm::File( fileName.c_str() );
 
-   e1->SetPrintLevel(2);
-   
+   if (argc > 2) 
+   {
+      int level = atoi(argv[2]);   
+      e1->SetPrintLevel(level);
+   }
+
+   if (argc > 3)
+      gdcm::Debug::DebugOn(); 
+
+   if (argc > 4)
+      e1->SetLoadMode(NO_SEQ | NO_SHADOW);
+
+   e1->Load( fileName.c_str() );
+
    e1->Print();
       
    std::cout << "\n\n" << std::endl;        

diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx
index 604bd799b063f0fb996910de7ac983ecf087b531..6135c783aa29c9efe929b31f5c9c012aee98e439 100644 (file)
--- a/Example/PrintFile.cxx
+++ b/Example/PrintFile.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: PrintFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/03/02 17:23:32 $
-  Version:   $Revision: 1.30 $
+  Date:      $Date: 2005/04/05 10:28:59 $
+  Version:   $Revision: 1.31 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -25,31 +25,34 @@ int main(int argc, char *argv[])
 {
    gdcm::File *e1;
    gdcm::FileHelper   *f1;
-   std::string fileName;   
-   if (argc != 2) 
+   std::string fileName;
+  
+   if (argc == 1) 
    {
-      std::cout << " usage : PrintDocument fileName printLevel debug" 
+      std::cout << " usage : PrintFile fileName printLevel debug "
+          << "short (=NOSEQ + NOSHADOW)" 
                 << std::endl;
+    return 0;
    }
 
+   e1 = new gdcm::File();
+
    if (argc > 1) 
    {
       fileName=argv[1];
    } 
-   else 
-   {
-      fileName += GDCM_DATA_ROOT;
-      fileName += "/test.acr";
-   }
-
 
    if (argc > 3)
       gdcm::Debug::DebugOn();
+
+   if (argc > 4)
+      e1->SetLoadMode(NO_SEQ | NO_SHADOW);
    
-   e1 = new gdcm::File( fileName.c_str() );
+   e1->Load( fileName.c_str() );
+
    f1 = new gdcm::FileHelper(e1);
 
-   if (argc > 2) 
+   if (argc > 2)  // keep it here (f1 needs to be constructed !)
    {
       int level = atoi(argv[2]);   
       f1->SetPrintLevel(level);