X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFile.h;h=57ef7d107c03f6aa31af9b2ce5abe36e54d5dfc6;hb=ab9b96bb7b0c77c1beaee820985debe75f04b831;hp=dd48d1c53a419deba2f89bc83ae78d6a2afb4e67;hpb=f5c24f2018ff4775ff6ae006de753a394d8cae0f;p=gdcm.git

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index dd48d1c5..57ef7d10 100644
--- a/src/gdcmFile.h
+++ b/src/gdcmFile.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFile.h,v $
   Language:  C++
-  Date:      $Date: 2005/02/06 14:39:35 $
-  Version:   $Revision: 1.103 $
+  Date:      $Date: 2005/08/29 13:05:02 $
+  Version:   $Revision: 1.116 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -19,10 +19,14 @@
 #ifndef GDCMFILE_H
 #define GDCMFILE_H
 
+#include "gdcmDebug.h"
 #include "gdcmDocument.h"
 
+
+
 namespace gdcm 
 {
+
 class RLEFramesInfo;
 class JPEGFragmentsInfo;
 
@@ -84,7 +88,7 @@ enum ModalityType {
  * dicom files according to header information e.g. to create a file hierarchy
  * reflecting the Patient/Study/Serie informations, or extracting a given
  * SerieId. Accessing the content (image[s] or volume[s]) is beyond the
- * functionality of this class and belongs to gdmcFile.
+ * functionality of this class and belongs to gdcm::FileHelper.
  * \note  The various entries of the explicit value representation (VR) shall
  *        be managed within a dictionary which is shared by all File
  *        instances.
@@ -96,9 +100,12 @@ class GDCM_EXPORT File : public Document
 {
 public:
    File();
-   File( std::string const &filename );
+   GDCM_LEGACY(File( std::string const &filename ));
    ~File();
 
+   // Loading
+   GDCM_LEGACY(bool Load( std::string const &filename ));
+   bool Load(); 
    // Standard values and informations contained in the header
    bool IsReadable();
 
@@ -118,7 +125,7 @@ public:
    float GetYOrigin();
    float GetZOrigin();
 
-   void GetImageOrientationPatient( float iop[6] );
+   bool GetImageOrientationPatient( float iop[6] );
 
    int GetBitsStored();
    int GetBitsAllocated();
@@ -129,6 +136,7 @@ public:
    std::string GetPixelType();
    bool IsSignedPixelData();
    bool IsMonochrome();
+   bool IsMonochrome1();
    bool IsPaletteColor();
    bool IsYBRFull();
 
@@ -159,7 +167,7 @@ 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();
@@ -167,8 +175,6 @@ public:
    bool Write(std::string fileName, FileType filetype);
 
 protected:
-   /// Initialize DICOM File when none
-   void InitializeDefaultFile();
  
    /// Store the RLE frames info obtained during parsing of pixels.
    RLEFramesInfo *RLEInfo;
@@ -181,12 +187,13 @@ protected:
    /// NumPixel to provide a unique access facility. 
    uint16_t NumPixel;
    /// \brief In some cases (e.g. for some ACR-NEMA images) the header entry for
-   /// the group of pixels is *not* found at 0x7fe0. In order to
-   /// make things easier the parser shall store the proper value in
-   /// GrPixel to provide a unique access facility.
+   /// the group of pixels is *not* found at 0x7fe0. 
+   /// In order to make things easier the parser shall store the proper value
+   /// in GrPixel to provide a unique access facility.
    uint16_t GrPixel;
 
 private:
+   bool DoTheLoadingJob();
    void ComputeRLEInfo();
    void ComputeJPEGFragmentInfo();
    bool     ReadTag(uint16_t, uint16_t);