X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FPrintFile.cxx;h=f1868e72b3c550ae0e176673b980a1abd263f5d9;hb=bd60287496e2943a7f60b9d21cba8247dbbffb88;hp=60a885a910a2ce71b7d4a4b1bbcb8e8b2ff27d85;hpb=8214c84f69e4c6c39e8b0539764fbc02aec24fc5;p=gdcm.git

diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx
index 60a885a9..f1868e72 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/30 10:27:22 $
-  Version:   $Revision: 1.59 $
+  Date:      $Date: 2005/10/01 19:39:14 $
+  Version:   $Revision: 1.61 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -207,21 +207,6 @@ int main(int argc, char *argv[])
 
    // ----------- End Arguments Manager ---------
 
-   std::string tabOrientation[13] = { 
-       "Not Applicable",
-       "Axial",
-       "Coronal",
-       "Sagital",
-       "Heart Axial",
-       "Heart Coronal",
-       "Heart Sagital",
-       "Axial invert",
-       "Coronal invert",
-       "Sagital invert",
-       "Heart Axial invert",
-       "Heart Coronal invert",
-       "Heart Sagital invert"
-   };
  
    if (ddict)
    {
@@ -318,25 +303,29 @@ int main(int argc, char *argv[])
 
       std::string strPatientPosition = 
                                       f->GetEntryValue(0x0018,0x5100);
-      if ( strPatientPosition != gdcm::GDCM_UNFOUND )  
+      if ( strPatientPosition != gdcm::GDCM_UNFOUND 
+        && strPatientPosition != "" )  
             std::cout << "PatientPosition (0x0010,0x5100)= [" 
                       << strPatientPosition << "]" << std::endl;
  
      std::string strPatientOrientation = 
                                       f->GetEntryValue(0x0020,0x0020);
-      if ( strPatientOrientation != gdcm::GDCM_UNFOUND )  
+      if ( strPatientOrientation != gdcm::GDCM_UNFOUND
+        && strPatientOrientation != "")  
          std::cout << "PatientOrientation (0x0020,0x0020)= [" 
                    << strPatientOrientation << "]" << std::endl;
 
       std::string strImageOrientationPatient = 
                                       f->GetEntryValue(0x0020,0x0037);  
-      if ( strImageOrientationPatient != gdcm::GDCM_UNFOUND )  
+      if ( strImageOrientationPatient != gdcm::GDCM_UNFOUND
+        && strImageOrientationPatient != "" )  
          std::cout << "ImageOrientationPatient (0x0020,0x0037)= [" 
                    << strImageOrientationPatient << "]" << std::endl;
 
       std::string strImageOrientationRET = 
                                       f->GetEntryValue(0x0020,0x0035);
-      if ( strImageOrientationRET != gdcm::GDCM_UNFOUND )  
+      if ( strImageOrientationRET != gdcm::GDCM_UNFOUND
+        && strImageOrientationRET != "" )  
          std::cout << "ImageOrientationRET (0x0020,0x0035)= [" 
                    << strImageOrientationRET << "]" << std::endl;
 
@@ -349,13 +338,10 @@ int main(int argc, char *argv[])
            strImageOrientationRET     != gdcm::GDCM_UNFOUND )
       {
   
-         double orient = o.TypeOrientation( f );
-         int k = (int)orient;
-         if (k < 0) 
-            k = -k + 6;
+         gdcm::OrientationType orient = o.GetOrientationType( f );
  
          std::cout << "TypeOrientation = " << orient << " (-> " 
-                   << tabOrientation[k] << " )" << std::endl;
+                   << o.GetOrientationTypeString(orient) << " )" << std::endl;
       }
 
       std::string ori = o.GetOrientation ( f );
@@ -384,7 +370,7 @@ int main(int argc, char *argv[])
                   int length;   // LUT length in Bytes
                   int deb;      // Subscript of the first Lut Value
                   int nbits;    // Lut item size (in Bits)
-                  int nbRead;    // nb of items in LUT descriptor (must be = 3)
+                  int nbRead;   // nb of items in LUT descriptor (must be = 3)
 
                   nbRead = sscanf( lutDescriptor.c_str(),
                                     "%d\\%d\\%d",
@@ -517,13 +503,10 @@ int main(int argc, char *argv[])
          if (ori != gdcm::GDCM_UNFOUND )
             std::cout << "- Orientation [" << ori << "]" << std::endl;
 
-         double d = o.TypeOrientation( f );
-         int k = (int)d;
-         if (k < 0) 
-            k = -k + 6;
+         gdcm::OrientationType d = o.GetOrientationType( f );
  
          std::cout << "TypeOrientation = " << d << " (-> " 
-                   << tabOrientation[k] << std::endl;
+                   << o.GetOrientationTypeString(d) << std::endl;
         
          if (f->IsReadable())
             std::cout <<std::endl<<it->c_str()<<" is Readable"<<std::endl;