X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFile.cxx;h=c90075b193da78cdfe5435632a9641c20d2b2717;hb=d00078b5e19310b379c8339fa8fe38362e8ca392;hp=f582c483d5074b45d051bc97d5c7a68689322d05;hpb=5d1776a78fb7d94a8325a00e438f7be82c16053c;p=gdcm.git diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx index f582c483..c90075b1 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/12/03 11:55:38 $ - Version: $Revision: 1.169 $ + Date: $Date: 2005/01/20 16:17:00 $ + Version: $Revision: 1.194 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -16,11 +16,18 @@ =========================================================================*/ -#include "gdcmFile.h" +#include "gdcmFileHelper.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). + */ +FileHelper::FileHelper( ) +{ + 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) @@ -43,7 +70,7 @@ typedef std::pair IterHT; * seen as a side effect). * @param header already built Header */ -File::File(Header *header) +FileHelper::FileHelper(Header *header) { HeaderInternal = header; SelfHeader = false; @@ -64,37 +91,19 @@ File::File(Header *header) * seen as a side effect). * @param filename file to be opened for parsing */ -File::File(std::string const & filename ) +FileHelper::FileHelper(std::string const & filename ) { HeaderInternal = new Header( filename ); SelfHeader = true; Initialise(); } -/** - * \brief Factorization for various forms of constructors. - */ -void File::Initialise() -{ - WriteMode = WMODE_DECOMPRESSED; - WriteType = WTYPE_IMPL_VR; - - PixelReadConverter = new PixelReadConvert; - PixelWriteConverter = new PixelWriteConvert; - Archive = new DocEntryArchive( HeaderInternal ); - - if ( HeaderInternal->IsReadable() ) - { - PixelReadConverter->GrabInformationsFromHeader( HeaderInternal ); - } -} - /** * \brief canonical destructor - * \note If the Header was created by the File constructor, - * it is destroyed by the File + * \note If the header (gdcm::File) was created by the FileHelper constructor, + * it is destroyed by the FileHelper */ -File::~File() +FileHelper::~FileHelper() { if( PixelReadConverter ) { @@ -118,31 +127,50 @@ File::~File() //----------------------------------------------------------------------------- // Print +void FileHelper::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() +size_t FileHelper::GetImageDataSize() { + 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() +size_t FileHelper::GetImageDataRawSize() { - return PixelReadConverter->GetDecompressedSize(); + if ( PixelWriteConverter->GetUserData() ) + { + return PixelWriteConverter->GetUserDataSize(); + } + + return PixelReadConverter->GetRawSize(); } /** @@ -155,9 +183,14 @@ size_t File::GetImageDataRawSize() * @return Pointer to newly allocated pixel data. * NULL if alloc fails */ -uint8_t* File::GetImageData() +uint8_t *FileHelper::GetImageData() { - if ( ! GetDecompressed() ) + if ( PixelWriteConverter->GetUserData() ) + { + return PixelWriteConverter->GetUserData(); + } + + if ( ! GetRaw() ) { // If the decompression failed nothing can be done. return 0; @@ -169,11 +202,25 @@ uint8_t* File::GetImageData() } else { - // When no LUT or LUT conversion fails, return the decompressed - return PixelReadConverter->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 *FileHelper::GetImageDataRaw () +{ + return GetRaw(); +} + /** * \brief * Read the pixels from disk (uncompress if necessary), @@ -199,9 +246,9 @@ 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 FileHelper::GetImageDataIntoVector (void *destination, size_t maxSize) { - if ( ! GetDecompressed() ) + if ( ! GetRaw() ) { // If the decompression failed nothing can be done. return 0; @@ -211,8 +258,7 @@ size_t File::GetImageDataIntoVector (void* destination, size_t 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, @@ -222,53 +268,15 @@ size_t File::GetImageDataIntoVector (void* destination, size_t maxSize) } // Either no LUT conversion necessary or LUT conversion failed - if ( PixelReadConverter->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*)PixelReadConverter->GetDecompressed(), - PixelReadConverter->GetDecompressedSize() ); - return PixelReadConverter->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 = PixelReadConverter->GetDecompressed(); - if ( ! decompressed ) - { - // The decompressed image migth not be loaded yet: - std::ifstream* fp = HeaderInternal->OpenFile(); - PixelReadConverter->ReadAndDecompressPixelData( fp ); - if(fp) - HeaderInternal->CloseFile(); - - decompressed = PixelReadConverter->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(); } /** @@ -284,11 +292,72 @@ uint8_t* File::GetDecompressed() * * @return boolean */ -bool File::SetImageData(uint8_t* inData, size_t expectedSize) +void FileHelper::SetImageData(uint8_t *inData, size_t expectedSize) { - PixelWriteConverter->SetUserData(inData,expectedSize); + SetUserData(inData,expectedSize); +} - return true; +/** + * \brief Set the image datas defined by the user + * \warning When writting the file, this datas are get as default datas to write + */ +void FileHelper::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 *FileHelper::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 FileHelper::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 *FileHelper::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 FileHelper::GetRGBDataSize() +{ + return PixelReadConverter->GetRGBSize(); +} + +/** + * \brief Get the image datas from the file. + * If a LUT is found, the datas are not expanded ! + */ +uint8_t *FileHelper::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 FileHelper::GetRawDataSize() +{ + return PixelReadConverter->GetRawSize(); } /** @@ -300,21 +369,34 @@ bool File::SetImageData(uint8_t* inData, size_t expectedSize) * @return false if write fails */ -bool File::WriteRawData(std::string const & fileName) +bool FileHelper::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; } - if(PixelWriteConverter->GetUserData()) - fp1.write((char*)PixelWriteConverter->GetUserData(), PixelWriteConverter->GetUserDataSize()); - else if(PixelReadConverter->GetRGB()) - fp1.write((char*)PixelReadConverter->GetRGB(), PixelReadConverter->GetRGBSize()); - else if(PixelReadConverter->GetDecompressed()) - fp1.write((char*)PixelReadConverter->GetDecompressed(), PixelReadConverter->GetDecompressedSize()); + 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(); @@ -330,7 +412,7 @@ bool File::WriteRawData(std::string const & fileName) * @return false if write fails */ -bool File::WriteDcmImplVR (std::string const & fileName) +bool FileHelper::WriteDcmImplVR (std::string const &fileName) { SetWriteTypeToDcmImplVR(); return Write(fileName); @@ -339,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 FileHelper::WriteDcmExplVR (std::string const &fileName) { SetWriteTypeToDcmExplVR(); return Write(fileName); @@ -364,47 +447,21 @@ bool File::WriteDcmExplVR (std::string const & fileName) * @return false if write fails */ -bool File::WriteAcr (std::string const & fileName) +bool FileHelper::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 PixelReadConverter RGBA LUT - */ -uint8_t* File::GetLutRGBA() -{ - return PixelReadConverter->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 FileHelper::Write(std::string const &fileName) { - switch(type) + switch(WriteType) { case ImplicitVR: SetWriteFileTypeToImplicitVR(); @@ -428,7 +485,7 @@ 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( type == ACR_LIBIDO ) + if( WriteType == ACR_LIBIDO ) { SetWriteToLibido(); } @@ -440,8 +497,8 @@ bool File::WriteBase (std::string const & fileName, FileType type) switch(WriteMode) { - case WMODE_DECOMPRESSED : - SetWriteToDecompressed(); + case WMODE_RAW : + SetWriteToRaw(); break; case WMODE_RGB : SetWriteToRGB(); @@ -451,7 +508,7 @@ bool File::WriteBase (std::string const & fileName, FileType type) bool check = CheckWriteIntegrity(); if(check) { - check = HeaderInternal->Write(fileName,type); + check = HeaderInternal->Write(fileName,WriteType); } RestoreWrite(); @@ -468,6 +525,78 @@ bool File::WriteBase (std::string const & fileName, FileType type) 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 FileHelper::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 FileHelper::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 FileHelper::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 FileHelper::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* FileHelper::GetLutRGBA() +{ + return PixelReadConverter->GetLutRGBA(); +} + +//----------------------------------------------------------------------------- +// Protected + /** * \brief Check the write integrity * @@ -476,7 +605,7 @@ bool File::WriteBase (std::string const & fileName, FileType type) * when the user set an image data * @return true if the check successfulls */ -bool File::CheckWriteIntegrity() +bool FileHelper::CheckWriteIntegrity() { if(PixelWriteConverter->GetUserData()) { @@ -497,17 +626,19 @@ bool File::CheckWriteIntegrity() switch(WriteMode) { - case WMODE_DECOMPRESSED : + case WMODE_RAW : if( decSize!=PixelWriteConverter->GetUserDataSize() ) { - dbg.Verbose(0, "File::CheckWriteIntegrity: Data size is incorrect"); + gdcmVerboseMacro( "Data size is incorrect (Raw)" << decSize + << " / " << PixelWriteConverter->GetUserDataSize() ); return false; } break; case WMODE_RGB : if( rgbSize!=PixelWriteConverter->GetUserDataSize() ) { - dbg.Verbose(0, "File::CheckWriteIntegrity: Data size is incorrect"); + gdcmVerboseMacro( "Data size is incorrect (RGB)" << decSize + << " / " << PixelWriteConverter->GetUserDataSize() ); return false; } break; @@ -517,80 +648,78 @@ bool File::CheckWriteIntegrity() return true; } -void File::SetWriteToDecompressed() +/** + * \brief + */ +void FileHelper::SetWriteToRaw() { - 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(PixelWriteConverter->GetUserData()) - { - pixel->SetBinArea(PixelWriteConverter->GetUserData(),false); - pixel->SetLength(PixelWriteConverter->GetUserDataSize()); - } - else - { - pixel->SetBinArea(PixelReadConverter->GetDecompressed(),false); - pixel->SetLength(PixelReadConverter->GetDecompressedSize()); - } + pixel->SetBinArea(PixelWriteConverter->GetData(),false); + pixel->SetLength(PixelWriteConverter->GetDataSize()); Archive->Push(photInt); Archive->Push(pixel); } } -void File::SetWriteToRGB() + +/** + * \brief + */ +void FileHelper::SetWriteToRGB() { if(HeaderInternal->GetNumberOfScalarComponents()==3) { 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(PixelWriteConverter->GetUserData()) + if(PixelReadConverter->GetRGB()) { - pixel->SetBinArea(PixelWriteConverter->GetUserData(),false); - pixel->SetLength(PixelWriteConverter->GetUserDataSize()); + PixelWriteConverter->SetReadData(PixelReadConverter->GetRGB(), + PixelReadConverter->GetRGBSize()); } - else if(PixelReadConverter->GetRGB()) + else // Raw data { - pixel->SetBinArea(PixelReadConverter->GetRGB(),false); - pixel->SetLength(PixelReadConverter->GetRGBSize()); - } - else // Decompressed data - { - pixel->SetBinArea(PixelReadConverter->GetDecompressed(),false); - pixel->SetLength(PixelReadConverter->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); @@ -609,17 +738,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); @@ -628,11 +754,14 @@ void File::SetWriteToRGB() } else { - SetWriteToDecompressed(); + SetWriteToRaw(); } } -void File::RestoreWrite() +/** + * \brief + */ +void FileHelper::RestoreWrite() { Archive->Restore(0x0028,0x0002); Archive->Restore(0x0028,0x0004); @@ -653,42 +782,57 @@ void File::RestoreWrite() Archive->Restore(0x0028,0x1203); } -void File::SetWriteFileTypeToACR() +/** + * \brief + */ +void FileHelper::SetWriteFileTypeToACR() { Archive->Push(0x0002,0x0010); } -void File::SetWriteFileTypeToExplicitVR() +/** + * \brief + */ +void FileHelper::SetWriteFileTypeToExplicitVR() { std::string ts = Util::DicomString( - Document::GetTransferSyntaxValue(ExplicitVRLittleEndian).c_str() ); + 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() +/** + * \brief + */ +void FileHelper::SetWriteFileTypeToImplicitVR() { std::string ts = Util::DicomString( - Document::GetTransferSyntaxValue(ImplicitVRLittleEndian).c_str() ); + 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() + +/** + * \brief + */ +void FileHelper::RestoreWriteFileType() { Archive->Restore(0x0002,0x0010); } -void File::SetWriteToLibido() +void FileHelper::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 ) { @@ -709,36 +853,41 @@ void File::SetWriteToLibido() ValEntry *libidoCode = CopyValEntry(0x0008,0x0010); libidoCode->SetValue("ACRNEMA_LIBIDO_1.1"); - libidoCode->SetLength(10); Archive->Push(libidoCode); } -void File::SetWriteToNoLibido() +/** + * \brief + */ +void FileHelper::SetWriteToNoLibido() { - ValEntry *recCode = dynamic_cast(HeaderInternal->GetDocEntryByNumber(0x0008,0x0010)); + ValEntry *recCode = dynamic_cast + (HeaderInternal->GetDocEntry(0x0008,0x0010)); if( recCode ) { if( recCode->GetValue() == "ACRNEMA_LIBIDO_1.1" ) { ValEntry *libidoCode = CopyValEntry(0x0008,0x0010); libidoCode->SetValue(""); - libidoCode->SetLength(0); Archive->Push(libidoCode); } } } -void File::RestoreWriteOfLibido() +/** + * \brief + */ +void FileHelper::RestoreWriteOfLibido() { Archive->Restore(0x0028,0x0010); Archive->Restore(0x0028,0x0011); Archive->Restore(0x0008,0x0010); } -ValEntry* File::CopyValEntry(uint16_t group,uint16_t element) +ValEntry *FileHelper::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) { @@ -747,16 +896,25 @@ 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) +/** + * \brief Modifies the value of a given Bin 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 Bin Entry (NULL when creation + * failed). + */ +BinEntry *FileHelper::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) { @@ -765,10 +923,55 @@ BinEntry* File::CopyBinEntry(uint16_t group,uint16_t element) } else { - newE = GetHeader()->NewBinEntryByNumber(group,element); + newE = GetHeader()->NewBinEntry(group,elem); + } + + return newE; +} + +//----------------------------------------------------------------------------- +// Protected +/** + * \brief Factorization for various forms of constructors. + */ +void FileHelper::Initialise() +{ + WriteMode = WMODE_RAW; + WriteType = ExplicitVR; + + PixelReadConverter = new PixelReadConvert; + PixelWriteConverter = new PixelWriteConvert; + Archive = new DocEntryArchive( HeaderInternal ); + + if ( HeaderInternal->IsReadable() ) + { + PixelReadConverter->GrabInformationsFromHeader( HeaderInternal ); + } +} + +/** + * \brief + */ +uint8_t *FileHelper::GetRaw() +{ + uint8_t *raw = PixelReadConverter->GetRaw(); + if ( ! raw ) + { + // 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(newE); + return raw; } //-----------------------------------------------------------------------------