Fix mistypings

[gdcm.git] / src / gdcmFile.h

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index 2675a0d7eb5aa38be045c8ceafa1add226c4f9e8..86866908f34f68c5ded235aab4d5862a13ba5657 100644 (file)
--- a/src/gdcmFile.h
+++ b/src/gdcmFile.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFile.h,v $
   Language:  C++
-  Date:      $Date: 2005/07/24 02:14:43 $
-  Version:   $Revision: 1.114 $
+  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,25 +16,16 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMFILE_H
-#define GDCMFILE_H
+#ifndef _GDCMFILE_H_
+#define _GDCMFILE_H_
 
 #include "gdcmDebug.h"
 #include "gdcmDocument.h"
+#include "gdcmTagKey.h"
 
 
-
-namespace gdcm 
-{
-
-typedef struct
+namespace GDCM_NAME_SPACE 
 {
-   double x;
-   double y;
-   double z;
-} vector3D;
-
-typedef std::pair<double, double> Res;
 
 class RLEFramesInfo;
 class JPEGFragmentsInfo;
@@ -107,25 +98,30 @@ enum ModalityType {
  */
 class GDCM_EXPORT File : public Document
 {
+   gdcmTypeMacro(File);
+
 public:
-   File();
-   GDCM_LEGACY(File( std::string const &filename ));
-   ~File();
+   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();
@@ -134,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();
@@ -153,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();
@@ -176,17 +181,20 @@ public:
    void AddAnonymizeElement (uint16_t group, uint16_t elem, 
                              std::string const &value);
    /// Clears the list of elements to be anonymized
-   void ClearAnonymizeList() { AnonymizeList.clear(); }      
+   void ClearAnonymizeList() { UserAnonymizeList.clear(); }      
    void AnonymizeNoLoad();
    /// Replace patient's own information by info from the Anonymization list
    bool AnonymizeFile();
 
    bool Write(std::string fileName, FileType filetype);
 
-   double TypeOrientation( );
-
 protected:
- 
+   File();
+   virtual ~File();
+   /// \brief Protect the Writer from writing illegal groups
+   bool MayIWrite(uint16_t group)
+     { if (group < 8 &&  group !=2 ) return false; else return true; }
+      
    /// Store the RLE frames info obtained during parsing of pixels.
    RLEFramesInfo *RLEInfo;
    /// Store the JPEG fragments info obtained during parsing of pixels.
@@ -202,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();
@@ -209,12 +220,9 @@ private:
    void ComputeJPEGFragmentInfo();
    bool     ReadTag(uint16_t, uint16_t);
    uint32_t ReadTagLength(uint16_t, uint16_t);
-   void ReadAndSkipEncapsulatedBasicOffsetTable();
+   void ReadEncapsulatedBasicOffsetTable();
+   uint32_t *BasicOffsetTableItemValue;
 
-   Res VerfCriterion(int typeCriterion, double criterionNew, Res const & res);
-   double CalculLikelyhood2Vec(vector3D const & refA, vector3D const & refB, 
-                              vector3D const & ori1, vector3D const & ori2);
-   vector3D ProductVectorial(vector3D const & vec1, vector3D const & vec2);
 };
 } // end namespace gdcm