Upport itk modif (taken from gdcm1.0) around Jolinda Smith's algorithm

[gdcm.git] / src / gdcmFile.h

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index 2675a0d7eb5aa38be045c8ceafa1add226c4f9e8..84dca96545a74841b4063253a2e755880d12be7b 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: 2005/11/25 13:56:31 $
+  Version:   $Revision: 1.121 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -27,15 +27,6 @@
 namespace gdcm 
 {
 
-typedef struct
-{
-   double x;
-   double y;
-   double z;
-} vector3D;
-
-typedef std::pair<double, double> Res;
-
 class RLEFramesInfo;
 class JPEGFragmentsInfo;
 
@@ -107,13 +98,13 @@ 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 ));
+   //GDCM_LEGACY(bool Load( std::string const &filename ));
    bool Load(); 
    // Standard values and informations contained in the header
    bool IsReadable();
@@ -134,7 +125,7 @@ public:
    float GetYOrigin();
    float GetZOrigin();
 
-   bool GetImageOrientationPatient( float iop[6] );
+   bool GetImageOrientationPatient( double iop[6] );
 
    int GetBitsStored();
    int GetBitsAllocated();
@@ -176,17 +167,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();
+   ~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.
@@ -209,12 +203,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