STYLE: Remove old comments

[gdcm.git] / Example / PrintFile.cxx

diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx
index 8d7bfc077d384d6afb46960dd5970b6fa124c882..f1868e72b3c550ae0e176673b980a1abd263f5d9 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/09/16 16:45:33 $
-  Version:   $Revision: 1.57 $
+  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,7 +207,7 @@ int main(int argc, char *argv[])
 
    // ----------- End Arguments Manager ---------
 
-
+ 
    if (ddict)
    {
       gdcm::Global::GetDicts()->GetDefaultPubDict()->AddDict(dict);   
@@ -292,21 +292,63 @@ int main(int argc, char *argv[])
       std::cout << " TransferSyntaxName= [" << transferSyntaxName << "]" 
                 << std::endl;
       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;
 
+      // Lets's get and print some usefull fields about 'Orientation'
+      // ------------------------------------------------------------
+
+      std::string strPatientPosition = 
+                                      f->GetEntryValue(0x0018,0x5100);
+      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
+        && strPatientOrientation != "")  
+         std::cout << "PatientOrientation (0x0020,0x0020)= [" 
+                   << strPatientOrientation << "]" << std::endl;
+
       std::string strImageOrientationPatient = 
-                                      f->GetEntryValue(0x0020,0x0037);
-      if ( strImageOrientationPatient != gdcm::GDCM_UNFOUND )
+                                      f->GetEntryValue(0x0020,0x0037);  
+      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
+        && strImageOrientationRET != "" )  
+         std::cout << "ImageOrientationRET (0x0020,0x0035)= [" 
+                   << strImageOrientationRET << "]" << std::endl;
+
+      // Let's compute 'user friendly' results about 'Orientation'
+      // ---------------------------------------------------------
+ 
+      gdcm::Orientation o;
+
+      if ( strImageOrientationPatient != gdcm::GDCM_UNFOUND ||
+           strImageOrientationRET     != gdcm::GDCM_UNFOUND )
       {
-         gdcm::Orientation o;
-         double orient = o.TypeOrientation( f );
-         std::cout << " ---------------------- Orientation " << orient
-                   << std::endl;
+  
+         gdcm::OrientationType orient = o.GetOrientationType( f );
+ 
+         std::cout << "TypeOrientation = " << orient << " (-> " 
+                   << o.GetOrientationTypeString(orient) << " )" << std::endl;
       }
+
+      std::string ori = o.GetOrientation ( f );
+      if (ori != "\\" )
+         std::cout << "Orientation [" << ori << "]" << std::endl;
+
+
       // Display the LUT as an int array (for debugging purpose)
       if ( f->HasLUT() && showlut )
       {
@@ -328,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",
@@ -456,7 +498,16 @@ int main(int argc, char *argv[])
          fh->SetPrintLevel( level );
 
          fh->Print();
+         gdcm::Orientation o;
+         std::string ori = o.GetOrientation ( f );
+         if (ori != gdcm::GDCM_UNFOUND )
+            std::cout << "- Orientation [" << ori << "]" << std::endl;
 
+         gdcm::OrientationType d = o.GetOrientationType( f );
+ 
+         std::cout << "TypeOrientation = " << d << " (-> " 
+                   << o.GetOrientationTypeString(d) << std::endl;
+        
          if (f->IsReadable())
             std::cout <<std::endl<<it->c_str()<<" is Readable"<<std::endl;
          else