minor improvements

[gdcm.git] / Example / PrintFile.cxx

diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx
index 6140de61fe2faa1d55da4744e9175301d8a37921..23f648359c4b9ceff43a4c82de5324deaf281cb3 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: 2007/11/08 18:14:55 $
-  Version:   $Revision: 1.88 $
+  Date:      $Date: 2009/05/28 15:44:34 $
+  Version:   $Revision: 1.93 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -127,11 +127,12 @@ int main(int argc, char *argv[])
    " usage: PrintFile {filein=inputFileName|dirin=inputDirectoryName}[level=n]",
    "                       [forceload=listOfElementsToForceLoad] [rec] [noex] ",
    "                       [4DLoc= ][dict= privateDirectory]                  ",
-   "                       [ { [noshadowseq] | [noshadow][noseq] } ]          ",
+   "                       [ { [noshadowseq] | [noshadow][noseq] } ] [load]   ",
    "                       [debug] [warning]                                  ",
    "      level = 0,1,2 : depending on the amount of details user wants to see",
    "      rec : user wants to parse recursively the directory                 ",
-   "      noex : user doen't want extra 'user friendly' info                  ",   
+   "      load : user wants to load the pixels, as well (to see warning info) ",
+   "      noex : user doesn't want extra 'user friendly' info                 ",   
    "      4DLoc: group-elem(in hexa, no space) of the DataEntry holdind 4thDim",
    "      listOfElementsToForceLoad : group-elem,g2-e2,... (in hexa, no space)",
    "                                of Elements to load whatever their length ",
@@ -208,6 +209,8 @@ int main(int argc, char *argv[])
       }
    }
 
+   bool load = ( 0 != am->ArgMgrDefined("load") );
+   
    bool showlut = ( 0 != am->ArgMgrDefined("SHOWLUT") );
 
    bool ddict = am->ArgMgrDefined("dict") ? true : false;
@@ -258,7 +261,7 @@ errno = 0;
       bool res = false;
       try
         {
-        f->Load();
+        res = f->Load();
         }
       catch(std::exception &ex)
         {
@@ -344,13 +347,18 @@ if (!noex)
       std::cout << " SwapCode= " << f->GetSwapCode() << std::endl;
       std::cout << " ------" << std::endl;
 
+
       std::cout << "\n\n" << std::endl; 
       std::cout << "X spacing " << f->GetXSpacing() << std::endl;
       std::cout << "Y spacing " << f->GetYSpacing() << std::endl;
       std::cout << "Z spacing " << f->GetZSpacing() << std::endl;
-    
+   
 //------------------------------
 
+
+
+
+
       // Let's get and print some usefull fields about 'Orientation'
       // ------------------------------------------------------------
 
@@ -404,9 +412,11 @@ if (!noex)
                    << strImagePositionPatientRET << "]" << std::endl;
   
      float iop[6];
-     /*bool riop = */f->GetImageOrientationPatient(iop);  
+     //bool riop = 
+        f->GetImageOrientationPatient(iop);  
      float ipp[3];
-     /*bool ripp = */f->GetImagePositionPatient(ipp);
+     //bool ripp = 
+        f->GetImagePositionPatient(ipp);
 
      std::cout << "Image Position (0x0020,0x0032|0x0030) : "
                << ipp[0] << " , " << ipp[1] << " , "<< ipp[2]
@@ -436,6 +446,80 @@ if (!noex)
       if (ori != "\\" )
          std::cout << "Orientation [" << ori << "]" << std::endl;
       o->Delete();
+      
+      
+/*      
+std::vector <double> valueVector; 
+GDCM_NAME_SPACE::DataEntry *e_0018_5212 = f->GetDataEntry(0x0018, 0x5212);
+bool resJP = e_0018_5212->GetDSValue(valueVector);
+if (resJP) {
+   double test;
+   for ( int i=0; i < 3; i++ ) {
+       test = valueVector[i];
+       std::cout << " test " << test << std::endl;
+    }
+}
+//e_0018_5212->Delete();
+*/       
+
+
+/* -----------------------------
+
+// Try :
+std::cout << std::endl << std::endl << "===========Try Get Numerical ======="
+          << std::endl;
+GDCM_NAME_SPACE::DataEntry *e;
+bool res;
+std::vector<double> vd;
+
+// Transfert Syntax
+e=f->GetDataEntry(0x0002,0x0010);
+if (e){
+  res=e->GetNumerical(vd);
+  if (!res){
+    std::cout << "0x0002,0x0010 not numerical, size =" << vd.size() << std::endl;  
+  }
+}
+// Columns
+e=f->GetDataEntry(0x0028,0x0011);
+if (e){
+  res=e->GetNumerical(vd);
+  if (!res){
+    std::cout << "0x0028,0x0011 not numerical, size =" << vd.size() << std::endl;  
+  } else {
+    std::cout << "0x0028,0x0011 numerical, size =" << vd.size() << std::endl;
+    std::cout << vd[0]<< std::endl;
+  }
+}
+// Im Orient (Pat)
+e=f->GetDataEntry(0x0020,0x0032);
+if (e){
+  res=e->GetNumerical(vd);
+  if (!res){
+    std::cout << "0x0020,0x0032 not numerical, size =" << vd.size() << std::endl;  
+  } else {
+    std::cout << "0x0020,0x0032 numerical, size =" << vd.size() << std::endl;
+    for(int l=0; l<vd.size(); l++)
+      std::cout << "vd[" << l << "]=" << vd[l]<< std::endl;
+  }
+}
+
+// Pixel Spacing
+
+e=f->GetDataEntry(0x0028,0x0030);
+if (e){
+  res=e->GetNumerical(vd);
+  if (!res){
+    std::cout << "0x0028,0x0030 not numerical, size =" << vd.size() << std::endl;  
+  } else {
+    std::cout << "0x0028,0x0030 numerical, size =" << vd.size() << std::endl;
+    for(int l=0; l<vd.size(); l++)
+      std::cout << "vd[" << l << "]=" << vd[l]<< std::endl;
+  }
+}
+
+----------------------------------------------*/  
+    
 }  
 //------------------------------
 
@@ -486,6 +570,7 @@ if (!noex)
             else
                std::cout << "No LUT Data (0x0028,0x3000) found " << std::endl;
         }
+        /*
          else
          {
             if ( fh->GetLutItemSize() == 8 )
@@ -506,6 +591,7 @@ if (!noex)
                          << (int)(lutrgba16[i*4+2]) << std::endl;
             }
          }
+         */
       }
       else if (showlut)
       {
@@ -654,15 +740,26 @@ if (!noex)
          std::string ori = o->GetOrientation ( f );
          if (ori != "\\" )
             std::cout << "Orientation [" << ori << "]" << std::endl;
-         o->Delete(); 
+         o->Delete();
 }
 //------------------------------- 
         
          if (f->IsReadable())
+         {
+            if (load)  // just to see warning messages at load time !
+            {
+               uint8_t *pixels = fh->GetImageData(); (void)pixels;
+               uint32_t lgth   = fh->GetImageDataSize(); (void)lgth;
+            }         
+
             std::cout <<std::endl<<it->c_str()<<" is Readable"<<std::endl;
+         }
          else
             std::cout <<std::endl<<it->c_str()<<" is NOT Readable"<<std::endl;
          std::cout << "\n\n" << std::endl;
+         
+
+
          f->Delete();
          fh->Delete();
       }