Fix some comments

[gdcm.git] / src / gdcmFileHelper.h

diff --git a/src/gdcmFileHelper.h b/src/gdcmFileHelper.h
index fe5f725fd54a0a89b49379dd31fc3dda81472ccb..3ff0b3065653557f51547fbbf126c10e8fd207cf 100644 (file)
--- a/src/gdcmFileHelper.h
+++ b/src/gdcmFileHelper.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFileHelper.h,v $
   Language:  C++
-  Date:      $Date: 2006/04/11 16:03:26 $
-  Version:   $Revision: 1.42 $
+  Date:      $Date: 2007/07/27 21:21:48 $
+  Version:   $Revision: 1.50 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -24,7 +24,7 @@
 #include "gdcmVRKey.h"
 #include "gdcmFile.h"
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE
 {
 //class File;
 class DataEntry;
@@ -76,9 +76,9 @@ public:
                             uint16_t group, uint16_t elem);
 
    DataEntry *InsertEntryString(std::string const &content,
-                                       uint16_t group, uint16_t elem);
+                                uint16_t group, uint16_t elem, const VRKey &vr);
    DataEntry *InsertEntryBinArea(uint8_t *binArea, int lgth,
-                                        uint16_t group, uint16_t elem);
+                                uint16_t group, uint16_t elem, const VRKey &vr);
    SeqEntry *InsertSeqEntry(uint16_t group, uint16_t elem);
 
    // File helpers
@@ -88,7 +88,7 @@ public:
    uint8_t *GetImageData();
    uint8_t *GetImageDataRaw();
 
-   GDCM_LEGACY(size_t GetImageDataIntoVector(void *destination,size_t maxSize));
+// GDCM_LEGACY(size_t GetImageDataIntoVector(void *destination,size_t maxSize))
 
    void SetImageData(uint8_t *data, size_t expectedSize);
 
@@ -103,6 +103,8 @@ public:
    uint8_t *GetRawData();
    size_t GetRawDataSize();
 
+   void ConvertFixGreyLevels(uint8_t *data, size_t size);
+
    // LUT
    uint8_t* GetLutRGBA();
    int GetLutItemNumber();
@@ -117,11 +119,7 @@ public:
    ///        (as opposed to 'Grey pixels + Palettes color')
    void SetWriteModeToRGB()           { SetWriteMode(WMODE_RGB);  }
    /// \brief Sets the Write Mode ( )
-   void SetWriteMode(FileMode mode)   { 
-      WriteMode = mode;
-      // Deal with Samples per Pixel    
-      //if (mode == WMODE_RGB) FileInternal->InsertEntryString("3",0x0028,0x0002);
-   }
+   void SetWriteMode(FileMode mode)   {  WriteMode = mode;        }
    /// \brief Gets the Write Mode ( )
    FileMode GetWriteMode()            { return WriteMode;         }
 
@@ -137,13 +135,24 @@ public:
    void SetWriteTypeToAcrLibido()     { SetWriteType(ACR_LIBIDO); }
    /// \brief Tells the writer we want to write as JPEG   
    void SetWriteTypeToJPEG()          { SetWriteType(JPEG);       }
+   /// \brief Tells the writer we want to write as JPEG2000
+   void SetWriteTypeToJPEG2000()      { SetWriteType(JPEG2000);   }         
    /// \brief Tells the writer which format we want to write
    /// (ImplicitVR, ExplicitVR, ACR, ACR_LIBIDO)
    void SetWriteType(FileType format) { WriteType = format;       }
    /// \brief Gets the format we talled the write we wanted to write
    /// (ImplicitVR, ExplicitVR, ACR, ACR_LIBIDO)
    FileType GetWriteType()            { return WriteType;         }
-
+   /// \brief 1 : white=0, black=high value    
+   void SetPhotometricInterpretationToMonochrome1() {
+                                    PhotometricInterpretation = 1;}
+   /// \brief 2 : black=0, white=high value  (default)     
+   void SetPhotometricInterpretationToMonochrome2() {
+                                    PhotometricInterpretation = 2;}
+   /// \brief 1 : white=0, black=high value  
+   int GetPhotometricInterpretation() {
+                                return PhotometricInterpretation; }    
+    
    // Write pixels of ONE image on hard drive
    // No test is made on processor "endianness"
    // The user must call his reader correctly
@@ -175,6 +184,8 @@ protected:
    FileHelper( File *header );
    ~FileHelper();
 
+   /// \todo move all those 'protected' methods to 'privete'
+   ///       since FileHelper is not derived in anything!
    bool CheckWriteIntegrity();
 
    void SetWriteToRaw();
@@ -183,6 +194,7 @@ protected:
 
    void SetWriteFileTypeToACR();
    void SetWriteFileTypeToJPEG();
+   void SetWriteFileTypeToJPEG2000();   
    void SetWriteFileTypeToExplicitVR();
    void SetWriteFileTypeToImplicitVR();
    void RestoreWriteFileType();
@@ -252,6 +264,10 @@ private:
    /// - he created a new image, using existing images (eg MIP, MPR,cartography)
    /// - he anonymized and image (*no* modif on the pixels)
    ImageContentType ContentType;
+ 
+   /// \brief  1 : white=0, black=high value    
+   ///         2 : black=0, white=high value (default)   
+   int PhotometricInterpretation;
 
 };
 } // end namespace gdcm