X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFile.cxx;h=593a0998dddb740408e43b48807ec1b358e7aefa;hb=8a69df0f4018beae8c78a35bef30590e318128e5;hp=4921affdf3820fe2858911157c0295bcd9f98eaa;hpb=8da9df62c47908e7b9a67238a6c12b92ba6cae7a;p=gdcm.git diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx index 4921affd..593a0998 100644 --- a/src/gdcmFile.cxx +++ b/src/gdcmFile.cxx @@ -1,10 +1,10 @@ - /*========================================================================= +/*========================================================================= Program: gdcm Module: $RCSfile: gdcmFile.cxx,v $ Language: C++ - Date: $Date: 2004/11/25 13:12:02 $ - Version: $Revision: 1.164 $ + Date: $Date: 2005/01/16 04:50:42 $ + Version: $Revision: 1.193 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -17,10 +17,17 @@ =========================================================================*/ #include "gdcmFile.h" +#include "gdcmGlobal.h" +#include "gdcmTS.h" #include "gdcmDocument.h" #include "gdcmDebug.h" #include "gdcmUtil.h" #include "gdcmBinEntry.h" +#include "gdcmHeader.h" +#include "gdcmPixelReadConvert.h" +#include "gdcmPixelWriteConvert.h" +#include "gdcmDocEntryArchive.h" + #include namespace gdcm @@ -29,6 +36,26 @@ typedef std::pair IterHT; //------------------------------------------------------------------------- // Constructor / Destructor +/** + * \brief Constructor dedicated to deal with the *pixels* area of a ACR/DICOMV3 + * file (Header only deals with the ... header) + * Opens (in read only and when possible) an existing file and checks + * for DICOM compliance. Returns NULL on failure. + * It will be up to the user to load the pixels into memory + * (see GetImageData, GetImageDataRaw) + * \note the in-memory representation of all available tags found in + * the DICOM header is post-poned to first header information access. + * This avoid a double parsing of public part of the header when + * one sets an a posteriori shadow dictionary (efficiency can be + * seen as a side effect). + */ +File::File( ) +{ + HeaderInternal = new Header( ); + SelfHeader = true; + Initialise(); +} + /** * \brief Constructor dedicated to deal with the *pixels* area of a ACR/DICOMV3 * file (Header only deals with the ... header) @@ -71,26 +98,6 @@ File::File(std::string const & filename ) Initialise(); } -/** - * \brief Factorization for various forms of constructors. - */ -void File::Initialise() -{ - WriteMode = WMODE_DECOMPRESSED; - WriteType = WTYPE_IMPL_VR; - - PixelConverter = new PixelConvert; - Archive = new DocEntryArchive( HeaderInternal ); - - if ( HeaderInternal->IsReadable() ) - { - PixelConverter->GrabInformationsFromHeader( HeaderInternal ); - } - - Pixel_Data = 0; - ImageDataSize = 0; -} - /** * \brief canonical destructor * \note If the Header was created by the File constructor, @@ -98,9 +105,13 @@ void File::Initialise() */ File::~File() { - if( PixelConverter ) + if( PixelReadConverter ) { - delete PixelConverter; + delete PixelReadConverter; + } + if( PixelWriteConverter ) + { + delete PixelWriteConverter; } if( Archive ) { @@ -116,31 +127,50 @@ File::~File() //----------------------------------------------------------------------------- // Print +void File::Print(std::ostream &os, std::string const &) +{ + HeaderInternal->SetPrintLevel(PrintLevel); + HeaderInternal->Print(os); + + PixelReadConverter->SetPrintLevel(PrintLevel); + PixelReadConverter->Print(os); +} //----------------------------------------------------------------------------- // Public /** * \brief Get the size of the image data - * * If the image can be RGB (with a lut or by default), the size * corresponds to the RGB image + * (use GetImageDataRawSize if you want to be sure to get *only* + * the size of the pixels) * @return The image size */ size_t File::GetImageDataSize() { - return PixelConverter->GetRGBSize(); + if ( PixelWriteConverter->GetUserData() ) + { + return PixelWriteConverter->GetUserDataSize(); + } + + return PixelReadConverter->GetRGBSize(); } /** * \brief Get the size of the image data - * - * If the image can be RGB by transformation in a LUT, this - * transformation isn't considered + * If the image could be converted to RGB using a LUT, + * this transformation is not taken into account by GetImageDataRawSize + * (use GetImageDataSize if you wish) * @return The raw image size */ size_t File::GetImageDataRawSize() { - return PixelConverter->GetDecompressedSize(); + if ( PixelWriteConverter->GetUserData() ) + { + return PixelWriteConverter->GetUserDataSize(); + } + + return PixelReadConverter->GetRawSize(); } /** @@ -153,25 +183,44 @@ size_t File::GetImageDataRawSize() * @return Pointer to newly allocated pixel data. * NULL if alloc fails */ -uint8_t* File::GetImageData() +uint8_t *File::GetImageData() { - if ( ! GetDecompressed() ) + if ( PixelWriteConverter->GetUserData() ) + { + return PixelWriteConverter->GetUserData(); + } + + if ( ! GetRaw() ) { // If the decompression failed nothing can be done. return 0; } - if ( HeaderInternal->HasLUT() && PixelConverter->BuildRGBImage() ) + if ( HeaderInternal->HasLUT() && PixelReadConverter->BuildRGBImage() ) { - return PixelConverter->GetRGB(); + return PixelReadConverter->GetRGB(); } else { - // When no LUT or LUT conversion fails, return the decompressed - return PixelConverter->GetDecompressed(); + // When no LUT or LUT conversion fails, return the Raw + return PixelReadConverter->GetRaw(); } } +/** + * \brief Allocates necessary memory, + * Transforms YBR pixels (if any) into RGB pixels + * Transforms 3 planes R, G, B (if any) into a single RGB Plane + * Copies the pixel data (image[s]/volume[s]) to newly allocated zone. + * DOES NOT transform Grey plane + 3 Palettes into a RGB Plane + * @return Pointer to newly allocated pixel data. + * \ NULL if alloc fails + */ +uint8_t *File::GetImageDataRaw () +{ + return GetRaw(); +} + /** * \brief * Read the pixels from disk (uncompress if necessary), @@ -197,80 +246,41 @@ uint8_t* File::GetImageData() * @return On success, the number of bytes actually copied. Zero on * failure e.g. MaxSize is lower than necessary. */ -size_t File::GetImageDataIntoVector (void* destination, size_t maxSize) +size_t File::GetImageDataIntoVector (void *destination, size_t maxSize) { - if ( ! GetDecompressed() ) + if ( ! GetRaw() ) { // If the decompression failed nothing can be done. return 0; } - if ( HeaderInternal->HasLUT() && PixelConverter->BuildRGBImage() ) + if ( HeaderInternal->HasLUT() && PixelReadConverter->BuildRGBImage() ) { - if ( PixelConverter->GetRGBSize() > maxSize ) + if ( PixelReadConverter->GetRGBSize() > maxSize ) { - dbg.Verbose(0, "File::GetImageDataIntoVector: pixel data bigger" - "than caller's expected MaxSize"); + gdcmVerboseMacro( "Pixel data bigger than caller's expected MaxSize"); return 0; } memcpy( destination, - (void*)PixelConverter->GetRGB(), - PixelConverter->GetRGBSize() ); - return PixelConverter->GetRGBSize(); + (void*)PixelReadConverter->GetRGB(), + PixelReadConverter->GetRGBSize() ); + return PixelReadConverter->GetRGBSize(); } // Either no LUT conversion necessary or LUT conversion failed - if ( PixelConverter->GetDecompressedSize() > maxSize ) + if ( PixelReadConverter->GetRawSize() > maxSize ) { - dbg.Verbose(0, "File::GetImageDataIntoVector: pixel data bigger" - "than caller's expected MaxSize"); + gdcmVerboseMacro( "Pixel data bigger than caller's expected MaxSize"); return 0; } memcpy( destination, - (void*)PixelConverter->GetDecompressed(), - PixelConverter->GetDecompressedSize() ); - return PixelConverter->GetDecompressedSize(); -} - -/** - * \brief Allocates necessary memory, - * Transforms YBR pixels (if any) into RGB pixels - * Transforms 3 planes R, G, B (if any) into a single RGB Plane - * Copies the pixel data (image[s]/volume[s]) to newly allocated zone. - * DOES NOT transform Grey plane + 3 Palettes into a RGB Plane - * @return Pointer to newly allocated pixel data. - * \ NULL if alloc fails - */ -uint8_t* File::GetImageDataRaw () -{ - return GetDecompressed(); -} - -uint8_t* File::GetDecompressed() -{ - uint8_t* decompressed = PixelConverter->GetDecompressed(); - if ( ! decompressed ) - { - // The decompressed image migth not be loaded yet: - std::ifstream* fp = HeaderInternal->OpenFile(); - PixelConverter->ReadAndDecompressPixelData( fp ); - if(fp) - HeaderInternal->CloseFile(); - - decompressed = PixelConverter->GetDecompressed(); - if ( ! decompressed ) - { - dbg.Verbose(0, "File::GetDecompressed: read/decompress of " - "pixel data apparently went wrong."); - return 0; - } - } - - return decompressed; + (void*)PixelReadConverter->GetRaw(), + PixelReadConverter->GetRawSize() ); + return PixelReadConverter->GetRawSize(); } /** - * \brief Points the internal Pixel_Data pointer to the callers inData + * \brief Points the internal pointer to the callers inData * image representation, BUT WITHOUT COPYING THE DATA. * 'image' Pixels are presented as C-like 2D arrays : line per line. * 'volume'Pixels are presented as C-like 3D arrays : plane per plane @@ -282,13 +292,72 @@ uint8_t* File::GetDecompressed() * * @return boolean */ -bool File::SetImageData(uint8_t* inData, size_t expectedSize) +void File::SetImageData(uint8_t *inData, size_t expectedSize) { -// FIXME : if already allocated, memory leak ! - Pixel_Data = inData; - ImageDataSize = expectedSize; -// FIXME : 7fe0, 0010 IS NOT set ... - return true; + SetUserData(inData,expectedSize); +} + +/** + * \brief Set the image datas defined by the user + * \warning When writting the file, this datas are get as default datas to write + */ +void File::SetUserData(uint8_t *data, size_t expectedSize) +{ + PixelWriteConverter->SetUserData(data,expectedSize); +} + +/** + * \brief Get the image datas defined by the user + * \warning When writting the file, this datas are get as default data to write + */ +uint8_t *File::GetUserData() +{ + return PixelWriteConverter->GetUserData(); +} + +/** + * \brief Get the image data size defined by the user + * \warning When writting the file, this datas are get as default data to write + */ +size_t File::GetUserDataSize() +{ + return PixelWriteConverter->GetUserDataSize(); +} + +/** + * \brief Get the image datas from the file. + * If a LUT is found, the data are expanded to be RGB + */ +uint8_t *File::GetRGBData() +{ + return PixelReadConverter->GetRGB(); +} + +/** + * \brief Get the image data size from the file. + * If a LUT is found, the data are expanded to be RGB + */ +size_t File::GetRGBDataSize() +{ + return PixelReadConverter->GetRGBSize(); +} + +/** + * \brief Get the image datas from the file. + * If a LUT is found, the datas are not expanded ! + */ +uint8_t *File::GetRawData() +{ + return PixelReadConverter->GetRaw(); +} + +/** + * \brief Get the image data size from the file. + * If a LUT is found, the data are not expanded ! + */ +size_t File::GetRawDataSize() +{ + return PixelReadConverter->GetRawSize(); } /** @@ -300,15 +369,35 @@ bool File::SetImageData(uint8_t* inData, size_t expectedSize) * @return false if write fails */ -bool File::WriteRawData(std::string const & fileName) +bool File::WriteRawData(std::string const &fileName) { std::ofstream fp1(fileName.c_str(), std::ios::out | std::ios::binary ); if (!fp1) { - dbg.Verbose(2, "Fail to open (write) file:", fileName.c_str()); + gdcmVerboseMacro( "Fail to open (write) file:" << fileName.c_str()); return false; } - fp1.write((char*)Pixel_Data, ImageDataSize); + + if( PixelWriteConverter->GetUserData() ) + { + fp1.write( (char*)PixelWriteConverter->GetUserData(), + PixelWriteConverter->GetUserDataSize() ); + } + else if ( PixelReadConverter->GetRGB() ) + { + fp1.write( (char*)PixelReadConverter->GetRGB(), + PixelReadConverter->GetRGBSize()); + } + else if ( PixelReadConverter->GetRaw() ) + { + fp1.write( (char*)PixelReadConverter->GetRaw(), + PixelReadConverter->GetRawSize()); + } + else + { + gdcmErrorMacro( "Nothing written." ); + } + fp1.close(); return true; @@ -323,7 +412,7 @@ bool File::WriteRawData(std::string const & fileName) * @return false if write fails */ -bool File::WriteDcmImplVR (std::string const & fileName) +bool File::WriteDcmImplVR (std::string const &fileName) { SetWriteTypeToDcmImplVR(); return Write(fileName); @@ -332,12 +421,13 @@ bool File::WriteDcmImplVR (std::string const & fileName) /** * \brief Writes on disk A SINGLE Dicom file, * using the Explicit Value Representation convention - * NO test is performed on processor "Endiannity". * @param fileName name of the file to be created + * NO test is performed on processor "Endiannity". + * @param fileName name of the file to be created * (any already existing file is overwritten) * @return false if write fails */ -bool File::WriteDcmExplVR (std::string const & fileName) +bool File::WriteDcmExplVR (std::string const &fileName) { SetWriteTypeToDcmExplVR(); return Write(fileName); @@ -357,47 +447,21 @@ bool File::WriteDcmExplVR (std::string const & fileName) * @return false if write fails */ -bool File::WriteAcr (std::string const & fileName) +bool File::WriteAcr (std::string const &fileName) { SetWriteTypeToAcr(); return Write(fileName); } -bool File::Write(std::string const& fileName) -{ - switch(WriteType) - { - case WTYPE_IMPL_VR: - return WriteBase(fileName,ImplicitVR); - case WTYPE_EXPL_VR: - return WriteBase(fileName,ExplicitVR); - case WTYPE_ACR: - return WriteBase(fileName,ACR); - } - return(false); -} - /** - * \brief Access to the underlying \ref PixelConverter RGBA LUT - */ -uint8_t* File::GetLutRGBA() -{ - return PixelConverter->GetLutRGBA(); -} - -//----------------------------------------------------------------------------- -// Protected -/** - * \brief NOT a end user inteded function - * (used by WriteDcmExplVR, WriteDcmImplVR, WriteAcr, etc) + * \brief Writes on disk A SINGLE Dicom file, * @param fileName name of the file to be created * (any already existing file is overwritten) - * @param type file type (ExplicitVR, ImplicitVR, ...) * @return false if write fails */ -bool File::WriteBase (std::string const & fileName, FileType type) +bool File::Write(std::string const &fileName) { - switch(type) + switch(WriteType) { case ImplicitVR: SetWriteFileTypeToImplicitVR(); @@ -406,24 +470,11 @@ bool File::WriteBase (std::string const & fileName, FileType type) SetWriteFileTypeToExplicitVR(); break; case ACR: - SetWriteFileTypeToACR(); - break; case ACR_LIBIDO: - SetWriteFileTypeToACRLibido(); - break; - } - - switch(WriteMode) - { - case WMODE_NATIVE : - SetWriteToNative(); - break; - case WMODE_DECOMPRESSED : - SetWriteToDecompressed(); - break; - case WMODE_RGB : - SetWriteToRGB(); + SetWriteFileTypeToACR(); break; + default: + SetWriteFileTypeToExplicitVR(); } // -------------------------------------------------------------- @@ -434,35 +485,118 @@ bool File::WriteBase (std::string const & fileName, FileType type) // just before writting ... /// \todo the best trick would be *change* the recognition code /// but pb expected if user deals with, e.g. COMPLEX images -/* if ( HeaderInternal->GetFileType() == ACR_LIBIDO) + if( WriteType == ACR_LIBIDO ) { SetWriteToLibido(); - }*/ + } + else + { + SetWriteToNoLibido(); + } // ----------------- End of Special Patch ---------------- + + switch(WriteMode) + { + case WMODE_RAW : + SetWriteToRaw(); + break; + case WMODE_RGB : + SetWriteToRGB(); + break; + } bool check = CheckWriteIntegrity(); if(check) { - check = HeaderInternal->Write(fileName,type); + check = HeaderInternal->Write(fileName,WriteType); } + RestoreWrite(); + RestoreWriteFileType(); + // -------------------------------------------------------------- // Special Patch to allow gdcm to re-write ACR-LibIDO formated images // // ...and we restore the Header to be Dicom Compliant again // just after writting -/* if ( HeaderInternal->GetFileType() == ACR_LIBIDO ) - { - RestoreWriteFromLibido(); - }*/ + RestoreWriteOfLibido(); // ----------------- End of Special Patch ---------------- - RestoreWrite(); - RestoreWriteFileType(); - return check; } +/** + * \brief Accesses an existing DocEntry (i.e. a Dicom Element) + * through it's (group, element) and modifies it's content with + * the given value. + * @param content new value (string) to substitute with + * @param group group number of the Dicom Element to modify + * @param elem element number of the Dicom Element to modify + */ +bool File::SetEntry(std::string const &content, + uint16_t group, uint16_t elem) +{ + return HeaderInternal->SetEntry(content,group,elem); +} + + +/** + * \brief Accesses an existing DocEntry (i.e. a Dicom Element) + * through it's (group, element) and modifies it's content with + * the given value. + * @param content new value (void* -> uint8_t*) to substitute with + * @param lgth new value length + * @param group group number of the Dicom Element to modify + * @param elem element number of the Dicom Element to modify + */ +bool File::SetEntry(uint8_t *content, int lgth, + uint16_t group, uint16_t elem) +{ + return HeaderInternal->SetEntry(content,lgth,group,elem); +} + +/** + * \brief Modifies the value of a given Doc Entry (Dicom Element) + * when it exists. Create it with the given value when unexistant. + * @param content (string) Value to be set + * @param group Group number of the Entry + * @param elem Element number of the Entry + * \return pointer to the modified/created Header Entry (NULL when creation + * failed). + */ +bool File::ReplaceOrCreate(std::string const &content, + uint16_t group, uint16_t elem) +{ + return HeaderInternal->ReplaceOrCreate(content,group,elem) != NULL; +} + +/* + * \brief Modifies the value of a given Header Entry (Dicom Element) + * when it exists. Create it with the given value when unexistant. + * A copy of the binArea is made to be kept in the Document. + * @param binArea (binary) value to be set + * @param group Group number of the Entry + * @param elem Element number of the Entry + * \return pointer to the modified/created Header Entry (NULL when creation + * failed). + */ +bool File::ReplaceOrCreate(uint8_t *binArea, int lgth, + uint16_t group, uint16_t elem) +{ + return HeaderInternal->ReplaceOrCreate(binArea,lgth,group,elem) != NULL; +} + +/** + * \brief Access to the underlying \ref PixelReadConverter RGBA LUT + */ +uint8_t* File::GetLutRGBA() +{ + return PixelReadConverter->GetLutRGBA(); +} + +//----------------------------------------------------------------------------- +// Protected + /** * \brief Check the write integrity * @@ -473,7 +607,7 @@ bool File::WriteBase (std::string const & fileName, FileType type) */ bool File::CheckWriteIntegrity() { - if(Pixel_Data) + if(PixelWriteConverter->GetUserData()) { int numberBitsAllocated = HeaderInternal->GetBitsAllocated(); if ( numberBitsAllocated == 0 || numberBitsAllocated == 12 ) @@ -481,32 +615,30 @@ bool File::CheckWriteIntegrity() numberBitsAllocated = 16; } - int decSize = HeaderInternal->GetXSize() + size_t decSize = HeaderInternal->GetXSize() * HeaderInternal->GetYSize() * HeaderInternal->GetZSize() * ( numberBitsAllocated / 8 ) * HeaderInternal->GetSamplesPerPixel(); - int rgbSize = decSize; + size_t rgbSize = decSize; if( HeaderInternal->HasLUT() ) rgbSize = decSize * 3; switch(WriteMode) { - case WMODE_NATIVE : - break; - case WMODE_DECOMPRESSED : - if( decSize!=ImageDataSize ) + case WMODE_RAW : + if( decSize!=PixelWriteConverter->GetUserDataSize() ) { - dbg.Verbose(0, "File::CheckWriteIntegrity: Data size is incorrect"); - //std::cerr<<"Dec : "<GetUserDataSize() ); return false; } break; case WMODE_RGB : - if( rgbSize!=ImageDataSize ) + if( rgbSize!=PixelWriteConverter->GetUserDataSize() ) { - dbg.Verbose(0, "File::CheckWriteIntegrity: Data size is incorrect"); - //std::cerr<<"RGB : "<GetUserDataSize() ); return false; } break; @@ -516,51 +648,33 @@ bool File::CheckWriteIntegrity() return true; } -void File::SetWriteToNative() +void File::SetWriteToRaw() { - if(Pixel_Data) - { - BinEntry* pixel = CopyBinEntry(GetHeader()->GetGrPixel(),GetHeader()->GetNumPixel()); - pixel->SetValue(GDCM_BINLOADED); - pixel->SetBinArea(Pixel_Data,false); - pixel->SetLength(ImageDataSize); - - Archive->Push(pixel); - } -} - -void File::SetWriteToDecompressed() -{ - if(HeaderInternal->GetNumberOfScalarComponents()==3 && !HeaderInternal->HasLUT()) + if( HeaderInternal->GetNumberOfScalarComponents() == 3 + && !HeaderInternal->HasLUT()) { SetWriteToRGB(); } else { - ValEntry* photInt = CopyValEntry(0x0028,0x0004); + ValEntry *photInt = CopyValEntry(0x0028,0x0004); if(HeaderInternal->HasLUT()) { photInt->SetValue("PALETTE COLOR "); - photInt->SetLength(14); } else { photInt->SetValue("MONOCHROME1 "); - photInt->SetLength(12); } - BinEntry* pixel = CopyBinEntry(GetHeader()->GetGrPixel(),GetHeader()->GetNumPixel()); + PixelWriteConverter->SetReadData(PixelReadConverter->GetRaw(), + PixelReadConverter->GetRawSize()); + + BinEntry *pixel = + CopyBinEntry(GetHeader()->GetGrPixel(),GetHeader()->GetNumPixel()); pixel->SetValue(GDCM_BINLOADED); - if(Pixel_Data) - { - pixel->SetBinArea(Pixel_Data,false); - pixel->SetLength(ImageDataSize); - } - else - { - pixel->SetBinArea(PixelConverter->GetDecompressed(),false); - pixel->SetLength(PixelConverter->GetDecompressedSize()); - } + pixel->SetBinArea(PixelWriteConverter->GetData(),false); + pixel->SetLength(PixelWriteConverter->GetDataSize()); Archive->Push(photInt); Archive->Push(pixel); @@ -571,38 +685,34 @@ void File::SetWriteToRGB() { if(HeaderInternal->GetNumberOfScalarComponents()==3) { - PixelConverter->BuildRGBImage(); + PixelReadConverter->BuildRGBImage(); - ValEntry* spp = CopyValEntry(0x0028,0x0002); + ValEntry *spp = CopyValEntry(0x0028,0x0002); spp->SetValue("3 "); - spp->SetLength(2); - ValEntry* planConfig = CopyValEntry(0x0028,0x0006); + ValEntry *planConfig = CopyValEntry(0x0028,0x0006); planConfig->SetValue("0 "); - planConfig->SetLength(2); - ValEntry* photInt = CopyValEntry(0x0028,0x0004); + ValEntry *photInt = CopyValEntry(0x0028,0x0004); photInt->SetValue("RGB "); - photInt->SetLength(4); - BinEntry* pixel = CopyBinEntry(GetHeader()->GetGrPixel(),GetHeader()->GetNumPixel()); - pixel->SetValue(GDCM_BINLOADED); - if(Pixel_Data) + if(PixelReadConverter->GetRGB()) { - pixel->SetBinArea(Pixel_Data,false); - pixel->SetLength(ImageDataSize); + PixelWriteConverter->SetReadData(PixelReadConverter->GetRGB(), + PixelReadConverter->GetRGBSize()); } - else if(PixelConverter->GetRGB()) + else // Raw data { - pixel->SetBinArea(PixelConverter->GetRGB(),false); - pixel->SetLength(PixelConverter->GetRGBSize()); - } - else // Decompressed data - { - pixel->SetBinArea(PixelConverter->GetDecompressed(),false); - pixel->SetLength(PixelConverter->GetDecompressedSize()); + PixelWriteConverter->SetReadData(PixelReadConverter->GetRaw(), + PixelReadConverter->GetRawSize()); } + BinEntry *pixel = + CopyBinEntry(GetHeader()->GetGrPixel(),GetHeader()->GetNumPixel()); + pixel->SetValue(GDCM_BINLOADED); + pixel->SetBinArea(PixelWriteConverter->GetData(),false); + pixel->SetLength(PixelWriteConverter->GetDataSize()); + Archive->Push(spp); Archive->Push(planConfig); Archive->Push(photInt); @@ -621,17 +731,14 @@ void File::SetWriteToRGB() // samples per pixels = 1 (in the read file) if(HeaderInternal->GetBitsAllocated()==24) { - ValEntry* bitsAlloc = CopyValEntry(0x0028,0x0100); + ValEntry *bitsAlloc = CopyValEntry(0x0028,0x0100); bitsAlloc->SetValue("8 "); - bitsAlloc->SetLength(2); - ValEntry* bitsStored = CopyValEntry(0x0028,0x0101); + ValEntry *bitsStored = CopyValEntry(0x0028,0x0101); bitsStored->SetValue("8 "); - bitsStored->SetLength(2); - ValEntry* highBit = CopyValEntry(0x0028,0x0102); + ValEntry *highBit = CopyValEntry(0x0028,0x0102); highBit->SetValue("7 "); - highBit->SetLength(2); Archive->Push(bitsAlloc); Archive->Push(bitsStored); @@ -640,7 +747,7 @@ void File::SetWriteToRGB() } else { - SetWriteToDecompressed(); + SetWriteToRaw(); } } @@ -670,31 +777,26 @@ void File::SetWriteFileTypeToACR() Archive->Push(0x0002,0x0010); } -void File::SetWriteFileTypeToACRLibido() -{ - SetWriteFileTypeToACR(); -} - void File::SetWriteFileTypeToExplicitVR() { - std::string ts = - Util::DicomString( TransferSyntaxStrings[ExplicitVRLittleEndian] ); + std::string ts = Util::DicomString( + Global::GetTS()->GetSpecialTransferSyntax(TS::ExplicitVRLittleEndian) ); - ValEntry* tss = CopyValEntry(0x0002,0x0010); + ValEntry *tss = CopyValEntry(0x0002,0x0010); tss->SetValue(ts); - tss->SetLength(ts.length()); Archive->Push(tss); } void File::SetWriteFileTypeToImplicitVR() { - std::string ts = - Util::DicomString( TransferSyntaxStrings[ImplicitVRLittleEndian] ); + std::string ts = Util::DicomString( + Global::GetTS()->GetSpecialTransferSyntax(TS::ImplicitVRLittleEndian) ); - ValEntry* tss = CopyValEntry(0x0002,0x0010); + ValEntry *tss = CopyValEntry(0x0002,0x0010); tss->SetValue(ts); - tss->SetLength(ts.length()); + + Archive->Push(tss); } void File::RestoreWriteFileType() @@ -704,8 +806,10 @@ void File::RestoreWriteFileType() void File::SetWriteToLibido() { - ValEntry *oldRow = dynamic_cast(HeaderInternal->GetDocEntryByNumber(0x0028, 0x0010)); - ValEntry *oldCol = dynamic_cast(HeaderInternal->GetDocEntryByNumber(0x0028, 0x0011)); + ValEntry *oldRow = dynamic_cast + (HeaderInternal->GetDocEntry(0x0028, 0x0010)); + ValEntry *oldCol = dynamic_cast + (HeaderInternal->GetDocEntry(0x0028, 0x0011)); if( oldRow && oldCol ) { @@ -723,18 +827,38 @@ void File::SetWriteToLibido() Archive->Push(newRow); Archive->Push(newCol); } + + ValEntry *libidoCode = CopyValEntry(0x0008,0x0010); + libidoCode->SetValue("ACRNEMA_LIBIDO_1.1"); + Archive->Push(libidoCode); +} + +void File::SetWriteToNoLibido() +{ + ValEntry *recCode = dynamic_cast + (HeaderInternal->GetDocEntry(0x0008,0x0010)); + if( recCode ) + { + if( recCode->GetValue() == "ACRNEMA_LIBIDO_1.1" ) + { + ValEntry *libidoCode = CopyValEntry(0x0008,0x0010); + libidoCode->SetValue(""); + Archive->Push(libidoCode); + } + } } -void File::RestoreWriteFromLibido() +void File::RestoreWriteOfLibido() { Archive->Restore(0x0028,0x0010); Archive->Restore(0x0028,0x0011); + Archive->Restore(0x0008,0x0010); } -ValEntry* File::CopyValEntry(uint16_t group,uint16_t element) +ValEntry *File::CopyValEntry(uint16_t group,uint16_t elem) { - DocEntry* oldE = HeaderInternal->GetDocEntryByNumber(group, element); - ValEntry* newE; + DocEntry *oldE = HeaderInternal->GetDocEntry(group, elem); + ValEntry *newE; if(oldE) { @@ -743,16 +867,16 @@ ValEntry* File::CopyValEntry(uint16_t group,uint16_t element) } else { - newE = GetHeader()->NewValEntryByNumber(group,element); + newE = GetHeader()->NewValEntry(group,elem); } - return(newE); + return newE; } -BinEntry* File::CopyBinEntry(uint16_t group,uint16_t element) +BinEntry *File::CopyBinEntry(uint16_t group,uint16_t elem) { - DocEntry* oldE = HeaderInternal->GetDocEntryByNumber(group, element); - BinEntry* newE; + DocEntry *oldE = HeaderInternal->GetDocEntry(group, elem); + BinEntry *newE; if(oldE) { @@ -761,33 +885,57 @@ BinEntry* File::CopyBinEntry(uint16_t group,uint16_t element) } else { - newE = GetHeader()->NewBinEntryByNumber(group,element); + newE = GetHeader()->NewBinEntry(group,elem); } - - return(newE); + return newE; } //----------------------------------------------------------------------------- -// Private +// Protected /** - * \brief Set the pixel datas in the good entry of the Header + * \brief Factorization for various forms of constructors. */ -void File::SetPixelData(uint8_t* data) +void File::Initialise() { - GetHeader()->SetEntryByNumber( GDCM_BINLOADED, - GetHeader()->GetGrPixel(), GetHeader()->GetNumPixel()); + WriteMode = WMODE_RAW; + WriteType = ExplicitVR; + + PixelReadConverter = new PixelReadConvert; + PixelWriteConverter = new PixelWriteConvert; + Archive = new DocEntryArchive( HeaderInternal ); - // Will be 7fe0, 0010 in standard case - DocEntry* currentEntry = GetHeader()->GetDocEntryByNumber(GetHeader()->GetGrPixel(), GetHeader()->GetNumPixel()); - if ( currentEntry ) + if ( HeaderInternal->IsReadable() ) + { + PixelReadConverter->GrabInformationsFromHeader( HeaderInternal ); + } +} + +uint8_t *File::GetRaw() +{ + uint8_t *raw = PixelReadConverter->GetRaw(); + if ( ! raw ) { - if ( BinEntry* binEntry = dynamic_cast(currentEntry) ) - // Flag is to false because datas are kept in the gdcmPixelConvert - binEntry->SetBinArea( data, false ); + // The Raw image migth not be loaded yet: + std::ifstream *fp = HeaderInternal->OpenFile(); + PixelReadConverter->ReadAndDecompressPixelData( fp ); + if(fp) + HeaderInternal->CloseFile(); + + raw = PixelReadConverter->GetRaw(); + if ( ! raw ) + { + gdcmVerboseMacro( "Read/decompress of pixel data apparently went wrong."); + return 0; + } } + + return raw; } +//----------------------------------------------------------------------------- +// Private + //----------------------------------------------------------------------------- } // end namespace gdcm