X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFile.h;h=b0c6dccf937d2175197c3ef618be9b863a5ebe19;hb=353a842f7e6ab238dbd0c31a1c7e0d2b61617f58;hp=6e191429bb9b35f664f9751a4594abd0f43c6d8b;hpb=906464b1c71b1b623f8202a693e75a358a5bd965;p=gdcm.git

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index 6e191429..b0c6dccf 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/02/16 20:06:14 $
-  Version:   $Revision: 1.124 $
+  Date:      $Date: 2007/05/23 16:48:59 $
+  Version:   $Revision: 1.132 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -21,10 +21,10 @@
 
 #include "gdcmDebug.h"
 #include "gdcmDocument.h"
+#include "gdcmTagKey.h"
 
 
-
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 
 class RLEFramesInfo;
@@ -104,19 +104,24 @@ public:
    static File *New() {return new File();}
 
    // Loading
-   GDCM_LEGACY(bool Load( std::string const &filename ));
-   bool Load(); 
+  // GDCM_LEGACY(bool Load( std::string const &filename ))
+   bool Load();
    // Standard values and informations contained in the header
    bool IsReadable();
 
-   // Some heuristic based accessors, end user intended 
+   void SetFourthDimensionLocation(uint16_t group, uint16_t elem) {
+                   FourthDimensionLocation = TagKey(group, elem); }
+
+   // Some heuristic based accessors, end user intended
    int GetImageNumber();
    ModalityType GetModality();
 
    int GetXSize();
    int GetYSize();
    int GetZSize();
-
+   int GetTSize(); // unnormalized in DICOM V3
+   
+   bool GetSpacing(float &xspacing, float &yspacing, float &zspacing);
    float GetXSpacing();
    float GetYSpacing();
    float GetZSpacing();
@@ -124,9 +129,17 @@ public:
    float GetXOrigin();
    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();
@@ -144,8 +157,9 @@ public:
    int GetLUTNbits();
 
    // For rescaling graylevel:
-   float GetRescaleIntercept();
-   float GetRescaleSlope();
+   bool GetRescaleSlopeIntercept(double &slope, double &intercept);   
+   double GetRescaleIntercept();
+   double GetRescaleSlope();
 
    int GetNumberOfScalarComponents();
    int GetNumberOfScalarComponentsRaw();
@@ -196,6 +210,9 @@ protected:
    /// In order to make things easier the parser shall store the proper value
    /// in GrPixel to provide a unique access facility.
    uint16_t GrPixel;
+   /// \brief allows user to tell gdcm in which DataElement is stored 
+   ///the -unnormalized- 4th Dimension   
+   TagKey FourthDimensionLocation;
 
 private:
    bool DoTheLoadingJob();