X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Example%2FPrintFile.cxx;h=156c7add619b56064bacbe15a56451b9e3ae1165;hb=fe2d1ed161ad70897d6aaeda19965ffb68f8bb66;hp=6589f220b9768da760cd49265b85f27b187fc1d8;hpb=d29b375607319d00302d599ca698aa931f433e2b;p=gdcm.git

diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx
index 6589f220..156c7add 100644
--- a/Example/PrintFile.cxx
+++ b/Example/PrintFile.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: PrintFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/09/04 15:34:40 $
-  Version:   $Revision: 1.52 $
+  Date:      $Date: 2005/09/06 11:10:03 $
+  Version:   $Revision: 1.55 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -179,7 +179,7 @@ int main(int argc, char *argv[])
          loadMode |= gdcm::LD_NOSEQ;
    }
 
-   int level = am->ArgMgrGetInt("level", 2);
+   int level = am->ArgMgrGetInt("level", 1);
 
    int forceLoadNb;
    uint16_t *elemsToForceLoad 
@@ -187,7 +187,7 @@ int main(int argc, char *argv[])
 
    bool showlut = ( 0 != am->ArgMgrDefined("SHOWLUT") );
 
-   bool ddict = am->ArgMgrDefined("dict");
+   bool ddict = am->ArgMgrDefined("dict") ? true : false;
    char *dict = 0;
 
    if (ddict)
@@ -259,7 +259,8 @@ int main(int argc, char *argv[])
       nX=f->GetXSize();
       nY=f->GetYSize();
       nZ=f->GetZSize();
-      std::cout << " DIMX=" << nX << " DIMY=" << nY << " DIMZ=" << nZ << std::endl;
+      std::cout << " DIMX=" << nX << " DIMY=" << nY << " DIMZ=" << nZ 
+                << std::endl;
 
       pixelType    = f->GetPixelType();
       sPP          = f->GetSamplesPerPixel();
@@ -370,11 +371,30 @@ int main(int argc, char *argv[])
          std::cout << "Try LUT Data "<< std::endl;
          ShowLutData(f);
       }
+
+      if( !f->gdcm::Document::IsReadable())
+     {
+         std::cout <<std::endl<<fileName<<" is NOT 'gdcm parsable'"<<std::endl;
+      }
      
       if (f->IsReadable())
          std::cout <<std::endl<<fileName<<" is Readable"<<std::endl;
-      else
-         std::cout <<std::endl<<fileName<<" is NOT Readable"<<std::endl;
+      else if ( f->GetSeqEntry(0x0041,0x1010) )
+      {
+         std::cout <<std::endl<<fileName<<" looks like a 'PAPYRUS image' file"
+                   <<std::endl;
+      }
+      else if ( f->GetSeqEntry(0x0004,0x1220) )
+      {
+         std::cout <<std::endl<<fileName<<" looks like a 'DICOMDIR file'"
+                   <<std::endl;
+      }
+      else 
+      {
+         std::cout <<std::endl<<fileName<<" doesn't look like an image file "
+             <<std::endl; 
+      }
+ 
       std::cout<<std::flush;
       delete f;
       delete fh;
@@ -391,13 +411,16 @@ int main(int argc, char *argv[])
                                  it != fileList.end();
                                  ++it )
       {
+         std::cout << std::endl<<" Start processing :[" << it->c_str() << "]"
+                   << std::endl;
          f = new gdcm::File();
          f->SetLoadMode(loadMode);
          f->SetFileName( it->c_str() );
 
          for (int ri=0; ri<forceLoadNb; ri++)
          {
-            printf("%04x,%04x\n",elemsToForceLoad[2*ri], elemsToForceLoad[2*ri+1]);
+            printf("%04x,%04x\n",elemsToForceLoad[2*ri], 
+                                 elemsToForceLoad[2*ri+1]);
             f->AddForceLoadElement((uint32_t)elemsToForceLoad[2*ri], 
                                    (uint32_t)elemsToForceLoad[2*ri+1]); 
          }
@@ -411,8 +434,9 @@ int main(int argc, char *argv[])
                       << std::endl;
             std::cout << "or it's not a Dicom File, or its 'header' is bugged" 
                       << std::endl;
-            std::cout << "use 'PrintFile filein=... debug' to try to guess the pb"
-                   << std::endl;
+            std::cout << "use 'PrintFile filein=... debug' "
+                      << "to try to guess the pb"
+                      << std::endl;
             delete f;
             continue;
          }