X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FPrintFile.cxx;h=1a6f11f303245036b8131567a5388d2cea6420c7;hb=b1f5f7058f0c0fdcd92aeac0ced76f1c9738daa1;hp=dcadfabde4387d18426c4ebff35af75fa4fab022;hpb=4d563fbf8db2ff8fdd734a33765a35806cacdd68;p=gdcm.git

diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx
index dcadfabd..1a6f11f3 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/11/07 10:38:56 $
-  Version:   $Revision: 1.70 $
+  Date:      $Date: 2006/01/18 15:45:21 $
+  Version:   $Revision: 1.77 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -49,7 +49,6 @@ void ShowLutData(gdcm::File *f)
          std::string lutDescriptor = sqi->GetEntryString(0x0028,0x3002);
          if (   /*lutDescriptor   == GDCM_UNFOUND*/ 0 )
          {
-            //gdcmWarningMacro( "LUT Descriptor is missing" );
             std::cout << "LUT Descriptor is missing" << std::endl;
             return;
          }
@@ -68,8 +67,7 @@ void ShowLutData(gdcm::File *f)
                   << std::endl;
          if ( nbRead != 3 )
          {
-               //gdcmWarningMacro( "Wrong LUT descriptor" );
-               std::cout << "Wrong LUT descriptor" << std::endl;
+            std::cout << "Wrong LUT descriptor" << std::endl;
          }
          //LUT Data (CTX dependent)    
          gdcm::DataEntry *b = sqi->GetDataEntry(0x0028,0x3006); 
@@ -178,7 +176,7 @@ int main(int argc, char *argv[])
       loadMode |= gdcm::LD_NOSHADOWSEQ;
    else 
    {
-   if ( am->ArgMgrDefined("noshadow") )
+      if ( am->ArgMgrDefined("noshadow") )
          loadMode |= gdcm::LD_NOSHADOW;
       if ( am->ArgMgrDefined("noseq") )
          loadMode |= gdcm::LD_NOSEQ;
@@ -220,10 +218,6 @@ int main(int argc, char *argv[])
 
    if ( fileName != 0 ) // ====== Deal with a single file ======
    { 
-      // gdcm::File::IsReadable() is no usable here, because we deal with
-      // any kind of gdcm-Parsable *document* 
-      // not only gdcm::File (as opposed to gdcm::DicomDir)
-
       gdcm::File *f = gdcm::File::New();
       f->SetLoadMode(loadMode);
       f->SetFileName( fileName );
@@ -233,8 +227,17 @@ int main(int argc, char *argv[])
          f->AddForceLoadElement((uint32_t)elemsToForceLoad[2*ri], 
                                 (uint32_t)elemsToForceLoad[2*ri+1] ); 
       }
+// TODO : find why such a polution
+// To avoid polluting the output with messages 
+// 'Last system error was : No such file or directory'
+
+errno = 0; 
+
 
       bool res = f->Load();
+      // gdcm::File::IsReadable() is no usable here, because we deal with
+      // any kind of gdcm-Parsable *document* 
+      // not only gdcm::File (as opposed to gdcm::DicomDir)
       if ( !res )
       {
          std::cout << "Cannot process file [" << fileName << "]" << std::endl;
@@ -352,22 +355,23 @@ int main(int argc, char *argv[])
       // Let's compute 'user friendly' results about 'Orientation'
       // ---------------------------------------------------------
  
-      gdcm::Orientation o;
+      gdcm::Orientation *o = gdcm::Orientation::New();
 
       if ( strImageOrientationPatient != gdcm::GDCM_UNFOUND ||
            strImageOrientationRET     != gdcm::GDCM_UNFOUND )
       {
   
-         gdcm::OrientationType orient = o.GetOrientationType( f );
+         gdcm::OrientationType orient = o->GetOrientationType( f );
  
          std::cout << "TypeOrientation = " << orient << " (-> " 
-                   << o.GetOrientationTypeString(orient) << " )" << std::endl;
+                   << o->GetOrientationTypeString(orient) << " )" << std::endl;
       }
 
-      std::string ori = o.GetOrientation ( f );
+      std::string ori = o->GetOrientation ( f );
       if (ori != "\\" )
          std::cout << "Orientation [" << ori << "]" << std::endl;
  
+      o->Delete();  
 //------------------------------
 
 
@@ -399,7 +403,6 @@ int main(int argc, char *argv[])
                                      &length, &deb, &nbits );
                   if ( nbRead != 3 )
                   {
-                      //gdcmWarningMacro( "Wrong LUT descriptor" );
                       std::cout << "Wrong LUT descriptor" << std::endl;
                   }                                                  
                   gdcm::DataEntry *b = sqi->GetDataEntry(0x0028,0x3006);
@@ -445,13 +448,8 @@ int main(int argc, char *argv[])
          ShowLutData(f);
       }
 
-      //if( !f->gdcm::Document::IsReadable())
-      // Try downcast to please MSVC
-      if ( !((gdcm::Document *)f)->IsReadable() )
-      {
-         std::cout <<std::endl<<fileName<<" is NOT 'gdcm parsable'"<<std::endl;
-      }
-     
+      // Parsability of the gdcm::Document already checked, after Load() !
+      
       if ( f->IsReadable() )
       {
          std::cout <<std::endl<<fileName<<" is Readable"<<std::endl;
@@ -474,7 +472,7 @@ int main(int argc, char *argv[])
  
       std::cout<<std::flush;
       f->Delete();
-      delete fh;
+      fh->Delete();
    }
    else  // ====== Deal with a Directory ======
    {
@@ -567,24 +565,25 @@ int main(int argc, char *argv[])
          // Let's compute 'user friendly' results about 'Orientation'
          // ---------------------------------------------------------
     
-         gdcm::Orientation o;
+         gdcm::Orientation *o = gdcm::Orientation::New(); 
+
 
          if ( strImageOrientationPatient != gdcm::GDCM_UNFOUND ||
             strImageOrientationRET     != gdcm::GDCM_UNFOUND )
          {
      
-            gdcm::OrientationType orient = o.GetOrientationType( f );
+            gdcm::OrientationType orient = o->GetOrientationType( f );
     
             std::cout << "TypeOrientation = " << orient << " (-> " 
-                     << o.GetOrientationTypeString(orient) << " )" << std::endl;
+                     << o->GetOrientationTypeString(orient) << " )" << std::endl;
          }
 
-         std::string ori = o.GetOrientation ( f );
+         std::string ori = o->GetOrientation ( f );
          if (ori != "\\" )
             std::cout << "Orientation [" << ori << "]" << std::endl;
+         o->Delete(); 
 
 //------------------------------- 
-
         
          if (f->IsReadable())
             std::cout <<std::endl<<it->c_str()<<" is Readable"<<std::endl;