minor improvements

[gdcm.git] / Example / PrintFile.cxx

diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx
index dfc6f6e3609ed5b3143ab9d46d458d822837c83a..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: 2008/02/13 13:58:40 $
-  Version:   $Revision: 1.90 $
+  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
@@ -347,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'
       // ------------------------------------------------------------
 
@@ -407,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]
@@ -439,6 +446,8 @@ 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);
@@ -452,7 +461,65 @@ if (resJP) {
 }
 //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;
+  }
+}
+
+----------------------------------------------*/  
+    
 }  
 //------------------------------
 
@@ -681,8 +748,8 @@ if (!noex)
          {
             if (load)  // just to see warning messages at load time !
             {
-               uint8_t *pixels = fh->GetImageData();
-               uint32_t lgth   = fh->GetImageDataSize(); 
+               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;