ENH: Minor style

[gdcm.git] / Example / PrintFile.cxx

diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx
index 38237a3ba5be1be9fc2e3ba349e15d3067e4a0ef..3cd654f92d9b87e9a559a6f5ea57fd2c0fb105a8 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/10/27 09:07:45 $
-  Version:   $Revision: 1.68 $
+  Date:      $Date: 2005/11/18 11:45:34 $
+  Version:   $Revision: 1.72 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -129,7 +129,8 @@ int main(int argc, char *argv[])
    " usage: PrintFile {filein=inputFileName|dirin=inputDirectoryName}[level=n]",
    "                       [forceload=listOfElementsToForceLoad]              ",
    "                       [dict= privateDirectory]                           ",
-   "                       [ { [noshadowseq] | [noshadow][noseq] } ] [debug]  ",
+   "                       [ { [noshadowseq] | [noshadow][noseq] } ]          ",
+   "                       [debug] [warning]                                  ",
    "      level = 0,1,2 : depending on the amount of details user wants to see",
    "      listOfElementsToForceLoad : group-elem,g2-e2,... (in hexa, no space)",
    "                                of Elements to load whatever their length ",
@@ -138,6 +139,7 @@ int main(int argc, char *argv[])
    "      noshadow   : user doesn't want to load Private groups (odd number)  ",
    "      noseq      : user doesn't want to load Sequences                    ",
    "      debug      : user wants to run the program in 'debug mode'          ",
+   "      warning    : user wants to be warned about any oddity in the File   ",
    "      showlut :user wants to display the Palette Color (as an int array)  ",
    FINISH_USAGE
 
@@ -167,7 +169,10 @@ int main(int argc, char *argv[])
 
    if (am->ArgMgrDefined("debug"))
       gdcm::Debug::DebugOn();
- 
+
+   if (am->ArgMgrDefined("warning"))
+      gdcm::Debug::WarningOn();
+       
    int loadMode = gdcm::LD_ALL;
    if ( am->ArgMgrDefined("noshadowseq") )
       loadMode |= gdcm::LD_NOSHADOWSEQ;
@@ -215,10 +220,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 );
@@ -230,6 +231,9 @@ int main(int argc, char *argv[])
       }
 
       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;
@@ -264,16 +268,16 @@ int main(int argc, char *argv[])
 
       pixelType    = f->GetPixelType();
       sPP          = f->GetSamplesPerPixel();
-      if (sPP == 3)
-         planarConfig = f->GetPlanarConfiguration();
-
       std::cout << " pixelType= ["            << pixelType 
                 << "] SamplesPerPixel= ["     << sPP
                 << "] ";
+
       if (sPP == 3)
+      {
+         planarConfig = f->GetPlanarConfiguration();
          std::cout << " PlanarConfiguration= [" << planarConfig 
                 << "] "<< std::endl;
- 
+      } 
       std::cout << " PhotometricInterpretation= [" 
                 << f->GetEntryString(0x0028,0x0004)
                 << "] "<< std::endl;
@@ -347,22 +351,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->gdcm::Orientation::Delete(); 
 //------------------------------
 
 
@@ -440,13 +445,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;
@@ -562,24 +562,26 @@ 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->gdcm::Orientation::Delete(); 
 
 //------------------------------- 
-
         
          if (f->IsReadable())
             std::cout <<std::endl<<it->c_str()<<" is Readable"<<std::endl;