X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFile.h;h=02eaae758134333b59e2504e727b01e36c82647f;hb=8da9df62c47908e7b9a67238a6c12b92ba6cae7a;hp=a229157f442de84769f8eb1387effe7e590aa53a;hpb=ab62b1a706df8e2ab1fbf26fa5037d6c22293655;p=gdcm.git diff --git a/src/gdcmFile.h b/src/gdcmFile.h index a229157f..02eaae75 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/08/02 16:42:14 $ - Version: $Revision: 1.42 $ + Date: $Date: 2004/11/25 13:12:02 $ + Version: $Revision: 1.77 $ 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,114 +21,160 @@ #include "gdcmCommon.h" #include "gdcmHeader.h" +#include "gdcmPixelConvert.h" +#include "gdcmDocEntryArchive.h" +namespace gdcm +{ //----------------------------------------------------------------------------- /* * In addition to Dicom header exploration, this class is designed * 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 ); + 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 ~gdcmFile(); + virtual ~File(); /// Accessor to \ref Header - gdcmHeader* GetHeader() { return Header; } + Header* GetHeader() { return HeaderInternal; } - void SetPixelDataSizeFromHeader(); size_t GetImageDataSize(); - size_t GetImageDataSizeRaw(); + size_t GetImageDataRawSize(); - void * GetImageData(); - size_t GetImageDataIntoVector(void* destination, size_t maxSize); - void * GetImageDataRaw(); - size_t GetImageDataIntoVectorRaw(void* destination, size_t maxSize); + /// Accessor to \ref PixelConverter + PixelConvert* GetPixelConverter() { return PixelConverter; }; - // 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 ?!? - bool SetImageData (void * data, size_t expectedSize); + uint8_t* GetImageData(); + uint8_t* GetImageDataRaw(); + size_t GetImageDataIntoVector(void* destination, size_t maxSize); - /// \todo When the caller is aware we simply point to the data: - /// int SetImageDataNoCopy (void * Data, size_t ExpectedSize); + // see also Header::SetImageDataSize ?!? + bool SetImageData (uint8_t* 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 - bool WriteRawData (std::string const & fileName); - bool WriteDcmImplVR(std::string const & fileName); - bool WriteDcmExplVR(std::string const & fileName); - bool WriteAcr (std::string const & fileName); + bool WriteRawData (std::string const& fileName); + bool WriteDcmImplVR(std::string const& fileName); + bool WriteDcmExplVR(std::string const& fileName); + bool WriteAcr (std::string const& fileName); + bool Write(std::string const& fileName); - // Don't look any longer for the code : - // It's in file gdcmParsePixels.cxx - bool ParsePixelData(); - - virtual bool SetEntryByNumber(std::string const & content, + 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; } - + 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 WriteBase(std::string const& fileName, FileType type); + bool CheckWriteIntegrity(); -private: - void SwapZone(void* im, int swap, int lgr, int nb); - - bool ReadPixelData(void * destination); - - // For JPEG 8 Bits, body in file gdcmJpeg.cxx - bool gdcm_read_JPEG_file (FILE *fp, void * image_buffer); - static int gdcm_read_RLE_fragment(char **areaToRead, long lengthToDecode, - long uncompressedSegmentSize, FILE *fp); + void SetWriteToNative(); + void SetWriteToDecompressed(); + void SetWriteToRGB(); + void RestoreWrite(); - // For JPEG 12 Bits, body in file gdcmJpeg12.cxx - bool gdcm_read_JPEG_file12 (FILE *fp, void* image_buffer); + void SetWriteFileTypeToACR(); + void SetWriteFileTypeToACRLibido(); + void SetWriteFileTypeToExplicitVR(); + void SetWriteFileTypeToImplicitVR(); + void RestoreWriteFileType(); - // For JPEG 2000, body in file gdcmJpeg2000.cxx - bool gdcm_read_JPEG2000_file (FILE *fp, void* image_buffer); + void SetWriteToLibido(); + void RestoreWriteFromLibido(); - // For Run Length Encoding (TOCHECK) - bool gdcm_read_RLE_file (FILE *fp, void* image_buffer); + ValEntry* CopyValEntry(uint16_t group,uint16_t element); + BinEntry* CopyBinEntry(uint16_t group,uint16_t element); +private: + void Initialise(); + + uint8_t* GetDecompressed(); + int ComputeDecompressedPixelDataSizeFromHeader(); + + void SetPixelData(uint8_t* data); + +private: // 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; + + /// 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) - void* PixelData; - - /// \brief Area length to receive the pixels - size_t ImageDataSizeRaw; + uint8_t* Pixel_Data; // (was PixelData) - /// \brief Area length to receive the RGB pixels - /// from Grey Plane + Palette Color + /// \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 - /// ==0 if GetImageData was used - /// ==-1 if ImageData never read - int PixelRead; +// +// --------------- end of future PixelData class +// - /// wether already parsed - int Parsed; }; +} // end namespace gdcm //----------------------------------------------------------------------------- #endif