X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFileHelper.h;h=d761add27ba31d6323ed31abceb773991c26cb0f;hb=f2dd0107ba49eda3386b34715cdc0c046d12397f;hp=278e2f7d2cf9cff7279e8b29ccd755ed21c87e08;hpb=1c4a6671c995962804086936a409bd0c8cb2b985;p=gdcm.git diff --git a/src/gdcmFileHelper.h b/src/gdcmFileHelper.h index 278e2f7d..d761add2 100644 --- a/src/gdcmFileHelper.h +++ b/src/gdcmFileHelper.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmFileHelper.h,v $ Language: C++ - Date: $Date: 2006/05/30 08:14:50 $ - Version: $Revision: 1.45 $ + Date: $Date: 2007/09/17 12:16:01 $ + Version: $Revision: 1.55 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -16,15 +16,15 @@ =========================================================================*/ -#ifndef GDCMFILEHELPER_H -#define GDCMFILEHELPER_H +#ifndef _GDCMFILEHELPER_H_ +#define _GDCMFILEHELPER_H_ #include "gdcmDebug.h" #include "gdcmRefCounter.h" #include "gdcmVRKey.h" #include "gdcmFile.h" -namespace gdcm +namespace GDCM_NAME_SPACE { //class File; class DataEntry; @@ -56,13 +56,16 @@ public: static FileHelper *New() {return new FileHelper();} /// \brief Constructs a FileHelper with a RefCounter from a fileHelper static FileHelper *New(File *header) {return new FileHelper(header);} - + void Print(std::ostream &os = std::cout, std::string const &indent = ""); - /// Accessor to \ref File + /// Accessor to File File *GetFile() { return FileInternal; } - + /// \brief Tells gdcm wether we want to keep ACR-NEMA-like overlays or not. + void SetKeepOverlays(bool k) { KeepOverlays =k; } + bool GetKeepOverlays( ) { return KeepOverlays; } + void SetLoadMode(int loadMode); void SetFileName(std::string const &fileName); bool Load(); @@ -78,7 +81,7 @@ public: DataEntry *InsertEntryString(std::string const &content, uint16_t group, uint16_t elem, const VRKey &vr); DataEntry *InsertEntryBinArea(uint8_t *binArea, int lgth, - uint16_t group, uint16_t elem, const VRKey &vr); + uint16_t group, uint16_t elem, const VRKey &vr); SeqEntry *InsertSeqEntry(uint16_t group, uint16_t elem); // File helpers @@ -88,7 +91,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 +106,8 @@ public: uint8_t *GetRawData(); size_t GetRawDataSize(); + void ConvertFixGreyLevels(uint8_t *data, size_t size); + // LUT uint8_t* GetLutRGBA(); int GetLutItemNumber(); @@ -117,11 +122,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; } @@ -135,14 +136,25 @@ public: void SetWriteTypeToAcr() { SetWriteType(ACR); } /// \brief Tells the writer we want to write as LibIDO void SetWriteTypeToAcrLibido() { SetWriteType(ACR_LIBIDO); } - /// \brief Tells the writer we want to write as JPEG + /// \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" @@ -175,6 +187,8 @@ protected: FileHelper( File *header ); ~FileHelper(); + /// \todo move all those 'protected' methods to 'private' + /// since FileHelper is not derived in anything! bool CheckWriteIntegrity(); void SetWriteToRaw(); @@ -183,6 +197,7 @@ protected: void SetWriteFileTypeToACR(); void SetWriteFileTypeToJPEG(); + void SetWriteFileTypeToJPEG2000(); void SetWriteFileTypeToExplicitVR(); void SetWriteFileTypeToImplicitVR(); void RestoreWriteFileType(); @@ -192,14 +207,14 @@ protected: void RestoreWriteOfLibido(); DataEntry *CopyDataEntry(uint16_t group, uint16_t elem, - const VRKey &vr = GDCM_VRUNKNOWN); + const VRKey &vr = GDCM_VRUNKNOWN); void CheckMandatoryElements(); void CheckMandatoryEntry(uint16_t group, uint16_t elem, std::string value, - const VRKey &vr = GDCM_VRUNKNOWN); + const VRKey &vr = GDCM_VRUNKNOWN); void SetMandatoryEntry(uint16_t group, uint16_t elem, std::string value, - const VRKey &vr = GDCM_VRUNKNOWN); + const VRKey &vr = GDCM_VRUNKNOWN); void CopyMandatoryEntry(uint16_t group, uint16_t elem, std::string value, - const VRKey &vr = GDCM_VRUNKNOWN); + const VRKey &vr = GDCM_VRUNKNOWN); void RestoreWriteMandatory(); private: @@ -222,8 +237,10 @@ private: bool Parsed; // Utility pixel converter + /// \brief Pointer to the PixelReadConverter PixelReadConvert *PixelReadConverter; + /// \brief Pointer to the PixelWriteConverter PixelWriteConvert *PixelWriteConverter; @@ -237,7 +254,7 @@ private: /// \brief (ImplicitVR, ExplicitVR, ACR, ACR_LIBIDO) FileType WriteType; - + /// \brief Pointer to a user supplied function to allow modification /// of pixel order (e.g. : Mirror, UpsideDown, 90°Rotation, ...) /// use as : void userSuppliedFunction(uint8_t *im, gdcm::File *f) @@ -252,6 +269,13 @@ 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; + + /// \brief wether we want to keep ACR-NEMA-like overlays or not. + bool KeepOverlays; }; } // end namespace gdcm