X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFile.h;h=86866908f34f68c5ded235aab4d5862a13ba5657;hb=f2dd0107ba49eda3386b34715cdc0c046d12397f;hp=0eae98f22d514c8532dd87e6e9d1938a7471e870;hpb=45c6170b50fd76d5b81feb7ca17a0e30e8342dd8;p=gdcm.git

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index 0eae98f2..86866908 100644
--- a/src/gdcmFile.h
+++ b/src/gdcmFile.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFile.h,v $
   Language:  C++
-  Date:      $Date: 2006/05/12 19:09:55 $
-  Version:   $Revision: 1.127 $
+  Date:      $Date: 2007/09/17 12:16:02 $
+  Version:   $Revision: 1.134 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,15 +16,15 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMFILE_H
-#define GDCMFILE_H
+#ifndef _GDCMFILE_H_
+#define _GDCMFILE_H_
 
 #include "gdcmDebug.h"
 #include "gdcmDocument.h"
 #include "gdcmTagKey.h"
 
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 
 class RLEFramesInfo;
@@ -104,7 +104,7 @@ public:
    static File *New() {return new File();}
 
    // Loading
-   GDCM_LEGACY(bool Load( std::string const &filename ))
+  // GDCM_LEGACY(bool Load( std::string const &filename ))
    bool Load();
    // Standard values and informations contained in the header
    bool IsReadable();
@@ -121,6 +121,7 @@ public:
    int GetZSize();
    int GetTSize(); // unnormalized in DICOM V3
 
+   bool GetSpacing(float &xspacing, float &yspacing, float &zspacing);
    float GetXSpacing();
    float GetYSpacing();
    float GetZSpacing();
@@ -129,8 +130,16 @@ public:
    float GetYOrigin();
    float GetZOrigin();
 
+   float GetXCosineOnX();
+   float GetXCosineOnY();  
+   float GetXCosineOnZ();
+   float GetYCosineOnX();
+   float GetYCosineOnY();  
+   float GetYCosineOnZ();   
+     
    bool GetImageOrientationPatient( float iop[6] );
-
+   bool GetImagePositionPatient( float ipp[3] );
+   
    int GetBitsStored();
    int GetBitsAllocated();
    int GetHighBitPosition();
@@ -148,15 +157,16 @@ public:
    int GetLUTNbits();
 
    // For rescaling graylevel:
-   float GetRescaleIntercept();
-   float GetRescaleSlope();
+   bool GetRescaleSlopeIntercept(double &slope, double &intercept);   
+   double GetRescaleIntercept();
+   double GetRescaleSlope();
 
    int GetNumberOfScalarComponents();
    int GetNumberOfScalarComponentsRaw();
 
-   /// Accessor to \ref File::GrPixel
+   /// Accessor to  File::GrPixel
    uint16_t GetGrPixel()  { return GrPixel; }
-   /// Accessor to \ref File::NumPixel
+   /// Accessor to  File::NumPixel
    uint16_t GetNumPixel() { return NumPixel; }
 
    size_t GetPixelOffset();