X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFile.cxx;h=bd35f100dc44b0df4eb8eb4874f0fdf6bdc0c559;hb=45a9005ae5c1975bbe932e43c8080a83c9daf29e;hp=607c37ae1bfd2b1e4c0654c4337786b9981324ce;hpb=7d8572bf6b911f746d4dc5389bb3270868957373;p=gdcm.git diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx index 607c37ae..bd35f100 100644 --- a/src/gdcmFile.cxx +++ b/src/gdcmFile.cxx @@ -1,10 +1,26 @@ -// gdcmFile.cxx -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmFile.cxx,v $ + Language: C++ + Date: $Date: 2004/06/23 09:30:22 $ + Version: $Revision: 1.108 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ + #include "gdcmFile.h" #include "gdcmDebug.h" #include "jpeg/ljpg/jpegless.h" -typedef std::pair IterHT; +typedef std::pair IterHT; //----------------------------------------------------------------------------- // Constructor / Destructor @@ -20,7 +36,7 @@ typedef std::pair IterHT; * one sets an a posteriori shadow dictionary (efficiency can be * seen as a side effect). * @param header file to be opened for reading datas - * @return + * @return */ gdcmFile::gdcmFile(gdcmHeader *header) { Header=header; @@ -54,7 +70,7 @@ gdcmFile::gdcmFile(gdcmHeader *header) { * with a FALSE value for the 'enable_sequence' param. * ('public elements' may be embedded in 'shadow Sequences') */ -gdcmFile::gdcmFile(std::string & filename, +gdcmFile::gdcmFile(std::string const & filename, bool exception_on_error, bool enable_sequences, bool ignore_shadow) { @@ -69,51 +85,13 @@ gdcmFile::gdcmFile(std::string & filename, SetPixelDataSizeFromHeader(); } -/** - * \ingroup gdcmFile - * \brief Constructor dedicated to writing a new DICOMV3 part10 compliant - * file (see SetFileName, SetDcmTag and Write) - * Opens (in read only and when possible) an existing file and checks - * for DICOM compliance. Returns NULL on failure. - * \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). - * @param filename file to be opened for parsing - * @param exception_on_error whether we throw an exception or not - * @param enable_sequences = true to allow the header - * to be parsed *inside* the SeQuences, - * when they have an actual length - * \warning enable_sequences *has to be* true for reading PAPYRUS 3.0 files - * @param ignore_shadow to allow skipping the shadow elements, - * to save memory space. - * \warning The TRUE value for this param has to be used - * with a FALSE value for the 'enable_sequence' param. - * ('public elements' may be embedded in 'shadow Sequences') - */ - gdcmFile::gdcmFile(const char *filename, - bool exception_on_error, - bool enable_sequences, - bool ignore_shadow) { - Header=new gdcmHeader(filename, - exception_on_error, - enable_sequences, - ignore_shadow); - SelfHeader=true; - PixelRead=-1; // no ImageData read yet. - - if (Header->IsReadable()) - SetPixelDataSizeFromHeader(); -} - /** * \ingroup gdcmFile * \brief canonical destructor * \note If the gdcmHeader is created by the gdcmFile, it is destroyed * by the gdcmFile */ -gdcmFile::~gdcmFile(void) { +gdcmFile::~gdcmFile() { if(SelfHeader) delete Header; Header=NULL; @@ -124,24 +102,16 @@ gdcmFile::~gdcmFile(void) { //----------------------------------------------------------------------------- // Public -/** - * \ingroup gdcmFile - * \brief returns the gdcmHeader *Header - * @return - */ -gdcmHeader *gdcmFile::GetHeader(void) { - return(Header); -} /** * \ingroup gdcmFile * \brief computes the length (in bytes) to ALLOCATE to receive the - * image(s) pixels (multiframes taken into account) + * image(s) pixels (multiframes taken into account) * \warning : it is NOT the group 7FE0 length * (no interest for compressed images). * @return length to allocate */ -void gdcmFile::SetPixelDataSizeFromHeader(void) { +void gdcmFile::SetPixelDataSizeFromHeader() { // see PS 3.3-2003 : C.7.6.3.2.1 // // MONOCHROME1 @@ -181,7 +151,7 @@ void gdcmFile::SetPixelDataSizeFromHeader(void) { * Header->GetZSize() * (nb/8)* Header->GetSamplesPerPixel(); std::string str_PhotometricInterpretation = Header->GetEntryByNumber(0x0028,0x0004); - + /*if ( str_PhotometricInterpretation == "PALETTE COLOR " )*/ // pb when undealt Segmented Palette Color @@ -196,8 +166,8 @@ void gdcmFile::SetPixelDataSizeFromHeader(void) { * the pixel data represented in this file. * @return The size of pixel data in bytes. */ -size_t gdcmFile::GetImageDataSize(void) { - return (lgrTotale); +size_t gdcmFile::GetImageDataSize() { + return lgrTotale; } /** @@ -209,8 +179,8 @@ size_t gdcmFile::GetImageDataSize(void) { * \warning to be used with GetImagePixelsRaw() * @return The size of pixel data in bytes. */ -size_t gdcmFile::GetImageDataSizeRaw(void) { - return (lgrTotaleRaw); +size_t gdcmFile::GetImageDataSizeRaw() { + return lgrTotaleRaw; } /** @@ -223,13 +193,17 @@ size_t gdcmFile::GetImageDataSizeRaw(void) { * @return Pointer to newly allocated pixel data. * NULL if alloc fails */ -void * gdcmFile::GetImageData (void) { - PixelData = new char[lgrTotale]; - if (PixelData) +void * gdcmFile::GetImageData () { + PixelData = new unsigned char[lgrTotale]; //consistant with GetImageDataIntoVector + if (PixelData) { GetImageDataIntoVector(PixelData, lgrTotale); - + GetHeader()->SetEntryVoidAreaByNumber(PixelData, + GetHeader()->GetGrPixel(), + GetHeader()->GetNumPixel()); + } PixelRead=0; // no PixelRaw - return(PixelData); + + return PixelData; } /** @@ -263,7 +237,8 @@ size_t gdcmFile::GetImageDataIntoVector (void* destination, size_t MaxSize) { // from Lut R + Lut G + Lut B unsigned char *newDest = new unsigned char[lgrTotale]; unsigned char *a = (unsigned char *)destination; - unsigned char *lutRGBA = Header->GetLUTRGBA(); + unsigned char *lutRGBA = Header->GetLUTRGBA(); + if (lutRGBA) { int l = lgrTotaleRaw; memmove(newDest, destination, l);// move Gray pixels to temp area @@ -290,8 +265,8 @@ size_t gdcmFile::GetImageDataIntoVector (void* destination, size_t MaxSize) { } else { // need to make RGB Pixels (?) - // from grey Pixels (?!) - // and Gray Lut (!?!) + // from grey Pixels (?!) + // and Gray Lut (!?!) // or Segmented xxx Palette Color Lookup Table Data and so on // Oops! I get one (gdcm-US-ALOKA-16.dcm) @@ -316,16 +291,22 @@ size_t gdcmFile::GetImageDataIntoVector (void* destination, size_t MaxSize) { * @return Pointer to newly allocated pixel data. * \ NULL if alloc fails */ -void * gdcmFile::GetImageDataRaw (void) { +void * gdcmFile::GetImageDataRaw () { if (Header->HasLUT()) /// \todo Let gdcmHeadar user a chance to get the right value /// Create a member lgrTotaleRaw ??? lgrTotale /= 3; - PixelData = new char[lgrTotale]; - if (PixelData) + PixelData = new unsigned char[lgrTotale]; + + if (PixelData) { GetImageDataIntoVectorRaw(PixelData, lgrTotale); + GetHeader()->SetEntryVoidAreaByNumber(PixelData, + GetHeader()->GetGrPixel(), + GetHeader()->GetNumPixel()); + } PixelRead=1; // PixelRaw - return(PixelData); + + return PixelData; } /** @@ -364,7 +345,7 @@ size_t gdcmFile::GetImageDataIntoVectorRaw (void *destination, size_t MaxSize) { return (size_t)0; } - (void)ReadPixelData(destination); + ReadPixelData(destination); // Number of Bits Allocated for storing a Pixel str_nb = Header->GetEntryByNumber(0x0028,0x0100); @@ -431,8 +412,8 @@ size_t gdcmFile::GetImageDataIntoVectorRaw (void *destination, size_t MaxSize) { deb ++; } } else { - dbg.Verbose(0, "gdcmFile::GetImageDataIntoVector: wierd image"); - return (size_t)0; + dbg.Verbose(0, "gdcmFile::GetImageDataIntoVector: weird image"); + return 0; } } // DO NOT remove this commented out code . @@ -587,7 +568,9 @@ bool gdcmFile::SetImageData(void *inData, size_t ExpectedSize) { Header->SetImageDataSize(ExpectedSize); PixelData = inData; lgrTotale = ExpectedSize; - return(true); + PixelRead = 1; + + return true; } /** @@ -600,16 +583,17 @@ bool gdcmFile::SetImageData(void *inData, size_t ExpectedSize) { * @return false if write fails */ -bool gdcmFile::WriteRawData (std::string fileName) { +bool gdcmFile::WriteRawData (std::string const & fileName) { FILE *fp1; fp1 = fopen(fileName.c_str(),"wb"); if (fp1 == NULL) { printf("Fail to open (write) file [%s] \n",fileName.c_str()); - return (false); + return false; } fwrite (PixelData,lgrTotale, 1, fp1); fclose (fp1); - return(true); + + return true; } /** @@ -622,23 +606,10 @@ bool gdcmFile::WriteRawData (std::string fileName) { * @return false if write fails */ -bool gdcmFile::WriteDcmImplVR (std::string fileName) { - return WriteBase(fileName, ImplicitVR); +bool gdcmFile::WriteDcmImplVR (std::string const & fileName) { + return WriteBase(fileName, gdcmImplicitVR); } -/** - * \ingroup gdcmFile - * \brief Writes on disk A SINGLE Dicom file, - * using the Implicit Value Representation convention - * 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 gdcmFile::WriteDcmImplVR (const char *fileName) { - return WriteDcmImplVR (std::string (fileName)); -} - /** * \ingroup gdcmFile * \brief Writes on disk A SINGLE Dicom file, @@ -648,8 +619,8 @@ bool gdcmFile::WriteDcmImplVR (const char *fileName) { * @return false if write fails */ -bool gdcmFile::WriteDcmExplVR (std::string fileName) { - return WriteBase(fileName, ExplicitVR); +bool gdcmFile::WriteDcmExplVR (std::string const & fileName) { + return WriteBase(fileName, gdcmExplicitVR); } /** @@ -667,8 +638,8 @@ bool gdcmFile::WriteDcmExplVR (std::string fileName) { * @return false if write fails */ -bool gdcmFile::WriteAcr (std::string fileName) { - return WriteBase(fileName, ACR); +bool gdcmFile::WriteAcr (std::string const & fileName) { + return WriteBase(fileName, gdcmACR); } //----------------------------------------------------------------------------- @@ -682,11 +653,11 @@ bool gdcmFile::WriteAcr (std::string fileName) { * @param type file type (ExplicitVR, ImplicitVR, ...) * @return false if write fails */ -bool gdcmFile::WriteBase (std::string fileName, FileType type) { +bool gdcmFile::WriteBase (std::string const & fileName, FileType type) { FILE *fp1; - if (PixelRead==-1 && type != ExplicitVR) { + if (PixelRead==-1 && type != gdcmExplicitVR) { return false; } @@ -696,7 +667,7 @@ bool gdcmFile::WriteBase (std::string fileName, FileType type) { return (false); } - if ( (type == ImplicitVR) || (type == ExplicitVR) ) { + if ( (type == gdcmImplicitVR) || (type == gdcmExplicitVR) ) { char *filePreamble; // writing Dicom File Preamble filePreamble=new char[128]; @@ -717,7 +688,7 @@ bool gdcmFile::WriteBase (std::string fileName, FileType type) { /// but pb expected if user deals with, e.g. COMPLEX images std::string rows, columns; - if ( Header->GetFileType() == ACR_LIBIDO){ + if ( Header->GetFileType() == gdcmACR_LIBIDO){ rows = Header->GetEntryByNumber(0x0028, 0x0010); columns = Header->GetEntryByNumber(0x0028, 0x0011); Header->SetEntryByNumber(columns, 0x0028, 0x0010); @@ -734,8 +705,8 @@ bool gdcmFile::WriteBase (std::string fileName, FileType type) { // the *last* of the (GrPixel, NumPixel), if many. TagKey key = gdcmDictEntry::TranslateToKey(grPixel, numPixel); - TagHeaderEntryHT::iterator p2; - gdcmHeaderEntry *PixelElement; + TagDocEntryHT::iterator p2; + gdcmDocEntry *PixelElement; IterHT it= Header->GetEntry().equal_range(key); // get a pair of iterators first-last synonym @@ -763,15 +734,16 @@ bool gdcmFile::WriteBase (std::string fileName, FileType type) { // ...and we restore the Header to be Dicom Compliant again // just after writting - if (Header->GetFileType() == ACR_LIBIDO){ + if (Header->GetFileType() == gdcmACR_LIBIDO){ Header->SetEntryByNumber(rows , 0x0028, 0x0010); Header->SetEntryByNumber(columns, 0x0028, 0x0011); } // ----------------- End of Special Patch ---------------- - fwrite(PixelData, lgrTotale, 1, fp1); + // fwrite(PixelData, lgrTotale, 1, fp1); // should be useless, now fclose (fp1); - return(true); + + return true; } //----------------------------------------------------------------------------- @@ -786,12 +758,12 @@ bool gdcmFile::WriteBase (std::string fileName, FileType type) { * @param nb Pixels Bit number */ void gdcmFile::SwapZone(void *im, int swap, int lgr, int nb) { -guint32 s32; -guint16 fort,faible; -int i; + guint32 s32; + guint16 fort,faible; + int i; -if(nb == 16) - switch(swap) { + if(nb == 16) + switch(swap) { case 0: case 12: case 1234: @@ -812,8 +784,8 @@ if(nb == 16) printf("SWAP value (16 bits) not allowed : %d\n", swap); } -if( nb == 32 ) - switch (swap) { + if( nb == 32 ) + switch (swap) { case 0: case 1234: break; @@ -850,9 +822,8 @@ if( nb == 32 ) break; default: - printf("SWAP value (32 bits) not allowed : %d\n", swap); + std::cout << "SWAP value (32 bits) not allowed : " << swap << std::endl; } -return; } /** @@ -896,7 +867,7 @@ bool gdcmFile::ReadPixelData(void *destination) { } Header->CloseFile(); - return(true); + return true; } // ---------------------- Uncompressed File @@ -941,7 +912,7 @@ bool gdcmFile::ReadPixelData(void *destination) { bool jpg2000 = Header->IsJPEG2000(); bool jpgLossless = Header->IsJPEGLossless(); - + bool res = true; guint16 ItemTagGr,ItemTagEl; int ln; @@ -989,7 +960,6 @@ bool gdcmFile::ReadPixelData(void *destination) { } // ------------------------------------- endif (JPEG2000) else if (jpgLossless) { // JPEG LossLess : call to xmedcom JPEG - JPEGLosslessDecodeImage (fp, // Reading Fragment pixels (unsigned short *)destination, Header->GetPixelSize() * 8 * Header->GetSamplesPerPixel(),