X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmFile.h;h=53062b89b8745ed1e0edbb24fa75d2b4feb2a7fd;hb=abac16617f1453f5db19618ccb45e821efa867b6;hp=5ef9efeae7b060a8e1743fc435b3fe19b2a66539;hpb=1d69b92978803204089d270599133917d944c651;p=gdcm.git diff --git a/src/gdcmFile.h b/src/gdcmFile.h index 5ef9efea..53062b89 100644 --- a/src/gdcmFile.h +++ b/src/gdcmFile.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmFile.h,v $ Language: C++ - Date: $Date: 2004/10/12 04:35:46 $ - Version: $Revision: 1.60 $ + Date: $Date: 2004/11/30 14:17:52 $ + Version: $Revision: 1.79 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -21,10 +21,11 @@ #include "gdcmCommon.h" #include "gdcmHeader.h" +#include "gdcmPixelConvert.h" +#include "gdcmDocEntryArchive.h" namespace gdcm { - //----------------------------------------------------------------------------- /* * In addition to Dicom header exploration, this class is designed @@ -34,7 +35,22 @@ namespace gdcm class GDCM_EXPORT File { public: - File( Header *header ); + enum TWriteMode + { + WMODE_NATIVE, + WMODE_DECOMPRESSED, + WMODE_RGB + }; + + enum TWriteType + { + WTYPE_IMPL_VR, + WTYPE_EXPL_VR, + WTYPE_ACR + }; + +public: + File( Header* header ); File( std::string const& filename ); virtual ~File(); @@ -42,28 +58,18 @@ public: /// Accessor to \ref Header Header* GetHeader() { return HeaderInternal; } - int ComputeDecompressedPixelDataSizeFromHeader(); - - void ConvertRGBPlanesToRGBPixels( uint8_t* source, uint8_t* destination ); - void ConvertYcBcRPlanesToRGBPixels( uint8_t* source, uint8_t* destination ); - - /// Accessor to \ref ImageDataSize - size_t GetImageDataSize(){ return ImageDataSize; }; + size_t GetImageDataSize(); + size_t GetImageDataRawSize(); - /// Accessor to \ref ImageDataSizeRaw - size_t GetImageDataSizeRaw(){ return ImageDataSizeRaw; }; + /// Accessor to \ref PixelConverter + PixelConvert* GetPixelConverter() { return PixelConverter; }; uint8_t* GetImageData(); - size_t GetImageDataIntoVector(void* destination, size_t maxSize); uint8_t* GetImageDataRaw(); - size_t GetImageDataIntoVectorRaw(void* destination, size_t maxSize); + size_t GetImageDataIntoVector(void* destination, size_t maxSize); - // see also Header::SetImageDataSize ?!? bool SetImageData (uint8_t* data, size_t expectedSize); - /// \todo When the caller is aware we simply point to the data: - /// int SetImageDataNoCopy (void* Data, size_t ExpectedSize); - // Write pixels of ONE image on hard drive // No test is made on processor "endianity" // The user must call his reader correctly @@ -71,10 +77,7 @@ public: bool WriteDcmImplVR(std::string const& fileName); bool WriteDcmExplVR(std::string const& fileName); bool WriteAcr (std::string const& fileName); - - // Don't look any longer for the code : - // It's in file gdcmParsePixels.cxx - bool ParsePixelData(); + bool Write(std::string const& fileName); virtual bool SetEntryByNumber(std::string const& content, uint16_t group, uint16_t element) @@ -82,32 +85,53 @@ public: HeaderInternal->SetEntryByNumber(content,group,element); return true; } - + uint8_t* GetLutRGBA(); + + // Write mode + void SetWriteModeToNative() { SetWriteMode(WMODE_NATIVE); }; + void SetWriteModeToDecompressed() { SetWriteMode(WMODE_DECOMPRESSED); }; + void SetWriteModeToRGB() { SetWriteMode(WMODE_RGB); }; + void SetWriteMode(unsigned int mode) { WriteMode = mode; }; + unsigned int GetWriteMode() { return WriteMode; }; + + // Write format + void SetWriteTypeToDcmImplVR() { SetWriteType(WTYPE_EXPL_VR); }; + void SetWriteTypeToDcmExplVR() { SetWriteType(WTYPE_EXPL_VR); }; + void SetWriteTypeToAcr() { SetWriteType(WTYPE_ACR); }; + void SetWriteType(unsigned int format) { WriteType = format; }; + unsigned int GetWriteType() { return WriteType; }; + protected: bool WriteBase(std::string const& fileName, FileType type); + bool CheckWriteIntegrity(); -private: - void Initialise(); + void SetWriteToNative(); + void SetWriteToDecompressed(); + void SetWriteToRGB(); + void RestoreWrite(); - bool ReadPixelData(void* destination); - - // For JPEG 8 Bits, body in file gdcmJpeg.cxx - bool gdcm_write_JPEG_file (FILE* fp, void* image_buffer, - int image_width, int image_heigh, - int quality); + void SetWriteFileTypeToACR(); + void SetWriteFileTypeToExplicitVR(); + void SetWriteFileTypeToImplicitVR(); + void RestoreWriteFileType(); - // For JPEG 12 Bits, body in file gdcmJpeg12.cxx - bool gdcm_write_JPEG_file12 (FILE* fp, void* image_buffer, - int image_width, int image_height, - int quality); + void SetWriteToLibido(); + void SetWriteToNoLibido(); + void RestoreWriteOfLibido(); - void SaveInitialValues(); // will belong to the future PixelData class - void RestoreInitialValues(); // will belong to the future PixelData class - void DeleteInitialValues(); // will belong to the future PixelData class + ValEntry* CopyValEntry(uint16_t group,uint16_t element); + BinEntry* CopyBinEntry(uint16_t group,uint16_t element); +private: + void Initialise(); + + uint8_t* GetDecompressed(); + int ComputeDecompressedPixelDataSizeFromHeader(); + +private: // members variables: - /// \brief Header to use to load the file + /// Header to use to load the file Header *HeaderInternal; /// \brief Whether the underlying \ref Header was loaded by @@ -115,21 +139,26 @@ private: /// the destructor is in charge of deletion. bool SelfHeader; - /// wether already parsed + /// Wether already parsed or not bool Parsed; - -// + + /// Utility pixel converter + PixelConvert* PixelConverter; + + // Utility header archive + DocEntryArchive *Archive; + + // Write variables + unsigned int WriteMode; + unsigned int WriteType; + +/// FIXME // --------------- Will be moved to a PixelData class // /// \brief to hold the Pixels (when read) uint8_t* Pixel_Data; // (was PixelData) - /// \brief Size (in bytes) of required memory to hold the Gray Level pixels - /// represented in this file. This is used when the user DOESN'T want - /// the RGB pixels image when it's stored as a PALETTE COLOR image - size_t ImageDataSizeRaw; - /// \brief Size (in bytes) of requited memory to hold the the pixels /// of this image in it's RGB convertion either from: /// - Plane R, Plane G, Plane B @@ -137,54 +166,9 @@ private: /// - YBR Pixels (or from RGB Pixels, as well) size_t ImageDataSize; - /// \brief ==1 if GetImageDataRaw was used - /// ==0 if GetImageData was used - /// ==-1 if ImageData never read - int PixelRead; - - /// \brief length of the last allocated area devoided to receive Pixels - /// ( to allow us not to (free + new) if un necessary ) - size_t LastAllocatedPixelDataLength; - - // Initial values of some fields that can be modified during reading process - // if user asked to transform gray level + LUT image into RGB image - - /// \brief Samples Per Pixel (0x0028,0x0002), as found on disk - std::string InitialSpp; - /// \brief Photometric Interpretation (0x0028,0x0004), as found on disk - std::string InitialPhotInt; - /// \brief Planar Configuration (0x0028,0x0006), as found on disk - std::string InitialPlanConfig; - - // Initial values of some fields that can be modified during reading process - // if the image was a 'strange' ACR-NEMA - // (Bits Allocated=12, High Bit not equal to Bits stored +1) - /// \brief Bits Allocated (0x0028,0x0100), as found on disk - std::string InitialBitsAllocated; - /// \brief High Bit (0x0028,0x0102), as found on disk - std::string InitialHighBit; - - // some DocEntry that can be moved out of the H table during reading process - // if user asked to transform gray level + LUT image into RGB image - // We keep a pointer on them for a future use. - - /// \brief Red Palette Color Lookup Table Descriptor 0028 1101 as read - DocEntry* InitialRedLUTDescr; - /// \brief Green Palette Color Lookup Table Descriptor 0028 1102 as read - DocEntry* InitialGreenLUTDescr; - /// \brief Blue Palette Color Lookup Table Descriptor 0028 1103 as read - DocEntry* InitialBlueLUTDescr; - - /// \brief Red Palette Color Lookup Table Data 0028 1201 as read - DocEntry* InitialRedLUTData; - /// \brief Green Palette Color Lookup Table Data 0028 1202 as read - DocEntry* InitialGreenLUTData; - /// \brief Blue Palette Color Lookup Table Data 0028 1203 as read - DocEntry* InitialBlueLUTData; - // // --------------- end of future PixelData class -// +// }; } // end namespace gdcm