X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmFile.cxx;h=c412b4cd460c7f77b1698700774810ebc68ec78b;hb=9d913797d3bf5a18625f4d8d8b42c8f5c8c10d99;hp=9974b256579dca5783b03f837c70d5c9441e16b7;hpb=922095a0dd56f24d651b36f62256690020937d9a;p=gdcm.git diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx index 9974b256..c412b4cd 100644 --- a/src/gdcmFile.cxx +++ b/src/gdcmFile.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmFile.cxx,v $ Language: C++ - Date: $Date: 2004/12/10 13:49:07 $ - Version: $Revision: 1.175 $ + Date: $Date: 2005/01/07 19:20:38 $ + Version: $Revision: 1.185 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -125,6 +125,14 @@ File::~File() //----------------------------------------------------------------------------- // Print +void File::Print(std::ostream &os) +{ + HeaderInternal->SetPrintLevel(PrintLevel); + HeaderInternal->Print(os); + + PixelReadConverter->SetPrintLevel(PrintLevel); + PixelReadConverter->Print(os); +} //----------------------------------------------------------------------------- // Public @@ -172,7 +180,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() ) { @@ -205,7 +213,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(); } @@ -235,7 +243,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() ) { @@ -247,7 +255,7 @@ size_t File::GetImageDataIntoVector (void* destination, size_t maxSize) { if ( PixelReadConverter->GetRGBSize() > maxSize ) { - dbg.Verbose(0, "File::GetImageDataIntoVector: pixel data bigger" + gdcmVerboseMacro("File::GetImageDataIntoVector: pixel data bigger" "than caller's expected MaxSize"); return 0; } @@ -260,7 +268,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" + gdcmVerboseMacro("File::GetImageDataIntoVector: pixel data bigger" "than caller's expected MaxSize"); return 0; } @@ -283,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); } @@ -292,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() { @@ -317,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() { @@ -337,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() { @@ -360,12 +368,12 @@ 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; } @@ -390,7 +398,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); @@ -399,12 +407,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); @@ -424,54 +433,19 @@ 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) -{ - return WriteBase(fileName); -} - -bool File::SetEntryByNumber(std::string const& content, - uint16_t group, uint16_t element) -{ - return HeaderInternal->SetEntryByNumber(content,group,element); -} - -bool File::SetEntryByNumber(uint8_t* content, int lgth, - uint16_t group, uint16_t element) -{ - return HeaderInternal->SetEntryByNumber(content,lgth,group,element); -} - -bool File::ReplaceOrCreateByNumber(std::string const& content, - uint16_t group, uint16_t element) -{ - return HeaderInternal->ReplaceOrCreateByNumber(content,group,element) != NULL; -} - /** - * \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) +bool File::Write(std::string const &fileName) { switch(WriteType) { @@ -537,6 +511,78 @@ bool File::WriteBase (std::string const & fileName) 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 element element number of the Dicom Element to modify + */ +bool File::SetEntryByNumber(std::string const &content, + uint16_t group, uint16_t element) +{ + return HeaderInternal->SetEntryByNumber(content,group,element); +} + + +/** + * \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 element element number of the Dicom Element to modify + */ +bool File::SetEntryByNumber(uint8_t *content, int lgth, + uint16_t group, uint16_t element) +{ + return HeaderInternal->SetEntryByNumber(content,lgth,group,element); +} + +/** + * \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 element 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) +{ + return HeaderInternal->ReplaceOrCreateByNumber(content,group,element) != 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 element 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) +{ + return HeaderInternal->ReplaceOrCreateByNumber(binArea,lgth,group,element) != NULL; +} + +/** + * \brief Access to the underlying \ref PixelReadConverter RGBA LUT + */ +uint8_t* File::GetLutRGBA() +{ + return PixelReadConverter->GetLutRGBA(); +} + +//----------------------------------------------------------------------------- +// Protected + /** * \brief Check the write integrity * @@ -569,7 +615,7 @@ bool File::CheckWriteIntegrity() case WMODE_RAW : if( decSize!=PixelWriteConverter->GetUserDataSize() ) { - dbg.Verbose(0, "File::CheckWriteIntegrity: Data size is incorrect (Raw)"); + gdcmVerboseMacro("File::CheckWriteIntegrity: Data size is incorrect (Raw)"); //std::cerr << "File::CheckWriteIntegrity: Data size is incorrect (Raw)\n" // << decSize << " / " << PixelWriteConverter->GetUserDataSize() << "\n"; return false; @@ -578,7 +624,7 @@ bool File::CheckWriteIntegrity() case WMODE_RGB : if( rgbSize!=PixelWriteConverter->GetUserDataSize() ) { - dbg.Verbose(0, "File::CheckWriteIntegrity: Data size is incorrect (RGB)"); + gdcmVerboseMacro( "File::CheckWriteIntegrity: Data size is incorrect (RGB)"); //std::cerr << "File::CheckWriteIntegrity: Data size is incorrect (RGB)\n" // << decSize << " / " << PixelWriteConverter->GetUserDataSize() << "\n"; return false; @@ -598,7 +644,7 @@ void File::SetWriteToRaw() } else { - ValEntry* photInt = CopyValEntry(0x0028,0x0004); + ValEntry *photInt = CopyValEntry(0x0028,0x0004); if(HeaderInternal->HasLUT()) { photInt->SetValue("PALETTE COLOR "); @@ -611,7 +657,7 @@ 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()); @@ -627,13 +673,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()) @@ -647,7 +693,7 @@ 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()); @@ -670,13 +716,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); @@ -721,7 +767,7 @@ void File::SetWriteFileTypeToExplicitVR() std::string ts = Util::DicomString( Document::GetTransferSyntaxValue(ExplicitVRLittleEndian).c_str() ); - ValEntry* tss = CopyValEntry(0x0002,0x0010); + ValEntry *tss = CopyValEntry(0x0002,0x0010); tss->SetValue(ts); Archive->Push(tss); @@ -732,8 +778,10 @@ void File::SetWriteFileTypeToImplicitVR() std::string ts = Util::DicomString( Document::GetTransferSyntaxValue(ImplicitVRLittleEndian).c_str() ); - ValEntry* tss = CopyValEntry(0x0002,0x0010); + ValEntry *tss = CopyValEntry(0x0002,0x0010); tss->SetValue(ts); + + Archive->Push(tss); } void File::RestoreWriteFileType() @@ -743,8 +791,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->GetDocEntryByNumber(0x0028, 0x0010)); + ValEntry *oldCol = dynamic_cast + (HeaderInternal->GetDocEntryByNumber(0x0028, 0x0011)); if( oldRow && oldCol ) { @@ -770,7 +820,8 @@ void File::SetWriteToLibido() void File::SetWriteToNoLibido() { - ValEntry *recCode = dynamic_cast(HeaderInternal->GetDocEntryByNumber(0x0008,0x0010)); + ValEntry *recCode = dynamic_cast + (HeaderInternal->GetDocEntryByNumber(0x0008,0x0010)); if( recCode ) { if( recCode->GetValue() == "ACRNEMA_LIBIDO_1.1" ) @@ -789,10 +840,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 element) { - DocEntry* oldE = HeaderInternal->GetDocEntryByNumber(group, element); - ValEntry* newE; + DocEntry *oldE = HeaderInternal->GetDocEntryByNumber(group, element); + ValEntry *newE; if(oldE) { @@ -807,10 +858,10 @@ ValEntry* File::CopyValEntry(uint16_t group,uint16_t element) return(newE); } -BinEntry* File::CopyBinEntry(uint16_t group,uint16_t element) +BinEntry *File::CopyBinEntry(uint16_t group,uint16_t element) { - DocEntry* oldE = HeaderInternal->GetDocEntryByNumber(group, element); - BinEntry* newE; + DocEntry *oldE = HeaderInternal->GetDocEntryByNumber(group, element); + BinEntry *newE; if(oldE) { @@ -845,13 +896,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(); @@ -859,7 +910,7 @@ uint8_t* File::GetRaw() raw = PixelReadConverter->GetRaw(); if ( ! raw ) { - dbg.Verbose(0, "File::GetRaw: read/decompress of " + gdcmVerboseMacro("File::GetRaw: read/decompress of " "pixel data apparently went wrong."); return 0; }