X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFile.h;h=31c51a35a133ceea13de6ea2b6dbe8ac0065fa20;hb=eafd36f8a658f5d3b29e733bf87540150feaddf6;hp=4090131fcb31206524ee3fe9ae0ae4a17912d07c;hpb=e62d57cbd05c8e864fd2ba197a271cdcac9a2128;p=gdcm.git diff --git a/src/gdcmFile.h b/src/gdcmFile.h index 4090131f..31c51a35 100644 --- a/src/gdcmFile.h +++ b/src/gdcmFile.h @@ -3,12 +3,12 @@ Program: gdcm Module: $RCSfile: gdcmFile.h,v $ Language: C++ - Date: $Date: 2004/09/24 11:39:21 $ - Version: $Revision: 1.51 $ + Date: $Date: 2004/10/12 09:59:45 $ + Version: $Revision: 1.61 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or - http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR @@ -21,6 +21,10 @@ #include "gdcmCommon.h" #include "gdcmHeader.h" +#include "gdcmPixelConvert.h" + +namespace gdcm +{ //----------------------------------------------------------------------------- /* @@ -28,29 +32,23 @@ * for accessing the image/volume content. One can also use it to * write Dicom/ACR-NEMA/RAW files. */ -class GDCM_EXPORT gdcmFile +class GDCM_EXPORT File { public: - gdcmFile( gdcmHeader *header ); - gdcmFile( std::string const& filename ); + File( Header *header ); + File( std::string const& filename ); - virtual ~gdcmFile(); + virtual ~File(); /// Accessor to \ref Header - gdcmHeader* GetHeader() { return Header; } + Header* GetHeader() { return HeaderInternal; } - void SetPixelDataSizeFromHeader(); - + int ComputeDecompressedPixelDataSizeFromHeader(); -/// \brief Returns the size (in bytes) of required memory to hold -/// the pixel data represented in this file. + /// Accessor to \ref ImageDataSize size_t GetImageDataSize(){ return ImageDataSize; }; - -/// \brief Returns the size (in bytes) of required memory to hold -/// the pixel data represented in this file, if user DOESN'T want -/// to get RGB pixels image when it's stored as a PALETTE COLOR image -/// -the (vtk) user is supposed to know how to deal with LUTs- + /// Accessor to \ref ImageDataSizeRaw size_t GetImageDataSizeRaw(){ return ImageDataSizeRaw; }; uint8_t* GetImageData(); @@ -58,13 +56,7 @@ public: uint8_t* GetImageDataRaw(); size_t GetImageDataIntoVectorRaw(void* destination, size_t maxSize); - // Allocates ExpectedSize bytes of memory at this->Data and copies the - // pointed data to it. Copying the image might look useless but - // the caller might destroy it's image (without knowing it: think - // of a complicated interface where display is done with a library - // e.g. VTK) before calling the Write - - // see also gdcmHeader::SetImageDataSize ?!? + // see also Header::SetImageDataSize ?!? bool SetImageData (uint8_t* data, size_t expectedSize); /// \todo When the caller is aware we simply point to the data: @@ -85,7 +77,7 @@ public: virtual bool SetEntryByNumber(std::string const& content, uint16_t group, uint16_t element) { - Header->SetEntryByNumber(content,group,element); + HeaderInternal->SetEntryByNumber(content,group,element); return true; } @@ -93,44 +85,28 @@ protected: bool WriteBase(std::string const& fileName, FileType type); private: - void SwapZone(void* im, int swap, int lgr, int nb); + void Initialise(); - bool ReadPixelData(void* destination); - // For JPEG 8 Bits, body in file gdcmJpeg.cxx - bool gdcm_read_JPEG_file (FILE* fp, void* image_buffer); bool gdcm_write_JPEG_file (FILE* fp, void* image_buffer, int image_width, int image_heigh, int quality); // For JPEG 12 Bits, body in file gdcmJpeg12.cxx - bool gdcm_read_JPEG_file12 (FILE* fp, void* image_buffer); bool gdcm_write_JPEG_file12 (FILE* fp, void* image_buffer, int image_width, int image_height, int quality); - // For JPEG 2000, body in file gdcmJpeg2000.cxx - bool gdcm_read_JPEG2000_file (FILE* fp, void* image_buffer); - - // For Run Length Encoding - bool gdcm_read_RLE_file (FILE* fp, void* image_buffer); -// FIXME : *sure* it's NOT static (C++) -// (would be static in C, or embedded in ADA) -// It's NOT a method, but a not user intended fonction. -// How do we write that in C++ ?) - static int gdcm_read_RLE_fragment(char **areaToRead, long lengthToDecode, - long uncompressedSegmentSize, FILE* fp); - - void SaveInitialValues(); // will belong to the future gdcmPixelData class - void RestoreInitialValues(); // will belong to the future gdcmPixelData class - void DeleteInitialValues(); // will belong to the future gdcmPixelData class + 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 // members variables: - /// \brief Header to use to load the file - gdcmHeader *Header; + /// Header to use to load the file + Header *HeaderInternal; - /// \brief Whether the underlying \ref gdcmHeader was loaded by + /// \brief Whether the underlying \ref Header was loaded by /// the constructor or passed to the constructor. When false /// the destructor is in charge of deletion. bool SelfHeader; @@ -138,20 +114,25 @@ private: /// wether already parsed bool Parsed; - // - // --------------- Will be moved to a gdcmPixelData class - // + /// FIXME + PixelConvert PixelConverter; +// +// --------------- Will be moved to a PixelData class +// /// \brief to hold the Pixels (when read) uint8_t* Pixel_Data; // (was PixelData) - /// \brief Area length to receive the Gray Level pixels + /// \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 Area length to receive the pixels making RGB - /// from Plane R, Plane G, Plane B - /// or from Grey Plane + Palette Color - /// or from YBR Pixels (or from RGB Pixels, as well) + /// \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 + /// - Grey Plane + Palette Color + /// - YBR Pixels (or from RGB Pixels, as well) size_t ImageDataSize; /// \brief ==1 if GetImageDataRaw was used @@ -164,8 +145,6 @@ private: size_t LastAllocatedPixelDataLength; // Initial values of some fields that can be modified during reading process - // (in a future stage, they will be modified just before the writting process - // and restored just after) // if user asked to transform gray level + LUT image into RGB image /// \brief Samples Per Pixel (0x0028,0x0002), as found on disk @@ -176,8 +155,6 @@ private: std::string InitialPlanConfig; // Initial values of some fields that can be modified during reading process - // (in a future stage, they will be modified just before the writting process - // and restored just after) // 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 @@ -186,30 +163,29 @@ private: std::string InitialHighBit; // some DocEntry that can be moved out of the H table during reading process - // (in a future stage, they will be modified just before the writting process - // and restored just after) // 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 - gdcmDocEntry* InitialRedLUTDescr; + DocEntry* InitialRedLUTDescr; /// \brief Green Palette Color Lookup Table Descriptor 0028 1102 as read - gdcmDocEntry* InitialGreenLUTDescr; + DocEntry* InitialGreenLUTDescr; /// \brief Blue Palette Color Lookup Table Descriptor 0028 1103 as read - gdcmDocEntry* InitialBlueLUTDescr; + DocEntry* InitialBlueLUTDescr; /// \brief Red Palette Color Lookup Table Data 0028 1201 as read - gdcmDocEntry* InitialRedLUTData; + DocEntry* InitialRedLUTData; /// \brief Green Palette Color Lookup Table Data 0028 1202 as read - gdcmDocEntry* InitialGreenLUTData; + DocEntry* InitialGreenLUTData; /// \brief Blue Palette Color Lookup Table Data 0028 1203 as read - gdcmDocEntry* InitialBlueLUTData; + DocEntry* InitialBlueLUTData; - // - // --------------- end of future gdcmPixelData class - // +// +// --------------- end of future PixelData class +// }; +} // end namespace gdcm //----------------------------------------------------------------------------- #endif