X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFileHelper.cxx;h=7183e58967f6c7fd83d8e7bfc12c31993673edb3;hb=76b3dc477f0e176f91ea991d7a951a863bab3247;hp=ad26ffde02c88b4a5c24a5dd8174fcfb385b92fd;hpb=f2a52d001685df67875981cf460a9c2a078d62a4;p=gdcm.git diff --git a/src/gdcmFileHelper.cxx b/src/gdcmFileHelper.cxx index ad26ffde..7183e589 100644 --- a/src/gdcmFileHelper.cxx +++ b/src/gdcmFileHelper.cxx @@ -4,8 +4,8 @@ Module: $RCSfile: gdcmFileHelper.cxx,v $ Language: C++ - Date: $Date: 2006/03/13 14:44:07 $ - Version: $Revision: 1.97 $ + Date: $Date: 2006/10/18 13:40:18 $ + Version: $Revision: 1.110 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -269,9 +269,10 @@ bool FileHelper::SetEntryBinArea(uint8_t *content, int lgth, * failed). */ DataEntry *FileHelper::InsertEntryString(std::string const &content, - uint16_t group, uint16_t elem) + uint16_t group, uint16_t elem, + VRKey const &vr ) { - return FileInternal->InsertEntryString(content, group, elem); + return FileInternal->InsertEntryString(content, group, elem, vr); } /** @@ -282,13 +283,15 @@ DataEntry *FileHelper::InsertEntryString(std::string const &content, * @param lgth new value length * @param group Group number of the Entry * @param elem Element number of the Entry + * @param vr Value Represenation of the DataElement to be inserted * \return pointer to the modified/created DataEntry (NULL when creation * failed). */ DataEntry *FileHelper::InsertEntryBinArea(uint8_t *binArea, int lgth, - uint16_t group, uint16_t elem) + uint16_t group, uint16_t elem, + VRKey const &vr ) { - return FileInternal->InsertEntryBinArea(binArea, lgth, group, elem); + return FileInternal->InsertEntryBinArea(binArea, lgth, group, elem, vr); } /** @@ -389,7 +392,7 @@ uint8_t *FileHelper::GetImageDataRaw () return GetRaw(); } -#ifndef GDCM_LEGACY_REMOVE +//#ifndef GDCM_LEGACY_REMOVE /* * \brief Useless function, since PixelReadConverter forces us * copy the Pixels anyway. @@ -416,6 +419,7 @@ uint8_t *FileHelper::GetImageDataRaw () * @return On success, the number of bytes actually copied. Zero on * failure e.g. MaxSize is lower than necessary. */ + /* size_t FileHelper::GetImageDataIntoVector (void *destination, size_t maxSize) { if ( ! GetRaw() ) @@ -448,7 +452,8 @@ size_t FileHelper::GetImageDataIntoVector (void *destination, size_t maxSize) PixelReadConverter->GetRawSize() ); return PixelReadConverter->GetRawSize(); } -#endif +*/ +//#endif /** * \brief Points the internal pointer to the callers inData @@ -661,6 +666,9 @@ bool FileHelper::WriteAcr (std::string const &fileName) */ bool FileHelper::Write(std::string const &fileName) { + + CheckMandatoryElements(); //called once, here ! + bool flag = false; DocEntry *e; switch(WriteType) @@ -671,7 +679,7 @@ bool FileHelper::Write(std::string const &fileName) case Unknown: // should never happen; ExplicitVR is the default value case ExplicitVR: - + // User should ask gdcm to write an image in Explicit VR mode // only when he is sure *all* the VR of *all* the DataElements is known. // i.e : when there are *only* Public Groups @@ -680,10 +688,11 @@ bool FileHelper::Write(std::string const &fileName) // Let's just *dream* about it; *never* trust a user ! // We turn to Implicit VR if at least the VR of one element is unknown. + e = FileInternal->GetFirstEntry(); while (e != 0) { - if (e->GetVR() == " ") + if (e->GetVR() == " ") { SetWriteTypeToDcmImplVR(); SetWriteFileTypeToImplicitVR(); @@ -698,7 +707,9 @@ bool FileHelper::Write(std::string const &fileName) SetWriteFileTypeToExplicitVR(); } break; - + + SetWriteFileTypeToExplicitVR(); // to see JPRx + break; case ACR: case ACR_LIBIDO: // NOTHING is done here just for LibIDO. @@ -708,7 +719,8 @@ bool FileHelper::Write(std::string const &fileName) // (shame on him !) // We add Recognition Code (RET) if ( ! FileInternal->GetDataEntry(0x0008, 0x0010) ) - FileInternal->InsertEntryString("ACR-NEMA V1.0 ", 0x0008, 0x0010); + FileInternal->InsertEntryString("ACR-NEMA V1.0 ", + 0x0008, 0x0010, "LO"); SetWriteFileTypeToACR(); // SetWriteFileTypeToImplicitVR(); // ACR IS implicit VR ! break; @@ -717,9 +729,11 @@ bool FileHelper::Write(std::string const &fileName) case JPEG: SetWriteFileTypeToJPEG(); break; + + case JPEG2000: + SetWriteFileTypeToJPEG2000(); + break; } - - CheckMandatoryElements(); // -------------------------------------------------------------- // Special Patch to allow gdcm to re-write ACR-LibIDO formated images @@ -751,15 +765,16 @@ bool FileHelper::Write(std::string const &fileName) } bool check = CheckWriteIntegrity(); // verifies length - if (WriteType == JPEG ) check = true; + if (WriteType == JPEG || WriteType == JPEG2000) check = true; if (check) { check = FileInternal->Write(fileName,WriteType); } - RestoreWrite(); - RestoreWriteFileType(); - RestoreWriteMandatory(); + RestoreWrite(); + // RestoreWriteFileType(); + // RestoreWriteMandatory(); + // -------------------------------------------------------------- // Special Patch to allow gdcm to re-write ACR-LibIDO formated images @@ -798,6 +813,7 @@ bool FileHelper::CheckWriteIntegrity() size_t decSize = FileInternal->GetXSize() * FileInternal->GetYSize() * FileInternal->GetZSize() + * FileInternal->GetTSize() * FileInternal->GetSamplesPerPixel() * ( numberBitsAllocated / 8 ); size_t rgbSize = decSize; @@ -844,7 +860,7 @@ void FileHelper::SetWriteToRaw() } else { - DataEntry *photInt = CopyDataEntry(0x0028,0x0004); + DataEntry *photInt = CopyDataEntry(0x0028,0x0004,"CS"); if (FileInternal->HasLUT() ) { photInt->SetString("PALETTE COLOR "); @@ -862,6 +878,11 @@ void FileHelper::SetWriteToRaw() vr = "OW"; if ( FileInternal->GetBitsAllocated()==24 ) // For RGB ACR files vr = "OB"; + // For non RAW data. Mainly JPEG + if( WriteType == JPEG || WriteType == JPEG2000) + { + vr = "OW"; + } DataEntry *pixel = CopyDataEntry(GetFile()->GetGrPixel(),GetFile()->GetNumPixel(),vr); pixel->SetFlag(DataEntry::FLAG_PIXELDATA); @@ -889,13 +910,13 @@ void FileHelper::SetWriteToRGB() { PixelReadConverter->BuildRGBImage(); - DataEntry *spp = CopyDataEntry(0x0028,0x0002); + DataEntry *spp = CopyDataEntry(0x0028,0x0002,"US"); spp->SetString("3 "); - DataEntry *planConfig = CopyDataEntry(0x0028,0x0006); + DataEntry *planConfig = CopyDataEntry(0x0028,0x0006,"US"); planConfig->SetString("0 "); - DataEntry *photInt = CopyDataEntry(0x0028,0x0004); + DataEntry *photInt = CopyDataEntry(0x0028,0x0004,"CS"); photInt->SetString("RGB "); if ( PixelReadConverter->GetRGB() ) @@ -946,13 +967,13 @@ void FileHelper::SetWriteToRGB() // samples per pixels = 1 (in the read file) if ( FileInternal->GetBitsAllocated()==24 ) { - DataEntry *bitsAlloc = CopyDataEntry(0x0028,0x0100); + DataEntry *bitsAlloc = CopyDataEntry(0x0028,0x0100,"US"); bitsAlloc->SetString("8 "); - DataEntry *bitsStored = CopyDataEntry(0x0028,0x0101); + DataEntry *bitsStored = CopyDataEntry(0x0028,0x0101,"US"); bitsStored->SetString("8 "); - DataEntry *highBit = CopyDataEntry(0x0028,0x0102); + DataEntry *highBit = CopyDataEntry(0x0028,0x0102,"US"); highBit->SetString("7 "); Archive->Push(bitsAlloc); @@ -975,8 +996,10 @@ void FileHelper::SetWriteToRGB() */ void FileHelper::RestoreWrite() { + Archive->Restore(0x0028,0x0002); Archive->Restore(0x0028,0x0004); + Archive->Restore(0x0028,0x0006); Archive->Restore(GetFile()->GetGrPixel(),GetFile()->GetNumPixel()); @@ -996,7 +1019,6 @@ void FileHelper::RestoreWrite() // For the Palette Color Lookup Table UID Archive->Restore(0x0028,0x1203); - // group 0002 may be pushed out for ACR-NEMA writting purposes Archive->Restore(0x0002,0x0000); Archive->Restore(0x0002,0x0001); @@ -1008,6 +1030,7 @@ void FileHelper::RestoreWrite() Archive->Restore(0x0002,0x0016); Archive->Restore(0x0002,0x0100); Archive->Restore(0x0002,0x0102); + } /** @@ -1031,6 +1054,21 @@ void FileHelper::SetWriteFileTypeToACR() Archive->Push(0x0002,0x0102); } + /** + * \brief Sets in the File the TransferSyntax to 'JPEG2000' + */ +void FileHelper::SetWriteFileTypeToJPEG2000() +{ + std::string ts = Util::DicomString( + Global::GetTS()->GetSpecialTransferSyntax(TS::JPEG2000Lossless) ); + + DataEntry *tss = CopyDataEntry(0x0002,0x0010,"UI"); + tss->SetString(ts); + + Archive->Push(tss); + tss->Delete(); +} + /** * \brief Sets in the File the TransferSyntax to 'JPEG' */ @@ -1039,7 +1077,7 @@ void FileHelper::SetWriteFileTypeToJPEG() std::string ts = Util::DicomString( Global::GetTS()->GetSpecialTransferSyntax(TS::JPEGBaselineProcess1) ); - DataEntry *tss = CopyDataEntry(0x0002,0x0010); + DataEntry *tss = CopyDataEntry(0x0002,0x0010,"UI"); tss->SetString(ts); Archive->Push(tss); @@ -1054,7 +1092,7 @@ void FileHelper::SetWriteFileTypeToExplicitVR() std::string ts = Util::DicomString( Global::GetTS()->GetSpecialTransferSyntax(TS::ExplicitVRLittleEndian) ); - DataEntry *tss = CopyDataEntry(0x0002,0x0010); + DataEntry *tss = CopyDataEntry(0x0002,0x0010,"UI"); tss->SetString(ts); Archive->Push(tss); tss->Delete(); @@ -1068,7 +1106,7 @@ void FileHelper::SetWriteFileTypeToImplicitVR() std::string ts = Util::DicomString( Global::GetTS()->GetSpecialTransferSyntax(TS::ImplicitVRLittleEndian) ); - DataEntry *tss = CopyDataEntry(0x0002,0x0010); + DataEntry *tss = CopyDataEntry(0x0002,0x0010,"UI"); tss->SetString(ts); Archive->Push(tss); tss->Delete(); @@ -1094,9 +1132,12 @@ void FileHelper::SetWriteToLibido() { std::string rows, columns; - DataEntry *newRow=DataEntry::New(oldRow->GetDictEntry()); - DataEntry *newCol=DataEntry::New(oldCol->GetDictEntry()); - + //DataEntry *newRow=DataEntry::New(oldRow->GetDictEntry()); + //DataEntry *newCol=DataEntry::New(oldCol->GetDictEntry()); + + DataEntry *newRow=DataEntry::New(0x0028, 0x0010, "US"); + DataEntry *newCol=DataEntry::New(0x0028, 0x0011, "US"); + newRow->Copy(oldCol); newCol->Copy(oldRow); @@ -1110,7 +1151,7 @@ void FileHelper::SetWriteToLibido() newCol->Delete(); } - DataEntry *libidoCode = CopyDataEntry(0x0008,0x0010); + DataEntry *libidoCode = CopyDataEntry(0x0008,0x0010,"LO"); libidoCode->SetString("ACRNEMA_LIBIDO_1.1"); Archive->Push(libidoCode); libidoCode->Delete(); @@ -1126,7 +1167,7 @@ void FileHelper::SetWriteToNoLibido() { if ( recCode->GetString() == "ACRNEMA_LIBIDO_1.1" ) { - DataEntry *libidoCode = CopyDataEntry(0x0008,0x0010); + DataEntry *libidoCode = CopyDataEntry(0x0008,0x0010,"LO"); libidoCode->SetString(""); Archive->Push(libidoCode); libidoCode->Delete(); @@ -1155,11 +1196,10 @@ void FileHelper::RestoreWriteOfLibido() * @param group Group number of the Entry * @param elem Element number of the Entry * @param vr Value Representation of the Entry - * FIXME : what is it used for? * \return pointer to the new Bin Entry (NULL when creation failed). */ DataEntry *FileHelper::CopyDataEntry(uint16_t group, uint16_t elem, - const TagName &vr) + const VRKey &vr) { DocEntry *oldE = FileInternal->GetDocEntry(group, elem); DataEntry *newE; @@ -1170,7 +1210,8 @@ DataEntry *FileHelper::CopyDataEntry(uint16_t group, uint16_t elem, if ( oldE ) { - newE = DataEntry::New(oldE->GetDictEntry()); + //newE = DataEntry::New(oldE->GetDictEntry()); + newE = DataEntry::New(group, elem, vr); newE->Copy(oldE); } else @@ -1225,11 +1266,12 @@ We have to deal with 4 *very* different cases : USER_OWN_IMAGE -2) user modified the pixels of an existing image. FILTERED_IMAGE --3) user created a new image, using existing images (eg MIP, MPR, cartography image) +-3) user created a new image, using a set of existing images (eg MIP, MPR, cartography image) CREATED_IMAGE -4) user modified/added some tags *without processing* the pixels (anonymization.. UNMODIFIED_PIXELS_IMAGE - +-Probabely some more to be added + gdcm::FileHelper::CheckMandatoryElements() deals automatically with these cases. 1)2)3)4) @@ -1373,11 +1415,16 @@ void FileHelper::CheckMandatoryElements() //0002 0016 AE 1 Source Application Entity Title //0002 0100 UI 1 Private Information Creator //0002 0102 OB 1 Private Information + + // Push out 'ACR-NEMA-special' entries, if any + Archive->Push(0x0008,0x0001); // Length to End + Archive->Push(0x0008,0x0010); // Recognition Code + Archive->Push(0x0028,0x0005); // Image Dimension // Create them if not found // Always modify the value // Push the entries to the archive. - CopyMandatoryEntry(0x0002,0x0000,"0"); + CopyMandatoryEntry(0x0002,0x0000,"0","UL"); DataEntry *e_0002_0001 = CopyDataEntry(0x0002,0x0001, "OB"); e_0002_0001->SetBinArea((uint8_t*)Util::GetFileMetaInformationVersion(), @@ -1389,54 +1436,116 @@ void FileHelper::CheckMandatoryElements() if ( ContentType == FILTERED_IMAGE || ContentType == UNMODIFIED_PIXELS_IMAGE) { // we keep the original 'Media Storage SOP Class UID', we default it if missing - CheckMandatoryEntry(0x0002,0x0002,"1.2.840.10008.5.1.4.1.1.7"); + CheckMandatoryEntry(0x0002,0x0002,"1.2.840.10008.5.1.4.1.1.7","UI"); } else { // It's *not* an image comming straight from a source. We force // 'Media Storage SOP Class UID' --> [Secondary Capture Image Storage] - CopyMandatoryEntry(0x0002,0x0002,"1.2.840.10008.5.1.4.1.1.7"); + CopyMandatoryEntry(0x0002,0x0002,"1.2.840.10008.5.1.4.1.1.7","UI"); } // 'Media Storage SOP Instance UID' - CopyMandatoryEntry(0x0002,0x0003,sop); + CopyMandatoryEntry(0x0002,0x0003,sop,"UI"); // 'Implementation Class UID' // FIXME : in all examples we have, 0x0002,0x0012 is not so long : // seems to be Root UID + 4 digits (?) - CopyMandatoryEntry(0x0002,0x0012,Util::CreateUniqueUID()); + CopyMandatoryEntry(0x0002,0x0012,Util::CreateUniqueUID(),"UI"); // 'Implementation Version Name' std::string version = "GDCM "; version += Util::GetVersion(); - CopyMandatoryEntry(0x0002,0x0013,version); + CopyMandatoryEntry(0x0002,0x0013,version,"SH"); } // --------------------- For DataSet --------------------- + + if ( ContentType != USER_OWN_IMAGE) // when it's not a user made image + { + + gdcmDebugMacro( "USER_OWN_IMAGE (1)"); + // If 'SOP Class UID' exists ('true DICOM' image) + // we create the 'Source Image Sequence' SeqEntry + // to hold informations about the Source Image + + DataEntry *e_0008_0016 = FileInternal->GetDataEntry(0x0008, 0x0016); + if ( e_0008_0016 ) + { + // Create 'Source Image Sequence' SeqEntry +// SeqEntry *sis = SeqEntry::New ( +// Global::GetDicts()->GetDefaultPubDict()->GetEntry(0x0008, 0x2112) ); + SeqEntry *sis = SeqEntry::New (0x0008, 0x2112); + SQItem *sqi = SQItem::New(1); + // (we assume 'SOP Instance UID' exists too) + // create 'Referenced SOP Class UID' +// DataEntry *e_0008_1150 = DataEntry::New( +// Global::GetDicts()->GetDefaultPubDict()->GetEntry(0x0008, 0x1150) ); + DataEntry *e_0008_1150 = DataEntry::New(0x0008, 0x1150, "UI"); + e_0008_1150->SetString( e_0008_0016->GetString()); + sqi->AddEntry(e_0008_1150); + e_0008_1150->Delete(); + + // create 'Referenced SOP Instance UID' + DataEntry *e_0008_0018 = FileInternal->GetDataEntry(0x0008, 0x0018); +// DataEntry *e_0008_1155 = DataEntry::New( +// Global::GetDicts()->GetDefaultPubDict()->GetEntry(0x0008, 0x1155) ); + DataEntry *e_0008_1155 = DataEntry::New(0x0008, 0x1155, "UI"); + e_0008_1155->SetString( e_0008_0018->GetString()); + sqi->AddEntry(e_0008_1155); + e_0008_1155->Delete(); + + sis->AddSQItem(sqi,1); + sqi->Delete(); + + // temporarily replaces any previous 'Source Image Sequence' + Archive->Push(sis); + sis->Delete(); + + // FIXME : is 'Image Type' *really* depending on the presence of 'SOP Class UID'? + if ( ContentType == FILTERED_IMAGE) + // the user *knows* he just modified the pixels + // the image is no longer an 'Original' one + CopyMandatoryEntry(0x0008,0x0008,"DERIVED\\PRIMARY","CS"); + } + } if ( ContentType == FILTERED_IMAGE || ContentType == UNMODIFIED_PIXELS_IMAGE) { // we keep the original 'Media Storage SOP Class UID', we default it if missing (it should be present !) - CheckMandatoryEntry(0x0008,0x0016,"1.2.840.10008.5.1.4.1.1.7"); + CheckMandatoryEntry(0x0008,0x0016,"1.2.840.10008.5.1.4.1.1.7","UI"); } else { // It's *not* an image comming straight from a source. We force // 'Media Storage SOP Class UID' --> [Secondary Capture Image Storage] - CopyMandatoryEntry(0x0008,0x0016,"1.2.840.10008.5.1.4.1.1.7"); - } - + CopyMandatoryEntry(0x0008,0x0016,"1.2.840.10008.5.1.4.1.1.7", "UI"); + } + + Archive->Push(0x0028,0x005); // [Image Dimensions (RET) // Push out 'LibIDO-special' entries, if any Archive->Push(0x0028,0x0015); Archive->Push(0x0028,0x0016); Archive->Push(0x0028,0x0017); - Archive->Push(0x0028,0x00199); + Archive->Push(0x0028,0x0198); // very old versions + Archive->Push(0x0028,0x0199); + + // Replace deprecated 0028 0012 US Planes + // by new 0028 0008 IS Number of Frames + + ///\todo : find if there is a rule! + DataEntry *e_0028_0012 = FileInternal->GetDataEntry(0x0028, 0x0012); + if ( e_0028_0012 ) + { + CopyMandatoryEntry(0x0028, 0x0008,e_0028_0012->GetString(),"IS"); + Archive->Push(0x0028,0x0012); + } // Deal with the pb of (Bits Stored = 12) // - we're gonna write the image as Bits Stored = 16 if ( FileInternal->GetEntryString(0x0028,0x0100) == "12") { - CopyMandatoryEntry(0x0028,0x0100,"16"); + CopyMandatoryEntry(0x0028,0x0100,"16","US"); } // Check if user wasn't drunk ;-) @@ -1444,9 +1553,10 @@ void FileHelper::CheckMandatoryElements() std::ostringstream s; // check 'Bits Allocated' vs decent values int nbBitsAllocated = FileInternal->GetBitsAllocated(); - if ( nbBitsAllocated == 0 || nbBitsAllocated > 32) + if ( nbBitsAllocated == 0 || nbBitsAllocated > 32 + || ( nbBitsAllocated > 8 && nbBitsAllocated <16) ) { - CopyMandatoryEntry(0x0028,0x0100,"16"); + CopyMandatoryEntry(0x0028,0x0100,"16","US"); gdcmWarningMacro("(0028,0100) changed from " << nbBitsAllocated << " to 16 for consistency purpose"); nbBitsAllocated = 16; @@ -1457,7 +1567,7 @@ void FileHelper::CheckMandatoryElements() { s.str(""); s << nbBitsAllocated; - CopyMandatoryEntry(0x0028,0x0101,s.str()); + CopyMandatoryEntry(0x0028,0x0101,s.str(),"US"); gdcmWarningMacro("(0028,0101) changed from " << nbBitsStored << " to " << nbBitsAllocated << " for consistency purpose" ); @@ -1471,18 +1581,36 @@ void FileHelper::CheckMandatoryElements() { s.str(""); s << nbBitsStored - 1; - CopyMandatoryEntry(0x0028,0x0102,s.str()); + CopyMandatoryEntry(0x0028,0x0102,s.str(),"US"); gdcmWarningMacro("(0028,0102) changed from " << highBitPosition << " to " << nbBitsAllocated-1 << " for consistency purpose"); } + // check Pixel Representation (default it as 0 -unsigned-) + + DataEntry *e_0028_0103 = FileInternal->GetDataEntry(0x0028, 0x0103); + if ( !e_0028_0103 ) + { + gdcmWarningMacro("PixelRepresentation (0028,0103) is supposed to be mandatory"); + CopyMandatoryEntry(0x0028, 0x0103,"0","US"); + } + else + { + int sign = (int)e_0028_0103->GetValue(0); + if (sign !=1 && sign !=0) + { + gdcmWarningMacro("PixelRepresentation (0028,0103) is supposed to be =1 or =0"); + CopyMandatoryEntry(0x0028, 0x0103,"0","US"); + } + } + std::string pixelSpacing = FileInternal->GetEntryString(0x0028,0x0030); if ( pixelSpacing == GDCM_UNFOUND ) { pixelSpacing = "1.0\\1.0"; // if missing, Pixel Spacing forced to "1.0\1.0" - CopyMandatoryEntry(0x0028,0x0030,pixelSpacing); + CopyMandatoryEntry(0x0028,0x0030,pixelSpacing,"DS"); } // 'Imager Pixel Spacing' : defaulted to 'Pixel Spacing' @@ -1490,65 +1618,70 @@ void FileHelper::CheckMandatoryElements() if ( ContentType != USER_OWN_IMAGE) // we write it only when we are *sure* the image comes from // an imager (see also 0008,0x0064) - CheckMandatoryEntry(0x0018,0x1164,pixelSpacing); - - // Samples Per Pixel (type 1) : default to grayscale - CheckMandatoryEntry(0x0028,0x0002,"1"); + CheckMandatoryEntry(0x0018,0x1164,pixelSpacing,"DS"); - // --- Check UID-related Entries --- - if ( ContentType != USER_OWN_IMAGE) // when it's not a user made image - { - // If 'SOP Class UID' exists ('true DICOM' image) - // we create the 'Source Image Sequence' SeqEntry - // to hold informations about the Source Image - - DataEntry *e_0008_0016 = FileInternal->GetDataEntry(0x0008, 0x0016); - if ( e_0008_0016 ) - { - // Create 'Source Image Sequence' SeqEntry - SeqEntry *sis = SeqEntry::New ( - Global::GetDicts()->GetDefaultPubDict()->GetEntry(0x0008, 0x2112) ); - SQItem *sqi = SQItem::New(1); - // (we assume 'SOP Instance UID' exists too) - // create 'Referenced SOP Class UID' - DataEntry *e_0008_1150 = DataEntry::New( - Global::GetDicts()->GetDefaultPubDict()->GetEntry(0x0008, 0x1150) ); - e_0008_1150->SetString( e_0008_0016->GetString()); - sqi->AddEntry(e_0008_1150); - e_0008_1150->Delete(); - - // create 'Referenced SOP Instance UID' - DataEntry *e_0008_0018 = FileInternal->GetDataEntry(0x0008, 0x0018); - DataEntry *e_0008_1155 = DataEntry::New( - Global::GetDicts()->GetDefaultPubDict()->GetEntry(0x0008, 0x1155) ); - e_0008_1155->SetString( e_0008_0018->GetString()); - sqi->AddEntry(e_0008_1155); - e_0008_1155->Delete(); +/* +///Exact meaning of RETired fields + +// See page 73 of ACR-NEMA_300-1988.pdf ! + +// 0020,0020 : Patient Orientation : +Patient direction of the first row and +column of the images. The first entry id the direction of the raws, given by the +direction of the last pixel in the first row from the first pixel in tha row. +the second entry is the direction of the columns, given by the direction of the +last pixel in the first column from the first pixel in that column. +L : Left, F : Feet, A : Anterior, P : Posterior. +Up to 3 letters can be used in combination to indicate oblique planes. + +//0020,0030 Image Position (RET) +x,y,z coordinates im mm of the first pixel in the image + +// 0020,0035 Image Orientation (RET) +Direction cosines of the R axis of the image system with respect to the +equipment coordinate axes x,y,z, followed by direction cosines of the C axis of +the image system with respect to the same axes + +//0020,0050 Location +An image location reference, standard for the modality (such as CT bed +position), used to indicate position. Calculation of position for other purposes +is only from (0020,0030) and (0020,0035) +*/ + +/* +// if imagePositionPatient not found, default it with imagePositionRet, if any +// if imageOrientationPatient not found, default it with imageOrientationRet, if any - sis->AddSQItem(sqi,1); - sqi->Delete(); + std::string imagePositionRet = FileInternal->GetEntryString(0x0020,0x0030); + std::string imageOrientationRet = FileInternal->GetEntryString(0x0020,0x0035); + std::string imagePositionPatient = FileInternal->GetEntryString(0x0020,0x0032); + std::string imageOrientationPatient = FileInternal->GetEntryString(0x0020,0x0037); + + if( imagePositionPatient == GDCM_UNFOUND && imageOrientationPatient == GDCM_UNFOUND + && imagePositionRet != GDCM_UNFOUND && imageOrientationRet != GDCM_UNFOUND) + { + CopyMandatoryEntry(0x0020, 0x0032,imagePositionRet,"DS"); + Archive->Push(0x0020,0x0030); + CopyMandatoryEntry(0x0020, 0x0037,imageOrientationRet,"DS"); + Archive->Push(0x0020,0x0035); + } +*/ + + // Samples Per Pixel (type 1) : default to grayscale + CheckMandatoryEntry(0x0028,0x0002,"1","US"); - // temporarily replaces any previous 'Source Image Sequence' - Archive->Push(sis); - sis->Delete(); + // --- Check UID-related Entries --- - // FIXME : is 'Image Type' *really* depending on the presence of 'SOP Class UID'? - if ( ContentType == FILTERED_IMAGE) - // the user *knows* he just modified the pixels - // the image is no longer an 'Original' one - CopyMandatoryEntry(0x0008,0x0008,"DERIVED\\PRIMARY"); - } - } - // At the end, not to overwrite the original ones, // needed by 'Referenced SOP Instance UID', 'Referenced SOP Class UID' // 'SOP Instance UID' - CopyMandatoryEntry(0x0008,0x0018,sop); + CopyMandatoryEntry(0x0008,0x0018,sop,"UI"); if ( ContentType == USER_OWN_IMAGE) { + gdcmDebugMacro( "USER_OWN_IMAGE (2)"); // Conversion Type. // Other possible values are : // See PS 3.3, Page 408 @@ -1562,7 +1695,7 @@ void FileHelper::CheckMandatoryElements() // DRW = Drawing // SYN = Synthetic Image - CheckMandatoryEntry(0x0008,0x0064,"SYN"); // Why not? + CheckMandatoryEntry(0x0008,0x0064,"SYN","CS"); // Why not? } /* if ( ContentType == CREATED_IMAGE) @@ -1579,20 +1712,20 @@ void FileHelper::CheckMandatoryElements() // Instance Creation Date const std::string &date = Util::GetCurrentDate(); - CopyMandatoryEntry(0x0008,0x0012,date); + CopyMandatoryEntry(0x0008,0x0012,date,"DA"); // Instance Creation Time const std::string &time = Util::GetCurrentTime(); - CopyMandatoryEntry(0x0008,0x0013,time); + CopyMandatoryEntry(0x0008,0x0013,time,"TM"); // Study Date - CheckMandatoryEntry(0x0008,0x0020,date); + CheckMandatoryEntry(0x0008,0x0020,date,"DA"); // Study Time - CheckMandatoryEntry(0x0008,0x0030,time); + CheckMandatoryEntry(0x0008,0x0030,time,"TM"); // Accession Number //CopyMandatoryEntry(0x0008,0x0050,""); - CheckMandatoryEntry(0x0008,0x0050,""); + CheckMandatoryEntry(0x0008,0x0050,"","SH"); // ----- Add Mandatory Entries if missing --- @@ -1610,7 +1743,7 @@ void FileHelper::CheckMandatoryElements() // keeping the same 'Study Instance UID' for various images // The user may add images to a 'Manufacturer Study', // adding new Series to an already existing Study - CheckMandatoryEntry(0x0020,0x000d,Util::CreateUniqueUID()); + CheckMandatoryEntry(0x0020,0x000d,Util::CreateUniqueUID(),"UI"); // 'Serie Instance UID' // Keep the value if exists @@ -1618,16 +1751,16 @@ void FileHelper::CheckMandatoryElements() // keeping the same 'Serie Instance UID' for various images // The user shouldn't add any image to a 'Manufacturer Serie' // but there is no way no to prevent him for doing that - CheckMandatoryEntry(0x0020,0x000e,Util::CreateUniqueUID()); + CheckMandatoryEntry(0x0020,0x000e,Util::CreateUniqueUID(),"UI"); // Study ID - CheckMandatoryEntry(0x0020,0x0010,""); + CheckMandatoryEntry(0x0020,0x0010,"","SH"); // Series Number - CheckMandatoryEntry(0x0020,0x0011,""); + CheckMandatoryEntry(0x0020,0x0011,"","IS"); // Instance Number - CheckMandatoryEntry(0x0020,0x0013,""); + CheckMandatoryEntry(0x0020,0x0013,"","IS"); // Patient Orientation // Can be computed from (0020|0037) : Image Orientation (Patient) @@ -1635,36 +1768,36 @@ void FileHelper::CheckMandatoryElements() std::string ori = o->GetOrientation ( FileInternal ); o->Delete(); if (ori != "\\" && ori != GDCM_UNFOUND) - CheckMandatoryEntry(0x0020,0x0020,ori); + CheckMandatoryEntry(0x0020,0x0020,ori,"CS"); else - CheckMandatoryEntry(0x0020,0x0020,""); + CheckMandatoryEntry(0x0020,0x0020,"","CS"); // Default Patient Position to HFS - CheckMandatoryEntry(0x0018,0x5100,"HFS"); + CheckMandatoryEntry(0x0018,0x5100,"HFS","CS"); // Modality : if missing we set it to 'OTher' - CheckMandatoryEntry(0x0008,0x0060,"OT"); + CheckMandatoryEntry(0x0008,0x0060,"OT","CS"); // Manufacturer : if missing we set it to 'GDCM Factory' - CheckMandatoryEntry(0x0008,0x0070,"GDCM Factory"); + CheckMandatoryEntry(0x0008,0x0070,"GDCM Factory","LO"); // Institution Name : if missing we set it to 'GDCM Hospital' - CheckMandatoryEntry(0x0008,0x0080,"GDCM Hospital"); + CheckMandatoryEntry(0x0008,0x0080,"GDCM Hospital","LO"); // Patient's Name : if missing, we set it to 'GDCM^Patient' - CheckMandatoryEntry(0x0010,0x0010,"GDCM^Patient"); + CheckMandatoryEntry(0x0010,0x0010,"GDCM^Patient","PN"); - // Patient ID - CheckMandatoryEntry(0x0010,0x0020,""); + // Patient ID : some clinical softwares *demand* it although it's a 'type 2' entry. + CheckMandatoryEntry(0x0010,0x0020,"gdcm ID","LO"); // Patient's Birth Date : 'type 2' entry -> must exist, value not mandatory - CheckMandatoryEntry(0x0010,0x0030,""); + CheckMandatoryEntry(0x0010,0x0030,"","DA"); // Patient's Sex :'type 2' entry -> must exist, value not mandatory - CheckMandatoryEntry(0x0010,0x0040,""); + CheckMandatoryEntry(0x0010,0x0040,"","CS"); // Referring Physician's Name :'type 2' entry -> must exist, value not mandatory - CheckMandatoryEntry(0x0008,0x0090,""); + CheckMandatoryEntry(0x0008,0x0090,"","PN"); /* // Deal with element 0x0000 (group length) of each group. @@ -1687,29 +1820,32 @@ void FileHelper::CheckMandatoryElements() } -void FileHelper::CheckMandatoryEntry(uint16_t group,uint16_t elem,std::string value) +void FileHelper::CheckMandatoryEntry(uint16_t group,uint16_t elem,std::string value,const VRKey &vr ) { DataEntry *entry = FileInternal->GetDataEntry(group,elem); if ( !entry ) { - entry = DataEntry::New(Global::GetDicts()->GetDefaultPubDict()->GetEntry(group,elem)); + //entry = DataEntry::New(Global::GetDicts()->GetDefaultPubDict()->GetEntry(group,elem)); + entry = DataEntry::New(group,elem,vr); entry->SetString(value); Archive->Push(entry); entry->Delete(); - } + } } -void FileHelper::SetMandatoryEntry(uint16_t group,uint16_t elem,std::string value) +/// \todo : what is it used for ? (FileHelper::SetMandatoryEntry) +void FileHelper::SetMandatoryEntry(uint16_t group,uint16_t elem,std::string value,const VRKey &vr) { - DataEntry *entry = DataEntry::New(Global::GetDicts()->GetDefaultPubDict()->GetEntry(group,elem)); + //DataEntry *entry = DataEntry::New(Global::GetDicts()->GetDefaultPubDict()->GetEntry(group,elem)); + DataEntry *entry = DataEntry::New(group,elem,vr); entry->SetString(value); Archive->Push(entry); entry->Delete(); } -void FileHelper::CopyMandatoryEntry(uint16_t group,uint16_t elem,std::string value) +void FileHelper::CopyMandatoryEntry(uint16_t group,uint16_t elem,std::string value,const VRKey &vr) { - DataEntry *entry = CopyDataEntry(group,elem); + DataEntry *entry = CopyDataEntry(group,elem,vr); entry->SetString(value); Archive->Push(entry); entry->Delete(); @@ -1847,3 +1983,155 @@ void FileHelper::Print(std::ostream &os, std::string const &) //----------------------------------------------------------------------------- } // end namespace gdcm + + +/* Probabely something to be added to use Rescale Slope/Intercept +Have a look ,at ITK code ! + +// Internal function to rescale pixel according to Rescale Slope/Intercept +template +void RescaleFunction(TBuffer* buffer, TSource *source, + double slope, double intercept, size_t size) +{ + size /= sizeof(TSource); + + if (slope != 1.0 && intercept != 0.0) + { + // Duff's device. Instead of this code: + // + // for(unsigned int i=0; i 0); + } + } + else if (slope == 1.0 && intercept != 0.0) + { + // Duff's device. Instead of this code: + // + // for(unsigned int i=0; i 0); + } + } + else if (slope != 1.0 && intercept == 0.0) + { + // Duff's device. Instead of this code: + // + // for(unsigned int i=0; i 0); + } + } + else + { + // Duff's device. Instead of this code: + // + // for(unsigned int i=0; i 0); + } + } + + +} + + +template +void RescaleFunction(ImageIOBase::IOComponentType bufferType, + void* buffer, TSource *source, + double slope, double intercept, size_t size) +{ + switch (bufferType) + { + case ImageIOBase::UCHAR: + RescaleFunction( (unsigned char *)buffer, source, slope, intercept, size); + break; + case ImageIOBase::CHAR: + RescaleFunction( (char *)buffer, source, slope, intercept, size); + break; + case ImageIOBase::USHORT: + RescaleFunction( (unsigned short *)buffer, source, slope, intercept,size); + break; + case ImageIOBase::SHORT: + RescaleFunction( (short *)buffer, source, slope, intercept, size); + break; + case ImageIOBase::UINT: + RescaleFunction( (unsigned int *)buffer, source, slope, intercept, size); + break; + case ImageIOBase::INT: + RescaleFunction( (int *)buffer, source, slope, intercept, size); + break; + case ImageIOBase::FLOAT: + RescaleFunction( (float *)buffer, source, slope, intercept, size); + break; + case ImageIOBase::DOUBLE: + RescaleFunction( (double *)buffer, source, slope, intercept, size); + break; + default: + ::itk::OStringStream message; + message << "itk::ERROR: GDCMImageIO: Unknown component type : " << bufferType; + ::itk::ExceptionObject e(__FILE__, __LINE__, message.str().c_str(),ITK_LOCATION); + throw e; + } +} +*/