Minor modifications

[gdcm.git] / src / gdcmFile.cxx

diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index be6c5902e880d3754a27dcc01d90ee2e971fb04b..38282e941cd6878af59f49f9deb65174eb1d6e8a 100644 (file)
--- a/src/gdcmFile.cxx
+++ b/src/gdcmFile.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/06/21 14:05:00 $
-  Version:   $Revision: 1.324 $
+  Date:      $Date: 2006/11/15 15:54:15 $
+  Version:   $Revision: 1.327 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -101,7 +101,8 @@
 #include <stdio.h>  //sscanf
 #include <stdlib.h> // for atoi
 
-namespace gdcm 
+namespace gdcm
+
 {
 
 //-----------------------------------------------------------------------------
@@ -141,6 +142,7 @@ File::~File()
  * @return false if file cannot be open or no swap info was found,
  *         or no tag was found.
  */
+
 bool File::Load( ) 
 {
    if ( ! this->Document::Load( ) )
@@ -175,6 +177,7 @@ bool File::DoTheLoadingJob( )
    }
    else
    {
+
       GrPixel = (uint16_t) atoi( imgLocation.c_str() );
    }   
 
@@ -996,6 +999,122 @@ bool File::GetImageOrientationPatient( float iop[6] )
    return false;
 }
 
+/**
+  * \brief gets the cosine of image X axis, against patient X axis
+  *        (Sorry, but Python needs it :-( )
+  * @return cosine of image X axis, against patient X axis 
+  */
+float File::GetXCosineOnX()
+{  
+   float iop[6];
+   GetImageOrientationPatient( iop );
+   return(iop[0]);
+}
+   
+/**
+  * \brief gets the cosine of image X axis, against patient Y axis
+  *        (Sorry, but Python needs it :-( )
+  * @return cosine of image X axis, against patient Y axis 
+  */
+float File::GetXCosineOnY()
+{  
+   float iop[6];
+   GetImageOrientationPatient( iop );
+   return(iop[1]);
+}   
+
+/**
+  * \brief gets the cosine of image X axis, against patient Z axis
+  *        (Sorry, but Python needs it :-( )
+  * @return cosine of image X axis, against patient Z axis 
+  */
+float File::GetXCosineOnZ()
+{  
+   float iop[6];
+   GetImageOrientationPatient( iop );
+   return(iop[2]);
+}   
+
+/**
+  * \brief gets the cosine of image Y axis, against patient X axis
+  *        (Sorry, but Python needs it :-( )
+  * @return cosine of image Y axis, against patient X axis 
+  */
+float File::GetYCosineOnX()
+{  
+   float iop[6];
+   GetImageOrientationPatient( iop );
+   return(iop[3]);
+}
+   
+/**
+  * \brief gets the cosine of image Y axis, against patient Y axis
+  *        (Sorry, but Python needs it :-( )
+  * @return cosine of image Y axis, against patient Y axis 
+  */
+float File::GetYCosineOnY()
+{  
+   float iop[6];
+   GetImageOrientationPatient( iop );
+   return(iop[4]);
+}   
+
+/**
+  * \brief gets the cosine of image Y axis, against patient Z axis
+  *        (Sorry, but Python needs it :-( )
+  * @return cosine of image Y axis, against patient Z axis 
+  */
+float File::GetYCosineOnZ()
+{  
+   float iop[6];
+   GetImageOrientationPatient( iop );
+   return(iop[5]);
+}    
+/**
+  * \brief gets the info from 0020,0032 : Image Position Patient
+  *                   or from 0020 0030 : Image Position (RET)
+  *
+  * @param ipp adress of the (3)float array to receive values.
+  *        (defaulted as 0.,0.,0. if nothing -or inconsistent stuff-
+  *        is found.
+  * @return true when one of the tag -with consistent values- is found
+  *         false when nothing or inconsistent stuff - is found
+  */
+bool File::GetImagePositionPatient( float ipp[3] )
+{
+   std::string strImPosiPat;
+   //ipp is supposed to be float[3]
+   ipp[0] = ipp[1] = ipp[2] = 0.;
+
+   // 0020 0032 DS REL Image Position (Patient)
+   strImPosiPat = GetEntryString(0x0020,0x0032);
+   if ( strImPosiPat != GDCM_UNFOUND )
+   {
+      if ( sscanf( strImPosiPat.c_str(), "%f \\ %f \\%f ", 
+          &ipp[0], &ipp[1], &ipp[2]) != 3 )
+      {
+         gdcmWarningMacro( "Wrong Image Position Patient (0020,0032)."
+                        << " Less than 3 values were found." );
+         return false;
+      }
+      return true;
+   }
+   //For ACR-NEMA
+   // 0020 0030 DS REL Image Position (RET)
+   else if ( (strImPosiPat = GetEntryString(0x0020,0x0030)) != GDCM_UNFOUND )
+   {
+      if ( sscanf( strImPosiPat.c_str(), "%f \\ %f \\%f ", 
+          &ipp[0], &ipp[1], &ipp[2]) != 3 )
+      {
+         gdcmWarningMacro( "wrong Image Position Patient (0020,0030). "
+                        << "Less than 3 values were found." );
+         return false;
+      }
+      return true;
+   }
+   return false;
+}
+
 /**
  * \brief   Retrieve the number of Bits Stored (actually used)
  *          (as opposed to number of Bits Allocated)
@@ -1136,21 +1255,29 @@ std::string File::GetPixelType()
       bitsAlloc = "16"; // default and arbitrary value, not to polute the output
    }
 
-   if ( bitsAlloc == "64" )
+   else if ( bitsAlloc == "64" )
    {
       return "FD";
    }
+     // useless since we have to bypass a bug ( >8 && < 16)
    else if ( bitsAlloc == "12" )
    {
       // It will be unpacked
       bitsAlloc = "16";
    }
+   
    else if ( bitsAlloc == "24" )
    {
       // (in order no to be messed up by old RGB images)
       bitsAlloc = "8";
    }
-
+   
+   int i= atoi(bitsAlloc.c_str());  // fix a bug in some headers
+   if ( i > 8 &&  i < 16 )
+   {
+      bitsAlloc = "16";
+   }
+   
    std::string sign;
    if( IsSignedPixelData() )
    {