X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFile.cxx;h=ca361e54cf377fe0fc2f589b3566581d6e9b2b90;hb=af698856153f426a4d852b6645e238f669d42276;hp=b565a3a498604de9b834ae91a247ae9f15d7ed4f;hpb=5bf7c51796867388334836847a6874640bc83f89;p=gdcm.git diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx index b565a3a4..ca361e54 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/10/20 14:30:40 $ - Version: $Revision: 1.146 $ + Date: $Date: 2004/11/26 10:55:04 $ + Version: $Revision: 1.166 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -17,7 +17,11 @@ =========================================================================*/ #include "gdcmFile.h" +#include "gdcmDocument.h" #include "gdcmDebug.h" +#include "gdcmUtil.h" +#include "gdcmBinEntry.h" +#include namespace gdcm { @@ -72,22 +76,19 @@ File::File(std::string const & filename ) */ void File::Initialise() { + WriteMode = WMODE_DECOMPRESSED; + WriteType = WTYPE_IMPL_VR; + + PixelConverter = new PixelConvert; + Archive = new DocEntryArchive( HeaderInternal ); + if ( HeaderInternal->IsReadable() ) { - ImageDataSizeRaw = ComputeDecompressedPixelDataSizeFromHeader(); - if ( HeaderInternal->HasLUT() ) - { - ImageDataSize = 3 * ImageDataSizeRaw; - } - else - { - ImageDataSize = ImageDataSizeRaw; - } - - PixelConverter = new PixelConvert; PixelConverter->GrabInformationsFromHeader( HeaderInternal ); } - SaveInitialValues(); + + Pixel_Data = 0; + ImageDataSize = 0; } /** @@ -97,135 +98,20 @@ void File::Initialise() */ File::~File() { - if( SelfHeader ) + if( PixelConverter ) { - delete HeaderInternal; + delete PixelConverter; } - 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() ) + if( Archive ) { - // 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); + delete Archive; } -} -/** - * \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); + if( SelfHeader ) + { + delete HeaderInternal; } -} - -/** - * \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... - - if ( InitialRedLUTDescr ) - delete InitialRedLUTDescr; - - if ( InitialGreenLUTDescr ) - delete InitialGreenLUTDescr; - - if ( InitialBlueLUTDescr ) - delete InitialBlueLUTDescr; - - if ( InitialRedLUTData ) - delete InitialRedLUTData; - - if ( InitialGreenLUTData != NULL) - delete InitialGreenLUTData; - - if ( InitialBlueLUTData != NULL) - delete InitialBlueLUTData; + HeaderInternal = 0; } //----------------------------------------------------------------------------- @@ -233,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 PixelConverter->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 PixelConverter->GetDecompressedSize(); } /** @@ -299,33 +155,21 @@ int File::ComputeDecompressedPixelDataSizeFromHeader() */ uint8_t* File::GetImageData() { - // FIXME (Mathieu) - // I need to deallocate Pixel_Data before doing any allocation: - - if ( Pixel_Data ) - if ( LastAllocatedPixelDataLength != ImageDataSize ) - free(Pixel_Data); - if ( !Pixel_Data ) - Pixel_Data = new uint8_t[ImageDataSize]; - - if ( Pixel_Data ) + if ( ! GetDecompressed() ) { - LastAllocatedPixelDataLength = ImageDataSize; - - // we load the pixels (and transform grey level + LUT into RGB) - GetImageDataIntoVector(Pixel_Data, ImageDataSize); - - // We say the value *is* loaded. - GetHeader()->SetEntryByNumber( GDCM_BINLOADED, - GetHeader()->GetGrPixel(), GetHeader()->GetNumPixel()); - - // Will be 7fe0, 0010 in standard case - GetHeader()->SetEntryBinAreaByNumber( Pixel_Data, - GetHeader()->GetGrPixel(), GetHeader()->GetNumPixel()); - } - PixelRead = 0; // no PixelRaw + // If the decompression failed nothing can be done. + return 0; + } - return Pixel_Data; + if ( HeaderInternal->HasLUT() && PixelConverter->BuildRGBImage() ) + { + return PixelConverter->GetRGB(); + } + else + { + // When no LUT or LUT conversion fails, return the decompressed + return PixelConverter->GetDecompressed(); + } } /** @@ -355,50 +199,37 @@ uint8_t* File::GetImageData() */ size_t File::GetImageDataIntoVector (void* destination, size_t maxSize) { - GetImageDataIntoVectorRaw (destination, maxSize); - PixelRead = 0 ; // =0 : no ImageDataRaw - if ( !HeaderInternal->HasLUT() ) + if ( ! GetDecompressed() ) { - return ImageDataSize; + // If the decompression failed nothing can be done. + return 0; } - - FILE* fp = HeaderInternal->OpenFile(); - if ( PixelConverter->BuildRGBImage( fp ) ) - { - memmove( destination, - (void*)PixelConverter->GetRGB(), - PixelConverter->GetRGBSize() ); - - // now, it's an RGB image - // Lets's write it in the Header - - // FIXME : Better use CreateOrReplaceIfExist ? - - 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); + if ( HeaderInternal->HasLUT() && PixelConverter->BuildRGBImage() ) + { + if ( PixelConverter->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(); } - else - { - // PixelConverter->BuildRGBImage() failed probably because - // PixelConverter->GetLUTRGBA() failed: - // (gdcm-US-ALOKA-16.dcm), contains Segmented xxx Palette Color - // that are *more* than 65535 long ?!? - // No idea how to manage such an image ! - // Need to make RGB Pixels (?) from grey Pixels (?!) and Gray Lut (!?!) - // It seems that *no Dicom Viewer* has any idea :-( - - std::string photomInterp = "MONOCHROME1 "; // Photometric Interpretation - HeaderInternal->SetEntryByNumber(photomInterp,0x0028,0x0004); - } - HeaderInternal->CloseFile(); - /// \todo Drop Palette Color out of the Header? - return ImageDataSize; + // Either no LUT conversion necessary or LUT conversion failed + if ( PixelConverter->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(); } /** @@ -412,118 +243,30 @@ size_t File::GetImageDataIntoVector (void* destination, size_t maxSize) */ uint8_t* File::GetImageDataRaw () { - size_t imgDataSize; - if ( HeaderInternal->HasLUT() ) - /// \todo Let Header user a chance to get the right value - imgDataSize = ImageDataSizeRaw; - else - imgDataSize = ImageDataSize; - - // FIXME (Mathieu) - // I need to deallocate Pixel_Data before doing any allocation: - - if ( Pixel_Data ) - if ( LastAllocatedPixelDataLength != imgDataSize ) - free(Pixel_Data); - if ( !Pixel_Data ) - Pixel_Data = new uint8_t[imgDataSize]; - - if ( Pixel_Data ) - { - LastAllocatedPixelDataLength = imgDataSize; - - // we load the pixels ( grey level or RGB, but NO transformation) - GetImageDataIntoVectorRaw(Pixel_Data, imgDataSize); - - // We say the value *is* loaded. - GetHeader()->SetEntryByNumber( GDCM_BINLOADED, - GetHeader()->GetGrPixel(), GetHeader()->GetNumPixel()); - - // will be 7fe0, 0010 in standard cases - GetHeader()->SetEntryBinAreaByNumber(Pixel_Data, - GetHeader()->GetGrPixel(), GetHeader()->GetNumPixel()); - } - PixelRead = 1; // PixelRaw - - return Pixel_Data; + return GetDecompressed(); } -/** - * \brief Copies at most MaxSize bytes of pixel data to caller's - * memory space. - * \warning This function was designed to avoid people that want to build - * a volume from an image stack to need first to get the image pixels - * and then move them to the volume area. - * It's absolutely useless for any VTK user since vtk chooses - * to invert the lines of an image, that is the last line comes first - * (for some axis related reasons?). Hence he will have - * to load the image line by line, starting from the end. - * VTK users hace to call GetImageData - * \warning DOES NOT transform the Grey Plane + Palette Color (if any) - * into a single RGB Pixels Plane - * the (VTK) user will manage the palettes - * - * @param destination Address (in caller's memory space) at which the - * pixel data should be copied - * @param maxSize Maximum number of bytes to be copied. When MaxSize - * is not sufficient to hold the pixel data the copy is not - * executed (i.e. no partial copy). - * @return On success, the number of bytes actually copied. Zero on - * failure e.g. MaxSize is lower than necessary. - */ -void File::GetImageDataIntoVectorRaw (void* destination, size_t maxSize) +uint8_t* File::GetDecompressed() { - // we save the initial values of the following - // in order to be able to 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(); - } - - PixelRead = 1 ; // PixelRaw - - if ( ImageDataSize > maxSize ) + uint8_t* decompressed = PixelConverter->GetDecompressed(); + if ( ! decompressed ) { - dbg.Verbose(0, "File::GetImageDataIntoVector: pixel data bigger" - "than caller's expected MaxSize"); - return; - } - - FILE* fp = HeaderInternal->OpenFile(); - PixelConverter->ReadAndDecompressPixelData( fp ); - HeaderInternal->CloseFile(); - memmove( destination, - (void*)PixelConverter->GetDecompressed(), - PixelConverter->GetDecompressedSize() ); - - if ( ! PixelConverter->IsDecompressedRGB() ) - { - return; + // 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; + } } -/////////////////////////////////////////////////// - // 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); - - return; + return decompressed; } /** @@ -541,11 +284,9 @@ void File::GetImageDataIntoVectorRaw (void* destination, size_t maxSize) */ 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; } @@ -561,14 +302,14 @@ bool File::SetImageData(uint8_t* inData, size_t expectedSize) bool File::WriteRawData(std::string const & fileName) { - FILE* fp1 = fopen(fileName.c_str(), "wb"); - if (fp1 == NULL) + std::ofstream fp1(fileName.c_str(), std::ios::out | std::ios::binary ); + if (!fp1) { - printf("Fail to open (write) file [%s] \n", fileName.c_str()); + dbg.Verbose(2, "Fail to open (write) file:", fileName.c_str()); return false; } - fwrite (Pixel_Data, ImageDataSize, 1, fp1); - fclose (fp1); + fp1.write((char*)Pixel_Data, ImageDataSize); + fp1.close(); return true; } @@ -584,7 +325,8 @@ bool File::WriteRawData(std::string const & fileName) bool File::WriteDcmImplVR (std::string const & fileName) { - return WriteBase(fileName, ImplicitVR); + SetWriteTypeToDcmImplVR(); + return Write(fileName); } /** @@ -597,7 +339,8 @@ bool File::WriteDcmImplVR (std::string const & fileName) bool File::WriteDcmExplVR (std::string const & fileName) { - return WriteBase(fileName, ExplicitVR); + SetWriteTypeToDcmExplVR(); + return Write(fileName); } /** @@ -616,7 +359,30 @@ bool File::WriteDcmExplVR (std::string const & fileName) bool File::WriteAcr (std::string const & fileName) { - return WriteBase(fileName, ACR); + 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(); } //----------------------------------------------------------------------------- @@ -631,27 +397,35 @@ bool File::WriteAcr (std::string const & fileName) */ bool File::WriteBase (std::string const & fileName, FileType type) { - if ( PixelRead == -1 && type != ExplicitVR) - { - return false; - } - - FILE* fp1 = fopen(fileName.c_str(), "wb"); - if (fp1 == NULL) + switch(type) { - printf("Failed to open (write) File [%s] \n", fileName.c_str()); - return false; + case ImplicitVR: + SetWriteFileTypeToImplicitVR(); + break; + case ExplicitVR: + SetWriteFileTypeToExplicitVR(); + break; + case ACR: + SetWriteFileTypeToACR(); + break; + case ACR_LIBIDO: + SetWriteFileTypeToACRLibido(); + break; + default: + SetWriteFileTypeToExplicitVR(); } - - if ( type == ImplicitVR || type == ExplicitVR ) + + switch(WriteMode) { - // writing Dicom File Preamble - uint8_t* filePreamble = new uint8_t[128]; - memset(filePreamble, 0, 128); - fwrite(filePreamble, 128, 1, fp1); - fwrite("DICM", 4, 1, fp1); - - delete[] filePreamble; + case WMODE_NATIVE : + SetWriteToNative(); + break; + case WMODE_DECOMPRESSED : + SetWriteToDecompressed(); + break; + case WMODE_RGB : + SetWriteToRGB(); + break; } // -------------------------------------------------------------- @@ -660,66 +434,345 @@ 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 ( HeaderInternal->GetFileType() == ACR_LIBIDO) { - rows = HeaderInternal->GetEntryByNumber(0x0028, 0x0010); - columns = HeaderInternal->GetEntryByNumber(0x0028, 0x0011); - - HeaderInternal->SetEntryByNumber(columns, 0x0028, 0x0010); - HeaderInternal->SetEntryByNumber(rows , 0x0028, 0x0011); - } + SetWriteToLibido(); + }*/ // ----------------- End of Special Patch ---------------- - - uint16_t grPixel = HeaderInternal->GetGrPixel(); - uint16_t numPixel = HeaderInternal->GetNumPixel();; - - DocEntry* PixelElement = - GetHeader()->GetDocEntryByNumber(grPixel, numPixel); - - if ( PixelRead == 1 ) - { - // we read pixel 'as is' (no tranformation LUT -> RGB) - PixelElement->SetLength( ImageDataSizeRaw ); - } - 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); // -------------------------------------------------------------- // 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 ) +/* if ( HeaderInternal->GetFileType() == ACR_LIBIDO ) { - HeaderInternal->SetEntryByNumber(rows , 0x0028, 0x0010); - HeaderInternal->SetEntryByNumber(columns, 0x0028, 0x0011); - } + RestoreWriteFromLibido(); + }*/ // ----------------- End of Special Patch ---------------- - - // fwrite(Pixel_Data, ImageDataSize, 1, fp1); // should be useless, now - fclose (fp1); - return true; + RestoreWrite(); + RestoreWriteFileType(); + + 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_NATIVE : + break; + case WMODE_DECOMPRESSED : + if( decSize!=ImageDataSize ) + { + dbg.Verbose(0, "File::CheckWriteIntegrity: Data size is incorrect"); + //std::cerr<<"Dec : "<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(PixelConverter->GetDecompressed(),false); + pixel->SetLength(PixelConverter->GetDecompressedSize()); + } + + Archive->Push(photInt); + Archive->Push(pixel); + } } +void File::SetWriteToRGB() +{ + if(HeaderInternal->GetNumberOfScalarComponents()==3) + { + PixelConverter->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(PixelConverter->GetRGB()) + { + pixel->SetBinArea(PixelConverter->GetRGB(),false); + pixel->SetLength(PixelConverter->GetRGBSize()); + } + else // Decompressed data + { + pixel->SetBinArea(PixelConverter->GetDecompressed(),false); + pixel->SetLength(PixelConverter->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); + + Archive->Push(bitsAlloc); + Archive->Push(bitsStored); + Archive->Push(highBit); + } + } + else + { + SetWriteToDecompressed(); + } +} + +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::SetWriteFileTypeToACRLibido() +{ + SetWriteFileTypeToACR(); +} + +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::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::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 ) + { + std::string rows, columns; + + ValEntry *newRow=new ValEntry(oldRow->GetDictEntry()); + ValEntry *newCol=new ValEntry(oldCol->GetDictEntry()); + + newRow->Copy(oldCol); + newCol->Copy(oldRow); + + newRow->SetValue(oldCol->GetValue()); + newCol->SetValue(oldRow->GetValue()); + + Archive->Push(newRow); + Archive->Push(newCol); + } +} + +void File::RestoreWriteFromLibido() +{ + Archive->Restore(0x0028,0x0010); + Archive->Restore(0x0028,0x0011); +} + +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