Just a few modif on Dicom Dict, according to 2003 Releaase.

[gdcm.git] / src / gdcmHeader.h

diff --git a/src/gdcmHeader.h b/src/gdcmHeader.h
index c733cd5435fa406d8d9e8be4c5cb98abe6c1257e..5e43f564460f3fec9966d1ef1766e0a9ccad7f7a 100644 (file)
--- a/src/gdcmHeader.h
+++ b/src/gdcmHeader.h
@@ -79,8 +79,8 @@ private:
    void CheckSwap(void);
    void InitVRDict(void);
    void SwitchSwapToBigEndian(void);
+   // CLEAN ME: NewManualElValToPubDict is NOT called any more.
    gdcmElValue*  NewManualElValToPubDict(string NewTagName, string VR);
-   void AddAndDefaultElements(void);
    void SetMaxSizeLoadElementValue(long);
 
    gdcmDictEntry * GetDictEntryByKey(guint16, guint16);
@@ -109,16 +109,9 @@ private:
    bool IsJPEGSpectralSelectionProcess6_8TransferSyntax(void); 
    
    bool IsJPEGLossless(void); 
+   bool IsDicomV3(void); 
       
 protected:
-   // FIXME: is this enum still necessary ??
-   enum FileType {
-      Unknown = 0,
-      TrueDicom,
-      ExplicitVR,
-      ImplicitVR,
-      ACR,
-      ACR_LIBIDO};  // CLEANME
    FileType filetype;
    int write(ostream&);   
    int anonymize(ostream&);  // FIXME : anonymize should be a friend ?
@@ -165,18 +158,12 @@ public:
    int SetShaElValByNumber(string content, guint16 group, guint16 element);
    
    int SetPubElValLengthByNumber(guint32 lgr, guint16 group, guint16 element);                                   
-   int ReplaceOrCreateByNumber(guint16 Group, guint16 Elem, string Value);                                
-
-   gdcmElValSet GetPubElValSet() { return(PubElValSet); }
-   
-   // a mettre en inline
-   // --> ou met-on les doxygeneries ?
-   
-   string GetXSize(void);  
-   string GetYSize(void);
-    
-   string GetZSize(void);       
+   int ReplaceOrCreateByNumber(string Value, guint16 Group, guint16 Elem);                                
+   int GetXSize(void);  
+   int GetYSize(void);
+   int GetZSize(void);       
    string GetPixelType(void);  
+   int Write(FILE *, FileType);
    
 };