X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFile.cxx;h=11ec7fe6e6071545ed107b4987909d2549d382e9;hb=31c63a6cb25b49a119e0132201c051ade2e17704;hp=70da398efee7dcc7c8fb8be1ffc636eb1cf2f227;hpb=74e3bc05fade5a18f193e7d1122c74756c0e689e;p=gdcm.git diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx index 70da398e..11ec7fe6 100644 --- a/src/gdcmFile.cxx +++ b/src/gdcmFile.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmFile.cxx,v $ Language: C++ - Date: $Date: 2005/01/06 16:05:06 $ - Version: $Revision: 1.182 $ + Date: $Date: 2005/01/11 16:44:43 $ + Version: $Revision: 1.190 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -17,6 +17,8 @@ =========================================================================*/ #include "gdcmFile.h" +#include "gdcmGlobal.h" +#include "gdcmTS.h" #include "gdcmDocument.h" #include "gdcmDebug.h" #include "gdcmUtil.h" @@ -180,7 +182,7 @@ size_t File::GetImageDataRawSize() * @return Pointer to newly allocated pixel data. * NULL if alloc fails */ -uint8_t* File::GetImageData() +uint8_t *File::GetImageData() { if ( PixelWriteConverter->GetUserData() ) { @@ -213,7 +215,7 @@ uint8_t* File::GetImageData() * @return Pointer to newly allocated pixel data. * \ NULL if alloc fails */ -uint8_t* File::GetImageDataRaw () +uint8_t *File::GetImageDataRaw () { return GetRaw(); } @@ -243,7 +245,7 @@ uint8_t* File::GetImageDataRaw () * @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 ( ! GetRaw() ) { @@ -255,8 +257,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, @@ -268,8 +269,7 @@ size_t File::GetImageDataIntoVector (void* destination, size_t maxSize) // Either no LUT conversion necessary or LUT conversion failed 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, @@ -291,7 +291,7 @@ size_t File::GetImageDataIntoVector (void* destination, size_t maxSize) * * @return boolean */ -void File::SetImageData(uint8_t* inData, size_t expectedSize) +void File::SetImageData(uint8_t *inData, size_t expectedSize) { SetUserData(inData,expectedSize); } @@ -300,23 +300,23 @@ void File::SetImageData(uint8_t* inData, size_t 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) +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 datas to write + * \warning When writting the file, this datas are get as default data to write */ -uint8_t* File::GetUserData() +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 datas to write + * \warning When writting the file, this datas are get as default data to write */ size_t File::GetUserDataSize() { @@ -325,16 +325,16 @@ size_t File::GetUserDataSize() /** * \brief Get the image datas from the file. - * If a LUT is found, the datas are expanded to be RGB + * If a LUT is found, the data are expanded to be RGB */ -uint8_t* File::GetRGBData() +uint8_t *File::GetRGBData() { return PixelReadConverter->GetRGB(); } /** * \brief Get the image data size from the file. - * If a LUT is found, the datas are expanded to be RGB + * If a LUT is found, the data are expanded to be RGB */ size_t File::GetRGBDataSize() { @@ -345,14 +345,14 @@ size_t File::GetRGBDataSize() * \brief Get the image datas from the file. * If a LUT is found, the datas are not expanded ! */ -uint8_t* File::GetRawData() +uint8_t *File::GetRawData() { return PixelReadConverter->GetRaw(); } /** * \brief Get the image data size from the file. - * If a LUT is found, the datas are not expanded ! + * If a LUT is found, the data are not expanded ! */ size_t File::GetRawDataSize() { @@ -368,21 +368,34 @@ size_t File::GetRawDataSize() * @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; } - 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()); + 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(); @@ -398,7 +411,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); @@ -413,7 +426,7 @@ bool File::WriteDcmImplVR (std::string const & fileName) * @return false if write fails */ -bool File::WriteDcmExplVR (std::string const & fileName) +bool File::WriteDcmExplVR (std::string const &fileName) { SetWriteTypeToDcmExplVR(); return Write(fileName); @@ -433,7 +446,7 @@ 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); @@ -445,7 +458,7 @@ bool File::WriteAcr (std::string const & fileName) * (any already existing file is overwritten) * @return false if write fails */ -bool File::Write(std::string const& fileName) +bool File::Write(std::string const &fileName) { switch(WriteType) { @@ -517,12 +530,12 @@ bool File::Write(std::string const& fileName) * the given value. * @param content new value (string) to substitute with * @param group group number of the Dicom Element to modify - * @param element element number of the Dicom Element to modify + * @param elem element number of the Dicom Element to modify */ -bool File::SetEntryByNumber(std::string const& content, - uint16_t group, uint16_t element) +bool File::SetEntry(std::string const &content, + uint16_t group, uint16_t elem) { - return HeaderInternal->SetEntryByNumber(content,group,element); + return HeaderInternal->SetEntry(content,group,elem); } @@ -533,12 +546,12 @@ bool File::SetEntryByNumber(std::string const& content, * @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 element element number of the Dicom Element to modify + * @param elem element number of the Dicom Element to modify */ -bool File::SetEntryByNumber(uint8_t* content, int lgth, - uint16_t group, uint16_t element) +bool File::SetEntry(uint8_t *content, int lgth, + uint16_t group, uint16_t elem) { - return HeaderInternal->SetEntryByNumber(content,lgth,group,element); + return HeaderInternal->SetEntry(content,lgth,group,elem); } /** @@ -546,14 +559,14 @@ bool File::SetEntryByNumber(uint8_t* content, int lgth, * 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 element Element 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::ReplaceOrCreateByNumber(std::string const& content, - uint16_t group, uint16_t element) +bool File::ReplaceOrCreate(std::string const &content, + uint16_t group, uint16_t elem) { - return HeaderInternal->ReplaceOrCreateByNumber(content,group,element) != NULL; + return HeaderInternal->ReplaceOrCreate(content,group,elem) != NULL; } /* @@ -562,14 +575,14 @@ bool File::ReplaceOrCreateByNumber(std::string const& content, * 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 element Element 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::ReplaceOrCreateByNumber(uint8_t* binArea, int lgth, - uint16_t group, uint16_t element) +bool File::ReplaceOrCreate(uint8_t *binArea, int lgth, + uint16_t group, uint16_t elem) { - return HeaderInternal->ReplaceOrCreateByNumber(binArea,lgth,group,element) != NULL; + return HeaderInternal->ReplaceOrCreate(binArea,lgth,group,elem) != NULL; } /** @@ -615,18 +628,16 @@ bool File::CheckWriteIntegrity() case WMODE_RAW : if( decSize!=PixelWriteConverter->GetUserDataSize() ) { - dbg.Verbose(0, "File::CheckWriteIntegrity: Data size is incorrect (Raw)"); - //std::cerr << "File::CheckWriteIntegrity: Data size is incorrect (Raw)\n" - // << decSize << " / " << PixelWriteConverter->GetUserDataSize() << "\n"; + 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 (RGB)"); - //std::cerr << "File::CheckWriteIntegrity: Data size is incorrect (RGB)\n" - // << decSize << " / " << PixelWriteConverter->GetUserDataSize() << "\n"; + gdcmVerboseMacro( "Data size is incorrect (RGB)" << decSize + << " / " << PixelWriteConverter->GetUserDataSize() ); return false; } break; @@ -638,13 +649,14 @@ bool File::CheckWriteIntegrity() void File::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 "); @@ -657,7 +669,8 @@ void File::SetWriteToRaw() PixelWriteConverter->SetReadData(PixelReadConverter->GetRaw(), PixelReadConverter->GetRawSize()); - BinEntry* pixel = CopyBinEntry(GetHeader()->GetGrPixel(),GetHeader()->GetNumPixel()); + BinEntry *pixel = + CopyBinEntry(GetHeader()->GetGrPixel(),GetHeader()->GetNumPixel()); pixel->SetValue(GDCM_BINLOADED); pixel->SetBinArea(PixelWriteConverter->GetData(),false); pixel->SetLength(PixelWriteConverter->GetDataSize()); @@ -673,13 +686,13 @@ void File::SetWriteToRGB() { PixelReadConverter->BuildRGBImage(); - ValEntry* spp = CopyValEntry(0x0028,0x0002); + ValEntry *spp = CopyValEntry(0x0028,0x0002); spp->SetValue("3 "); - ValEntry* planConfig = CopyValEntry(0x0028,0x0006); + ValEntry *planConfig = CopyValEntry(0x0028,0x0006); planConfig->SetValue("0 "); - ValEntry* photInt = CopyValEntry(0x0028,0x0004); + ValEntry *photInt = CopyValEntry(0x0028,0x0004); photInt->SetValue("RGB "); if(PixelReadConverter->GetRGB()) @@ -693,7 +706,8 @@ void File::SetWriteToRGB() PixelReadConverter->GetRawSize()); } - BinEntry* pixel = CopyBinEntry(GetHeader()->GetGrPixel(),GetHeader()->GetNumPixel()); + BinEntry *pixel = + CopyBinEntry(GetHeader()->GetGrPixel(),GetHeader()->GetNumPixel()); pixel->SetValue(GDCM_BINLOADED); pixel->SetBinArea(PixelWriteConverter->GetData(),false); pixel->SetLength(PixelWriteConverter->GetDataSize()); @@ -716,13 +730,13 @@ 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 "); - ValEntry* bitsStored = CopyValEntry(0x0028,0x0101); + ValEntry *bitsStored = CopyValEntry(0x0028,0x0101); bitsStored->SetValue("8 "); - ValEntry* highBit = CopyValEntry(0x0028,0x0102); + ValEntry *highBit = CopyValEntry(0x0028,0x0102); highBit->SetValue("7 "); Archive->Push(bitsAlloc); @@ -765,9 +779,9 @@ void File::SetWriteFileTypeToACR() void File::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); Archive->Push(tss); @@ -776,9 +790,9 @@ void File::SetWriteFileTypeToExplicitVR() void File::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); Archive->Push(tss); @@ -792,9 +806,9 @@ void File::RestoreWriteFileType() void File::SetWriteToLibido() { ValEntry *oldRow = dynamic_cast - (HeaderInternal->GetDocEntryByNumber(0x0028, 0x0010)); + (HeaderInternal->GetDocEntry(0x0028, 0x0010)); ValEntry *oldCol = dynamic_cast - (HeaderInternal->GetDocEntryByNumber(0x0028, 0x0011)); + (HeaderInternal->GetDocEntry(0x0028, 0x0011)); if( oldRow && oldCol ) { @@ -821,7 +835,7 @@ void File::SetWriteToLibido() void File::SetWriteToNoLibido() { ValEntry *recCode = dynamic_cast - (HeaderInternal->GetDocEntryByNumber(0x0008,0x0010)); + (HeaderInternal->GetDocEntry(0x0008,0x0010)); if( recCode ) { if( recCode->GetValue() == "ACRNEMA_LIBIDO_1.1" ) @@ -840,10 +854,10 @@ void File::RestoreWriteOfLibido() 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) { @@ -852,16 +866,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) { @@ -870,10 +884,10 @@ BinEntry* File::CopyBinEntry(uint16_t group,uint16_t element) } else { - newE = GetHeader()->NewBinEntryByNumber(group,element); + newE = GetHeader()->NewBinEntry(group,elem); } - return(newE); + return newE; } //----------------------------------------------------------------------------- @@ -896,13 +910,13 @@ void File::Initialise() } } -uint8_t* File::GetRaw() +uint8_t *File::GetRaw() { - uint8_t* raw = PixelReadConverter->GetRaw(); + uint8_t *raw = PixelReadConverter->GetRaw(); if ( ! raw ) { // The Raw image migth not be loaded yet: - std::ifstream* fp = HeaderInternal->OpenFile(); + std::ifstream *fp = HeaderInternal->OpenFile(); PixelReadConverter->ReadAndDecompressPixelData( fp ); if(fp) HeaderInternal->CloseFile(); @@ -910,8 +924,7 @@ uint8_t* File::GetRaw() raw = PixelReadConverter->GetRaw(); if ( ! raw ) { - dbg.Verbose(0, "File::GetRaw: read/decompress of " - "pixel data apparently went wrong."); + gdcmVerboseMacro( "Read/decompress of pixel data apparently went wrong."); return 0; } }