X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmFile.cxx;h=6d596da72c7d5447280c4e59770073f2c58703b0;hb=2bb60efea83f2bfa1823f27b2a5536a0e6cfd8c0;hp=94c6efcbdb5fec8f75ace534725f06002929ea8e;hpb=3c25b6a04715c20b3680bca5447b4f10add258fd;p=gdcm.git diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx index 94c6efcb..6d596da7 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/11/19 18:49:39 $ - Version: $Revision: 1.158 $ + Date: $Date: 2004/12/03 10:21:54 $ + Version: $Revision: 1.168 $ 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,7 @@ =========================================================================*/ #include "gdcmFile.h" +#include "gdcmDocument.h" #include "gdcmDebug.h" #include "gdcmUtil.h" #include "gdcmBinEntry.h" @@ -75,30 +76,19 @@ File::File(std::string const & filename ) */ void File::Initialise() { - WriteMode = WMODE_NATIVE; + WriteMode = WMODE_DECOMPRESSED; WriteType = WTYPE_IMPL_VR; - PixelConverter = NULL; //just in case - Archive = NULL; + + PixelReadConverter = new PixelReadConvert; + Archive = new DocEntryArchive( HeaderInternal ); if ( HeaderInternal->IsReadable() ) { - ImageDataSizeRaw = ComputeDecompressedPixelDataSizeFromHeader(); - if ( HeaderInternal->HasLUT() ) - { - ImageDataSize = 3 * ImageDataSizeRaw; - } - else - { - ImageDataSize = ImageDataSizeRaw; - } - - PixelConverter = new PixelConvert; - PixelConverter->GrabInformationsFromHeader( HeaderInternal ); - - Archive = new DocEntryArchive( HeaderInternal ); + PixelReadConverter->GrabInformationsFromHeader( HeaderInternal ); } - SaveInitialValues(); + Pixel_Data = 0; + ImageDataSize = 0; } /** @@ -108,9 +98,9 @@ void File::Initialise() */ File::~File() { - if( PixelConverter ) + if( PixelReadConverter ) { - delete PixelConverter; + delete PixelReadConverter; } if( Archive ) { @@ -122,130 +112,6 @@ File::~File() delete HeaderInternal; } HeaderInternal = 0; - - DeleteInitialValues(); -} - -/** - * \brief Sets some initial values for the Constructor - * \warning not end user intended - */ -void File::SaveInitialValues() -{ - PixelRead = -1; // no ImageData read yet. - LastAllocatedPixelDataLength = 0; - Pixel_Data = 0; - - InitialSpp = ""; - InitialPhotInt = ""; - InitialPlanConfig = ""; - InitialBitsAllocated = ""; - InitialHighBit = ""; - - InitialRedLUTDescr = 0; - InitialGreenLUTDescr = 0; - InitialBlueLUTDescr = 0; - InitialRedLUTData = 0; - InitialGreenLUTData = 0; - InitialBlueLUTData = 0; - - if ( HeaderInternal->IsReadable() ) - { - // the following values *may* be modified - // by File::GetImageDataIntoVectorRaw - // we save their initial value. - InitialSpp = HeaderInternal->GetEntryByNumber(0x0028,0x0002); - InitialPhotInt = HeaderInternal->GetEntryByNumber(0x0028,0x0004); - InitialPlanConfig = HeaderInternal->GetEntryByNumber(0x0028,0x0006); - - InitialBitsAllocated = HeaderInternal->GetEntryByNumber(0x0028,0x0100); - InitialHighBit = HeaderInternal->GetEntryByNumber(0x0028,0x0102); - - // the following entries *may* be removed from the H table - // (NOT deleted ...) by File::GetImageDataIntoVectorRaw - // we keep a pointer on them. - InitialRedLUTDescr = HeaderInternal->GetDocEntryByNumber(0x0028,0x1101); - InitialGreenLUTDescr = HeaderInternal->GetDocEntryByNumber(0x0028,0x1102); - InitialBlueLUTDescr = HeaderInternal->GetDocEntryByNumber(0x0028,0x1103); - - InitialRedLUTData = HeaderInternal->GetDocEntryByNumber(0x0028,0x1201); - InitialGreenLUTData = HeaderInternal->GetDocEntryByNumber(0x0028,0x1202); - InitialBlueLUTData = HeaderInternal->GetDocEntryByNumber(0x0028,0x1203); - } -} - -/** - * \brief restores some initial values - * \warning not end user intended - */ -void File::RestoreInitialValues() -{ - if ( HeaderInternal->IsReadable() ) - { - // the following values *may* have been modified - // by File::GetImageDataIntoVectorRaw - // we restore their initial value. - if ( InitialSpp != "") - HeaderInternal->SetEntryByNumber(InitialSpp,0x0028,0x0002); - if ( InitialPhotInt != "") - HeaderInternal->SetEntryByNumber(InitialPhotInt,0x0028,0x0004); - if ( InitialPlanConfig != "") - - HeaderInternal->SetEntryByNumber(InitialPlanConfig,0x0028,0x0006); - if ( InitialBitsAllocated != "") - HeaderInternal->SetEntryByNumber(InitialBitsAllocated,0x0028,0x0100); - if ( InitialHighBit != "") - HeaderInternal->SetEntryByNumber(InitialHighBit,0x0028,0x0102); - - // the following entries *may* be have been removed from the H table - // (NOT deleted ...) by File::GetImageDataIntoVectorRaw - // we restore them. - - if (InitialRedLUTDescr) - HeaderInternal->AddEntry(InitialRedLUTDescr); - if (InitialGreenLUTDescr) - HeaderInternal->AddEntry(InitialGreenLUTDescr); - if (InitialBlueLUTDescr) - HeaderInternal->AddEntry(InitialBlueLUTDescr); - - if (InitialRedLUTData) - HeaderInternal->AddEntry(InitialBlueLUTDescr); - if (InitialGreenLUTData) - HeaderInternal->AddEntry(InitialGreenLUTData); - if (InitialBlueLUTData) - HeaderInternal->AddEntry(InitialBlueLUTData); - } -} - -/** - * \brief delete initial values (il they were saved) - * of InitialLutDescriptors and InitialLutData - */ -void File::DeleteInitialValues() -{ -// InitialLutDescriptors and InitialLutData -// will have to be deleted if the don't belong any longer -// to the Header H table when the header is deleted... - -// FIXME -// We don't know if the InitialLutData are still in the header or not ! -/* if ( InitialRedLUTDescr ) - delete InitialRedLUTDescr; - - if ( InitialGreenLUTDescr ) - delete InitialGreenLUTDescr; - - if ( InitialBlueLUTDescr ) - delete InitialBlueLUTDescr; - - if ( InitialRedLUTData ) - delete InitialRedLUTData; - - if ( InitialGreenLUTData ) - delete InitialGreenLUTData; - - if ( InitialBlueLUTData ) - delete InitialBlueLUTData;*/ } //----------------------------------------------------------------------------- @@ -253,58 +119,28 @@ void File::DeleteInitialValues() //----------------------------------------------------------------------------- // Public - /** - * \brief computes the length (in bytes) we must ALLOCATE to receive the - * image(s) pixels (multiframes taken into account) - * \warning : it is NOT the group 7FE0 length - * (no interest for compressed images). + * \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 + * @return The image size */ -int File::ComputeDecompressedPixelDataSizeFromHeader() +size_t File::GetImageDataSize() { - // see PS 3.3-2003 : C.7.6.3.2.1 - // - // MONOCHROME1 - // MONOCHROME2 - // PALETTE COLOR - // RGB - // HSV (Retired) - // ARGB (Retired) - // CMYK (Retired) - // YBR_FULL - // YBR_FULL_422 (no LUT, no Palette) - // YBR_PARTIAL_422 - // YBR_ICT - // YBR_RCT - - // LUT's - // ex : gdcm-US-ALOKA-16.dcm - // 0028|1221 [OW] [Segmented Red Palette Color Lookup Table Data] - // 0028|1222 [OW] [Segmented Green Palette Color Lookup Table Data] - // 0028|1223 [OW] [Segmented Blue Palette Color Lookup Table Data] - - // ex : OT-PAL-8-face.dcm - // 0028|1201 [US] [Red Palette Color Lookup Table Data] - // 0028|1202 [US] [Green Palette Color Lookup Table Data] - // 0028|1203 [US] [Blue Palette Color Lookup Table Data] - - int numberBitsAllocated = HeaderInternal->GetBitsAllocated(); - // Number of "Bits Allocated" is fixed to 16 when: - // - it is not defined (i.e. it's value is 0) - // - it's 12, since we will expand the image to 16 bits (see - // PixelConvert::ConvertDecompress12BitsTo16Bits() ) - if ( numberBitsAllocated == 0 || numberBitsAllocated == 12 ) - { - numberBitsAllocated = 16; - } + return PixelReadConverter->GetRGBSize(); +} - int DecompressedSize = HeaderInternal->GetXSize() - * HeaderInternal->GetYSize() - * HeaderInternal->GetZSize() - * ( numberBitsAllocated / 8 ) - * HeaderInternal->GetSamplesPerPixel(); - - return DecompressedSize; +/** + * \brief Get the size of the image data + * + * If the image can be RGB by transformation in a LUT, this + * transformation isn't considered + * @return The raw image size + */ +size_t File::GetImageDataRawSize() +{ + return PixelReadConverter->GetDecompressedSize(); } /** @@ -324,76 +160,16 @@ uint8_t* File::GetImageData() // If the decompression failed nothing can be done. return 0; } - - uint8_t* pixelData; - if ( HeaderInternal->HasLUT() && PixelConverter->BuildRGBImage() ) - { - pixelData = PixelConverter->GetRGB(); - } - else - { - // When no LUT or LUT conversion fails, return the decompressed - pixelData = PixelConverter->GetDecompressed(); - } -// PIXELCONVERT CLEANME - // Restore the header in a disk-consistent state - // (if user asks twice to get the pixels from disk) - if ( PixelRead != -1 ) // File was "read" before + if ( HeaderInternal->HasLUT() && PixelReadConverter->BuildRGBImage() ) { - RestoreInitialValues(); - } - if ( PixelConverter->GetRGB() ) - { - // now, it's an RGB image - // Lets's write it in the Header - std::string spp = "3"; // Samples Per Pixel - HeaderInternal->SetEntryByNumber(spp,0x0028,0x0002); - std::string rgb = "RGB "; // Photometric Interpretation - HeaderInternal->SetEntryByNumber(rgb,0x0028,0x0004); - std::string planConfig = "0"; // Planar Configuration - HeaderInternal->SetEntryByNumber(planConfig,0x0028,0x0006); - PixelRead = 0; // no PixelRaw + return PixelReadConverter->GetRGB(); } else { - if ( HeaderInternal->HasLUT() ) - { - // The LUT interpretation failed - std::string photometricInterpretation = Util::DicomString("MONOCHROME1"); - HeaderInternal->SetEntryByNumber( photometricInterpretation, - 0x0028, 0x0004 ); - PixelRead = 0; // no PixelRaw - } - else - { - if ( PixelConverter->IsDecompressedRGB() ) - { - /////////////////////////////////////////////////// - // now, it's an RGB image - // Lets's write it in the Header - // Droping Palette Color out of the Header - // has been moved to the Write process. - // TODO : move 'values' modification to the write process - // : save also (in order to be able to restore) - // : 'high bit' -when not equal to 'bits stored' + 1 - // : 'bits allocated', when it's equal to 12 ?! - std::string spp = "3"; // Samples Per Pixel - std::string photInt = "RGB "; // Photometric Interpretation - std::string planConfig = "0"; // Planar Configuration - HeaderInternal->SetEntryByNumber(spp,0x0028,0x0002); - HeaderInternal->SetEntryByNumber(photInt,0x0028,0x0004); - HeaderInternal->SetEntryByNumber(planConfig,0x0028,0x0006); - } - PixelRead = 1; // PixelRaw - } + // When no LUT or LUT conversion fails, return the decompressed + return PixelReadConverter->GetDecompressed(); } - - // We say the value *is* loaded. - SetPixelData(pixelData); -// END PIXELCONVERT CLEANME - - return pixelData; } /** @@ -429,31 +205,31 @@ size_t File::GetImageDataIntoVector (void* destination, size_t maxSize) 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"); 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->GetDecompressedSize() > maxSize ) { dbg.Verbose(0, "File::GetImageDataIntoVector: pixel data bigger" "than caller's expected MaxSize"); return 0; } memcpy( destination, - (void*)PixelConverter->GetDecompressed(), - PixelConverter->GetDecompressedSize() ); - return PixelConverter->GetDecompressedSize(); + (void*)PixelReadConverter->GetDecompressed(), + PixelReadConverter->GetDecompressedSize() ); + return PixelReadConverter->GetDecompressedSize(); } /** @@ -467,61 +243,25 @@ size_t File::GetImageDataIntoVector (void* destination, size_t maxSize) */ uint8_t* File::GetImageDataRaw () { - uint8_t* decompressed = GetDecompressed(); - if ( ! decompressed ) - { - return 0; - } - -// PIXELCONVERT CLEANME - // Restore the header in a disk-consistent state - // (if user asks twice to get the pixels from disk) - if ( PixelRead != -1 ) // File was "read" before - { - RestoreInitialValues(); - } - if ( PixelConverter->IsDecompressedRGB() ) - { - /////////////////////////////////////////////////// - // now, it's an RGB image - // Lets's write it in the Header - // Droping Palette Color out of the Header - // has been moved to the Write process. - // TODO : move 'values' modification to the write process - // : save also (in order to be able to restore) - // : 'high bit' -when not equal to 'bits stored' + 1 - // : 'bits allocated', when it's equal to 12 ?! - std::string spp = "3"; // Samples Per Pixel - std::string photInt = "RGB "; // Photometric Interpretation - std::string planConfig = "0"; // Planar Configuration - HeaderInternal->SetEntryByNumber(spp,0x0028,0x0002); - HeaderInternal->SetEntryByNumber(photInt,0x0028,0x0004); - HeaderInternal->SetEntryByNumber(planConfig,0x0028,0x0006); - } - - // We say the value *is* loaded. - SetPixelData(decompressed); - - PixelRead = 1; // PixelRaw -// END PIXELCONVERT CLEANME - - return decompressed; + return GetDecompressed(); } uint8_t* File::GetDecompressed() { - uint8_t* decompressed = PixelConverter->GetDecompressed(); + uint8_t* decompressed = PixelReadConverter->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(); + 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."); + dbg.Verbose(0, "File::GetDecompressed: read/decompress of " + "pixel data apparently went wrong."); return 0; } } @@ -544,11 +284,9 @@ uint8_t* File::GetDecompressed() */ bool File::SetImageData(uint8_t* inData, size_t expectedSize) { - HeaderInternal->SetImageDataSize( expectedSize ); // FIXME : if already allocated, memory leak ! Pixel_Data = inData; - ImageDataSize = ImageDataSizeRaw = expectedSize; - PixelRead = 1; + ImageDataSize = expectedSize; // FIXME : 7fe0, 0010 IS NOT set ... return true; } @@ -639,6 +377,14 @@ bool File::Write(std::string const& fileName) return(false); } +/** + * \brief Access to the underlying \ref PixelReadConverter RGBA LUT + */ +uint8_t* File::GetLutRGBA() +{ + return PixelReadConverter->GetLutRGBA(); +} + //----------------------------------------------------------------------------- // Protected /** @@ -651,26 +397,20 @@ bool File::Write(std::string const& fileName) */ bool File::WriteBase (std::string const & fileName, FileType type) { - if ( PixelRead == -1 && type != ExplicitVR) - { - return false; - } - - std::ofstream* fp1 = new std::ofstream(fileName.c_str(), - std::ios::out | std::ios::binary); - if (fp1 == NULL) - { - dbg.Verbose(2, "Failed to open (write) File: " , fileName.c_str()); - return false; - } - - if ( type == ImplicitVR || type == ExplicitVR ) + switch(type) { - // writing Dicom File Preamble - char filePreamble[128]; - memset(filePreamble, 0, 128); - fp1->write(filePreamble, 128); - fp1->write("DICM", 4); + case ImplicitVR: + SetWriteFileTypeToImplicitVR(); + break; + case ExplicitVR: + SetWriteFileTypeToExplicitVR(); + break; + case ACR: + case ACR_LIBIDO: + SetWriteFileTypeToACR(); + break; + default: + SetWriteFileTypeToExplicitVR(); } // -------------------------------------------------------------- @@ -679,105 +419,284 @@ bool File::WriteBase (std::string const & fileName, FileType type) // if recognition code tells us we dealt with a LibIDO image // we reproduce on disk the switch between lineNumber and columnNumber // just before writting ... - /// \todo the best trick would be *change* the recognition code /// but pb expected if user deals with, e.g. COMPLEX images - - std::string rows, columns; - if ( HeaderInternal->GetFileType() == ACR_LIBIDO) + if( type == ACR_LIBIDO ) { - SetToLibido(); - //rows = HeaderInternal->GetEntryByNumber(0x0028, 0x0010); - //columns = HeaderInternal->GetEntryByNumber(0x0028, 0x0011); - - //HeaderInternal->SetEntryByNumber(columns, 0x0028, 0x0010); - //HeaderInternal->SetEntryByNumber(rows , 0x0028, 0x0011); + SetWriteToLibido(); + } + else + { + SetWriteToNoLibido(); } // ----------------- End of Special Patch ---------------- - - uint16_t grPixel = HeaderInternal->GetGrPixel(); - uint16_t numPixel = HeaderInternal->GetNumPixel();; - - DocEntry* PixelElement = - GetHeader()->GetDocEntryByNumber(grPixel, numPixel); - - if ( PixelRead == 1 ) + + switch(WriteMode) { - // we read pixel 'as is' (no tranformation LUT -> RGB) - PixelElement->SetLength( ImageDataSizeRaw ); + case WMODE_DECOMPRESSED : + SetWriteToDecompressed(); + break; + case WMODE_RGB : + SetWriteToRGB(); + break; } - else if ( PixelRead == 0 ) + + bool check = CheckWriteIntegrity(); + if(check) { - // we tranformed GrayLevel pixels + LUT into RGB Pixel - PixelElement->SetLength( ImageDataSize ); + check = HeaderInternal->Write(fileName,type); } - - HeaderInternal->Write(fp1, type); + + 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 ) - { - RestoreFromLibido(); - //HeaderInternal->SetEntryByNumber(rows , 0x0028, 0x0010); - //HeaderInternal->SetEntryByNumber(columns, 0x0028, 0x0011); - } + RestoreWriteOfLibido(); // ----------------- End of Special Patch ---------------- - fp1->close (); - delete fp1; - return true; + return check; } /** - * \brief Access to the underlying \ref PixelConverter RGBA LUT + * \brief Check the write integrity + * + * The tests made are : + * - verify the size of the image to write with the possible write + * when the user set an image data + * @return true if the check successfulls */ -uint8_t* File::GetLutRGBA() +bool File::CheckWriteIntegrity() { - return PixelConverter->GetLutRGBA(); + if(Pixel_Data) + { + int numberBitsAllocated = HeaderInternal->GetBitsAllocated(); + if ( numberBitsAllocated == 0 || numberBitsAllocated == 12 ) + { + numberBitsAllocated = 16; + } + + size_t decSize = HeaderInternal->GetXSize() + * HeaderInternal->GetYSize() + * HeaderInternal->GetZSize() + * ( numberBitsAllocated / 8 ) + * HeaderInternal->GetSamplesPerPixel(); + size_t rgbSize = decSize; + if( HeaderInternal->HasLUT() ) + rgbSize = decSize * 3; + + switch(WriteMode) + { + case WMODE_DECOMPRESSED : + if( decSize!=ImageDataSize ) + { + dbg.Verbose(0, "File::CheckWriteIntegrity: Data size is incorrect"); + //std::cerr<<"Dec : "<SetEntryByNumber( GDCM_BINLOADED, - GetHeader()->GetGrPixel(), GetHeader()->GetNumPixel()); + 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()) + { + SetWriteToRGB(); + } + else + { + 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()); + pixel->SetValue(GDCM_BINLOADED); + if(Pixel_Data) + { + pixel->SetBinArea(Pixel_Data,false); + pixel->SetLength(ImageDataSize); + } + else + { + pixel->SetBinArea(PixelReadConverter->GetDecompressed(),false); + pixel->SetLength(PixelReadConverter->GetDecompressedSize()); + } + + Archive->Push(photInt); + Archive->Push(pixel); + } +} + +void File::SetWriteToRGB() +{ + if(HeaderInternal->GetNumberOfScalarComponents()==3) + { + PixelReadConverter->BuildRGBImage(); + + ValEntry* spp = CopyValEntry(0x0028,0x0002); + spp->SetValue("3 "); + spp->SetLength(2); + + ValEntry* planConfig = CopyValEntry(0x0028,0x0006); + planConfig->SetValue("0 "); + planConfig->SetLength(2); + + 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) + { + pixel->SetBinArea(Pixel_Data,false); + pixel->SetLength(ImageDataSize); + } + else if(PixelReadConverter->GetRGB()) + { + pixel->SetBinArea(PixelReadConverter->GetRGB(),false); + pixel->SetLength(PixelReadConverter->GetRGBSize()); + } + else // Decompressed data + { + pixel->SetBinArea(PixelReadConverter->GetDecompressed(),false); + pixel->SetLength(PixelReadConverter->GetDecompressedSize()); + } + + Archive->Push(spp); + Archive->Push(planConfig); + Archive->Push(photInt); + Archive->Push(pixel); + + // Remove any LUT + Archive->Push(0x0028,0x1101); + Archive->Push(0x0028,0x1102); + Archive->Push(0x0028,0x1103); + Archive->Push(0x0028,0x1201); + Archive->Push(0x0028,0x1202); + Archive->Push(0x0028,0x1203); + + // For old ACR-NEMA + // Thus, we have a RGB image and the bits allocated = 24 and + // samples per pixels = 1 (in the read file) + if(HeaderInternal->GetBitsAllocated()==24) + { + ValEntry* bitsAlloc = CopyValEntry(0x0028,0x0100); + bitsAlloc->SetValue("8 "); + bitsAlloc->SetLength(2); + + ValEntry* bitsStored = CopyValEntry(0x0028,0x0101); + bitsStored->SetValue("8 "); + bitsStored->SetLength(2); + + ValEntry* highBit = CopyValEntry(0x0028,0x0102); + highBit->SetValue("7 "); + highBit->SetLength(2); - // Will be 7fe0, 0010 in standard case - DocEntry* currentEntry = GetHeader()->GetDocEntryByNumber(GetHeader()->GetGrPixel(), GetHeader()->GetNumPixel()); - if ( currentEntry ) + Archive->Push(bitsAlloc); + Archive->Push(bitsStored); + Archive->Push(highBit); + } + } + else { - if ( BinEntry* binEntry = dynamic_cast(currentEntry) ) - // Flag is to false because datas are kept in the gdcmPixelConvert - binEntry->SetBinArea( data, false ); + SetWriteToDecompressed(); } } -void File::SetToRAW() +void File::RestoreWrite() +{ + Archive->Restore(0x0028,0x0002); + Archive->Restore(0x0028,0x0004); + Archive->Restore(0x0028,0x0006); + Archive->Restore(GetHeader()->GetGrPixel(),GetHeader()->GetNumPixel()); + + // For old ACR-NEMA (24 bits problem) + Archive->Restore(0x0028,0x0100); + Archive->Restore(0x0028,0x0101); + Archive->Restore(0x0028,0x0102); + + // For the LUT + Archive->Restore(0x0028,0x1101); + Archive->Restore(0x0028,0x1102); + Archive->Restore(0x0028,0x1103); + Archive->Restore(0x0028,0x1201); + Archive->Restore(0x0028,0x1202); + Archive->Restore(0x0028,0x1203); +} + +void File::SetWriteFileTypeToACR() { + Archive->Push(0x0002,0x0010); } -void File::SetToRGB() +void File::SetWriteFileTypeToExplicitVR() { + std::string ts = Util::DicomString( + Document::GetTransferSyntaxValue(ExplicitVRLittleEndian).c_str() ); + + ValEntry* tss = CopyValEntry(0x0002,0x0010); + tss->SetValue(ts); + tss->SetLength(ts.length()); + + Archive->Push(tss); } -void File::Restore() +void File::SetWriteFileTypeToImplicitVR() { + std::string ts = Util::DicomString( + Document::GetTransferSyntaxValue(ImplicitVRLittleEndian).c_str() ); + + ValEntry* tss = CopyValEntry(0x0002,0x0010); + tss->SetValue(ts); + tss->SetLength(ts.length()); } -void File::SetToLibido() +void File::RestoreWriteFileType() +{ + Archive->Restore(0x0002,0x0010); +} + +void File::SetWriteToLibido() { ValEntry *oldRow = dynamic_cast(HeaderInternal->GetDocEntryByNumber(0x0028, 0x0010)); ValEntry *oldCol = dynamic_cast(HeaderInternal->GetDocEntryByNumber(0x0028, 0x0011)); - if( oldRow && oldCol ) { @@ -795,14 +714,74 @@ void File::SetToLibido() Archive->Push(newRow); Archive->Push(newCol); } + + ValEntry *libidoCode = CopyValEntry(0x0008,0x0010); + libidoCode->SetValue("ACRNEMA_LIBIDO_1.1"); + libidoCode->SetLength(10); + Archive->Push(libidoCode); } -void File::RestoreFromLibido() +void File::SetWriteToNoLibido() { - Archive->Restore(0x0028, 0x0010); - Archive->Restore(0x0028, 0x0011); + ValEntry *recCode = dynamic_cast(HeaderInternal->GetDocEntryByNumber(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() +{ + Archive->Restore(0x0028,0x0010); + Archive->Restore(0x0028,0x0011); + Archive->Restore(0x0008,0x0010); +} + +ValEntry* File::CopyValEntry(uint16_t group,uint16_t element) +{ + DocEntry* oldE = HeaderInternal->GetDocEntryByNumber(group, element); + ValEntry* newE; + + if(oldE) + { + newE = new ValEntry(oldE->GetDictEntry()); + newE->Copy(oldE); + } + else + { + newE = GetHeader()->NewValEntryByNumber(group,element); + } + + return(newE); +} + +BinEntry* File::CopyBinEntry(uint16_t group,uint16_t element) +{ + DocEntry* oldE = HeaderInternal->GetDocEntryByNumber(group, element); + BinEntry* newE; + + if(oldE) + { + newE = new BinEntry(oldE->GetDictEntry()); + newE->Copy(oldE); + } + else + { + newE = GetHeader()->NewBinEntryByNumber(group,element); + } + + return(newE); +} + +//----------------------------------------------------------------------------- +// Private + //----------------------------------------------------------------------------- } // end namespace gdcm