X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFile.cxx;h=fda7c94f9011bc1967a208a8373d0c9372823b9e;hb=e022eedb7541761440c9f21343db626d918d4980;hp=95addb4f3072d6e519945e5d55bb7f37ac602d9d;hpb=ef2310f21de240bd96e0b1451ccd4a8695768b05;p=gdcm.git diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx index 95addb4f..fda7c94f 100644 --- a/src/gdcmFile.cxx +++ b/src/gdcmFile.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmFile.cxx,v $ Language: C++ - Date: $Date: 2005/02/02 17:47:56 $ - Version: $Revision: 1.209 $ + Date: $Date: 2005/02/10 10:12:16 $ + Version: $Revision: 1.220 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -23,7 +23,7 @@ // If not found (ACR_NEMA) we try Image Position (0020,0030) // If not found (ACR-NEMA), we consider Slice Location (0020,1041) // or Location (0020,0050) -// as the Z coordinate, +// as the Z coordinate, // 0. for all the coordinates if nothing is found // // --------------------------------------------------------------- @@ -35,6 +35,7 @@ #include "gdcmTS.h" #include "gdcmValEntry.h" #include "gdcmBinEntry.h" +#include "gdcmSeqEntry.h" #include "gdcmRLEFramesInfo.h" #include "gdcmJPEGFragmentsInfo.h" @@ -369,9 +370,9 @@ float File::GetXSpacing() float xspacing, yspacing; const std::string &strSpacing = GetEntryValue(0x0028,0x0030); - if ( strSpacing == GDCM_UNFOUND ) + if( strSpacing == GDCM_UNFOUND ) { - gdcmVerboseMacro( "Unfound Pixel Spacing (0028,0030)" ); + gdcmWarningMacro( "Unfound Pixel Spacing (0028,0030)" ); return 1.; } @@ -379,11 +380,12 @@ float File::GetXSpacing() if( ( nbValues = sscanf( strSpacing.c_str(), "%f\\%f", &yspacing, &xspacing)) != 2 ) { + // if no values, xspacing is set to 1.0 + if( nbValues == 0 ) + xspacing = 1.0; // if single value is found, xspacing is defaulted to yspacing - if ( nbValues == 1 ) - { + if( nbValues == 1 ) xspacing = yspacing; - } if ( xspacing == 0.0 ) xspacing = 1.0; @@ -398,7 +400,7 @@ float File::GetXSpacing() if ( xspacing == 0.) { - gdcmVerboseMacro("gdcmData/CT-MONO2-8-abdo.dcm problem"); + gdcmWarningMacro("gdcmData/CT-MONO2-8-abdo.dcm problem"); // seems to be a bug in the header ... nbValues = sscanf( strSpacing.c_str(), "%f\\0\\%f", &yspacing, &xspacing); gdcmAssertMacro( nbValues == 2 ); @@ -419,12 +421,16 @@ float File::GetYSpacing() if ( strSpacing == GDCM_UNFOUND ) { - gdcmVerboseMacro("Unfound Pixel Spacing (0028,0030)"); + gdcmWarningMacro("Unfound Pixel Spacing (0028,0030)"); return 1.; } // if sscanf cannot read any float value, it won't affect yspacing - sscanf( strSpacing.c_str(), "%f", &yspacing); + int nbValues = sscanf( strSpacing.c_str(), "%f", &yspacing); + + // if no values, xspacing is set to 1.0 + if( nbValues == 0 ) + yspacing = 1.0; if ( yspacing == 0.0 ) yspacing = 1.0; @@ -454,11 +460,11 @@ float File::GetZSpacing() if ( strSpacingBSlices == GDCM_UNFOUND ) { - gdcmVerboseMacro("Unfound Spacing Between Slices (0018,0088)"); + gdcmWarningMacro("Unfound Spacing Between Slices (0018,0088)"); const std::string &strSliceThickness = GetEntryValue(0x0018,0x0050); if ( strSliceThickness == GDCM_UNFOUND ) { - gdcmVerboseMacro("Unfound Slice Thickness (0018,0050)"); + gdcmWarningMacro("Unfound Slice Thickness (0018,0050)"); return 1.; } else @@ -487,11 +493,11 @@ float File::GetXOrigin() if ( strImPos == GDCM_UNFOUND ) { - gdcmVerboseMacro( "Unfound Image Position Patient (0020,0032)"); + gdcmWarningMacro( "Unfound Image Position Patient (0020,0032)"); strImPos = GetEntryValue(0x0020,0x0030); // For ACR-NEMA images if ( strImPos == GDCM_UNFOUND ) { - gdcmVerboseMacro( "Unfound Image Position (RET) (0020,0030)"); + gdcmWarningMacro( "Unfound Image Position (RET) (0020,0030)"); return 0.; } } @@ -517,11 +523,11 @@ float File::GetYOrigin() if ( strImPos == GDCM_UNFOUND) { - gdcmVerboseMacro( "Unfound Image Position Patient (0020,0032)"); + gdcmWarningMacro( "Unfound Image Position Patient (0020,0032)"); strImPos = GetEntryValue(0x0020,0x0030); // For ACR-NEMA images if ( strImPos == GDCM_UNFOUND ) { - gdcmVerboseMacro( "Unfound Image Position (RET) (0020,0030)"); + gdcmWarningMacro( "Unfound Image Position (RET) (0020,0030)"); return 0.; } } @@ -551,7 +557,7 @@ float File::GetZOrigin() { if( sscanf( strImPos.c_str(), "%f\\%f\\%f", &xImPos, &yImPos, &zImPos) != 3) { - gdcmVerboseMacro( "Wrong Image Position Patient (0020,0032)"); + gdcmWarningMacro( "Wrong Image Position Patient (0020,0032)"); return 0.; // bug in the element 0x0020,0x0032 } else @@ -566,7 +572,7 @@ float File::GetZOrigin() if( sscanf( strImPos.c_str(), "%f\\%f\\%f", &xImPos, &yImPos, &zImPos ) != 3 ) { - gdcmVerboseMacro( "Wrong Image Position (RET) (0020,0030)"); + gdcmWarningMacro( "Wrong Image Position (RET) (0020,0030)"); return 0.; // bug in the element 0x0020,0x0032 } else @@ -580,7 +586,7 @@ float File::GetZOrigin() { if( sscanf( strSliceLocation.c_str(), "%f", &zImPos) != 1) { - gdcmVerboseMacro( "Wrong Slice Location (0020,1041)"); + gdcmWarningMacro( "Wrong Slice Location (0020,1041)"); return 0.; // bug in the element 0x0020,0x1041 } else @@ -588,14 +594,14 @@ float File::GetZOrigin() return zImPos; } } - gdcmVerboseMacro( "Unfound Slice Location (0020,1041)"); + gdcmWarningMacro( "Unfound Slice Location (0020,1041)"); std::string strLocation = GetEntryValue(0x0020,0x0050); if ( strLocation != GDCM_UNFOUND ) { if( sscanf( strLocation.c_str(), "%f", &zImPos) != 1) { - gdcmVerboseMacro( "Wrong Location (0020,0050)"); + gdcmWarningMacro( "Wrong Location (0020,0050)"); return 0.; // bug in the element 0x0020,0x0050 } else @@ -603,7 +609,7 @@ float File::GetZOrigin() return zImPos; } } - gdcmVerboseMacro( "Unfound Location (0020,0050)"); + gdcmWarningMacro( "Unfound Location (0020,0050)"); return 0.; // Hopeless } @@ -626,7 +632,7 @@ void File::GetImageOrientationPatient( float iop[6] ) if( sscanf( strImOriPat.c_str(), "%f\\%f\\%f\\%f\\%f\\%f", &iop[0], &iop[1], &iop[2], &iop[3], &iop[4], &iop[5]) != 6 ) { - gdcmVerboseMacro( "Wrong Image Orientation Patient (0020,0037). Less than 6 values were found." ); + gdcmWarningMacro( "Wrong Image Orientation Patient (0020,0037). Less than 6 values were found." ); } } //For ACR-NEMA @@ -636,14 +642,14 @@ void File::GetImageOrientationPatient( float iop[6] ) if( sscanf( strImOriPat.c_str(), "%f\\%f\\%f\\%f\\%f\\%f", &iop[0], &iop[1], &iop[2], &iop[3], &iop[4], &iop[5]) != 6 ) { - gdcmVerboseMacro( "wrong Image Orientation Patient (0020,0035). Less than 6 values were found." ); + gdcmWarningMacro( "wrong Image Orientation Patient (0020,0035). Less than 6 values were found." ); } } } /** * \brief Retrieve the number of Bits Stored (actually used) - * (as opposite to number of Bits Allocated) + * (as opposed to number of Bits Allocated) * @return The encountered number of Bits Stored, 0 by default. * 0 means the file is NOT USABLE. The caller has to check it ! */ @@ -652,7 +658,7 @@ int File::GetBitsStored() std::string strSize = GetEntryValue( 0x0028, 0x0101 ); if ( strSize == GDCM_UNFOUND ) { - gdcmVerboseMacro("(0028,0101) is supposed to be mandatory"); + gdcmWarningMacro("(0028,0101) is supposed to be mandatory"); return 0; // It's supposed to be mandatory // the caller will have to check } @@ -670,7 +676,7 @@ int File::GetBitsAllocated() std::string strSize = GetEntryValue(0x0028,0x0100); if ( strSize == GDCM_UNFOUND ) { - gdcmVerboseMacro( "(0028,0100) is supposed to be mandatory"); + gdcmWarningMacro( "(0028,0100) is supposed to be mandatory"); return 0; // It's supposed to be mandatory // the caller will have to check } @@ -688,7 +694,7 @@ int File::GetHighBitPosition() std::string strSize = GetEntryValue( 0x0028, 0x0102 ); if ( strSize == GDCM_UNFOUND ) { - gdcmVerboseMacro( "(0028,0102) is supposed to be mandatory"); + gdcmWarningMacro( "(0028,0102) is supposed to be mandatory"); return 0; } return atoi( strSize.c_str() ); @@ -705,7 +711,7 @@ int File::GetSamplesPerPixel() const std::string &strSize = GetEntryValue(0x0028,0x0002); if ( strSize == GDCM_UNFOUND ) { - gdcmVerboseMacro( "(0028,0002) is supposed to be mandatory"); + gdcmWarningMacro( "(0028,0002) is supposed to be mandatory"); return 1; // Well, it's supposed to be mandatory ... // but sometimes it's missing : *we* assume Gray pixels } @@ -722,7 +728,7 @@ int File::GetPlanarConfiguration() std::string strSize = GetEntryValue(0x0028,0x0006); if ( strSize == GDCM_UNFOUND ) { - gdcmVerboseMacro( "Not found : Planar Configuration (0028,0006)"); + gdcmWarningMacro( "Not found : Planar Configuration (0028,0006)"); return 0; } return atoi( strSize.c_str() ); @@ -757,7 +763,7 @@ int File::GetPixelSize() { return 8; } - gdcmVerboseMacro( "Unknown pixel type"); + gdcmWarningMacro( "Unknown pixel type"); return 0; } @@ -780,7 +786,7 @@ std::string File::GetPixelType() std::string bitsAlloc = GetEntryValue(0x0028, 0x0100); // Bits Allocated if ( bitsAlloc == GDCM_UNFOUND ) { - gdcmVerboseMacro( "Missing Bits Allocated (0028,0100)"); + gdcmWarningMacro( "Missing Bits Allocated (0028,0100)"); bitsAlloc = "16"; // default and arbitrary value, not to polute the output } @@ -803,7 +809,7 @@ std::string File::GetPixelType() if (sign == GDCM_UNFOUND ) { - gdcmVerboseMacro( "Missing Pixel Representation (0028,0103)"); + gdcmWarningMacro( "Missing Pixel Representation (0028,0103)"); sign = "U"; // default and arbitrary value, not to polute the output } else if ( sign == "0" ) @@ -828,7 +834,7 @@ bool File::IsSignedPixelData() std::string strSize = GetEntryValue( 0x0028, 0x0103 ); if ( strSize == GDCM_UNFOUND ) { - gdcmVerboseMacro( "(0028,0103) is supposed to be mandatory"); + gdcmWarningMacro( "(0028,0103) is supposed to be mandatory"); return false; } int sign = atoi( strSize.c_str() ); @@ -854,7 +860,7 @@ bool File::IsMonochrome() } if ( PhotometricInterp == GDCM_UNFOUND ) { - gdcmVerboseMacro( "Not found : Photometric Interpretation (0028,0004)"); + gdcmWarningMacro( "Not found : Photometric Interpretation (0028,0004)"); } return false; } @@ -873,7 +879,7 @@ bool File::IsPaletteColor() } if ( PhotometricInterp == GDCM_UNFOUND ) { - gdcmVerboseMacro( "Not found : Palette color (0028,0004)"); + gdcmWarningMacro( "Not found : Palette color (0028,0004)"); } return false; } @@ -892,7 +898,7 @@ bool File::IsYBRFull() } if ( PhotometricInterp == GDCM_UNFOUND ) { - gdcmVerboseMacro( "Not found : YBR Full (0028,0004)"); + gdcmWarningMacro( "Not found : YBR Full (0028,0004)"); } return false; } @@ -990,7 +996,7 @@ float File::GetRescaleIntercept() if( sscanf( strRescInter.c_str(), "%f", &resInter) != 1 ) { // bug in the element 0x0028,0x1052 - gdcmVerboseMacro( "Rescale Intercept (0028,1052) is empty." ); + gdcmWarningMacro( "Rescale Intercept (0028,1052) is empty." ); } } @@ -1011,7 +1017,7 @@ float File::GetRescaleSlope() if( sscanf( strRescSlope.c_str(), "%f", &resSlope) != 1) { // bug in the element 0x0028,0x1053 - gdcmVerboseMacro( "Rescale Slope (0028,1053) is empty."); + gdcmWarningMacro( "Rescale Slope (0028,1053) is empty."); } } @@ -1095,18 +1101,15 @@ int File::GetNumberOfScalarComponentsRaw() */ size_t File::GetPixelOffset() { - DocEntry* pxlElement = GetDocEntry(GrPixel,NumPixel); + DocEntry *pxlElement = GetDocEntry(GrPixel, NumPixel); if ( pxlElement ) { return pxlElement->GetOffset(); } else { -#ifdef GDCM_DEBUG - std::cout << "Big trouble : Pixel Element (" - << std::hex << GrPixel<<","<< NumPixel<< ") NOT found" - << std::endl; -#endif //GDCM_DEBUG + gdcmDebugMacro( "Big trouble : Pixel Element (" + << std::hex << GrPixel<<","<< NumPixel<< ") NOT found" ); return 0; } } @@ -1120,50 +1123,138 @@ size_t File::GetPixelOffset() */ size_t File::GetPixelAreaLength() { - DocEntry* pxlElement = GetDocEntry(GrPixel,NumPixel); + DocEntry *pxlElement = GetDocEntry(GrPixel, NumPixel); if ( pxlElement ) { return pxlElement->GetLength(); } else { -#ifdef GDCM_DEBUG - std::cout << "Big trouble : Pixel Element (" - << std::hex << GrPixel<<","<< NumPixel<< ") NOT found" - << std::endl; -#endif //GDCM_DEBUG + gdcmDebugMacro( "Big trouble : Pixel Element (" + << std::hex << GrPixel<<","<< NumPixel<< ") NOT found" ); return 0; } } /** - * \brief anonymize a File (removes Patient's personal info) - * (read the code to see which ones ...) + * \brief Adds the characteristics of a new element we want to anonymize + * */ -bool File::AnonymizeFile() +void File::AddAnonymizeElement (uint16_t group, uint16_t elem, + std::string const &value) + +{ + Element el; + el.Group = group; + el.Elem = elem; + el.Value = value; + AnonymizeList.push_back(el); +} + +/** + * \brief Overwrites in the file the values of the DicomElements + * held in the list + */ +void File::AnonymizeNoLoad() { - // If exist, replace by spaces - SetValEntry (" ",0x0010, 0x2154); // Telephone - SetValEntry (" ",0x0010, 0x1040); // Adress - SetValEntry (" ",0x0010, 0x0020); // Patient ID + std::fstream *fp = new std::fstream(Filename.c_str(), + std::ios::in | std::ios::out | std::ios::binary); + + // TODO : FIXME + // how to white out disk space if longer than 50 ? + char spaces[50] = " "; + + gdcm::DocEntry *d; + uint32_t offset; + uint32_t lgth; + uint32_t lgtToWrite; + for (ListElements::iterator it = AnonymizeList.begin(); + it != AnonymizeList.end(); + ++it) + { + d = GetDocEntry( (*it).Group, (*it).Elem); - DocEntry* patientNameHE = GetDocEntry (0x0010, 0x0010); - - if ( patientNameHE ) // we replace it by Study Instance UID (why not) - { - std::string studyInstanceUID = GetEntryValue (0x0020, 0x000d); - if ( studyInstanceUID != GDCM_UNFOUND ) + if ( d == NULL) + continue; + + if ( dynamic_cast(d) + || dynamic_cast(d) ) + continue; + + offset = d->GetOffset(); + lgth = d->GetLength(); + fp->seekp( offset, std::ios::beg ); + + if ( (*it).Value == "" ) { - InsertValEntry(studyInstanceUID, 0x0010, 0x0010); + lgtToWrite = lgth > 50 ? 50 : lgth; + fp->write( spaces, lgtToWrite ); } else { - InsertValEntry("anonymised", 0x0010, 0x0010); + // TODO : FIXME + // how to white out disk space if longer than 50 ? + (*it).Value = (*it).Value + spaces; + lgtToWrite = lgth > (*it).Value.length() ? (*it).Value.length() : lgth; + fp->write( (char *)(*it).Value.c_str(), lgtToWrite ); + } } + fp->close(); + delete fp; +} - // Just for fun :-( - // (if any) remove or replace all the stuff that contains a Date +/** + * \brief anonymize a File (removes Patient's personal info passed with + * AddAnonymizeElement() + */ +bool File::AnonymizeFile() +{ + // If Anonymisation list is empty, let's perform some basic anonymisation + if ( AnonymizeList.begin() == AnonymizeList.end() ) + { + // If exist, replace by spaces + SetValEntry (" ",0x0010, 0x2154); // Telephone + SetValEntry (" ",0x0010, 0x1040); // Adress + SetValEntry (" ",0x0010, 0x0020); // Patient ID + + DocEntry* patientNameHE = GetDocEntry (0x0010, 0x0010); + + if ( patientNameHE ) // we replace it by Study Instance UID (why not ?) + { + std::string studyInstanceUID = GetEntryValue (0x0020, 0x000d); + if ( studyInstanceUID != GDCM_UNFOUND ) + { + SetValEntry(studyInstanceUID, 0x0010, 0x0010); + } + else + { + SetValEntry("anonymised", 0x0010, 0x0010); + } + } + } + else + { + gdcm::DocEntry *d; + for (ListElements::iterator it = AnonymizeList.begin(); + it != AnonymizeList.end(); + ++it) + { + d = GetDocEntry( (*it).Group, (*it).Elem); + + if ( d == NULL) + continue; + + if ( dynamic_cast(d) + || dynamic_cast(d) ) + continue; + + SetValEntry ((*it).Value, (*it).Group, (*it).Elem); + } +} + + // In order to make definitively impossible any further identification + // remove or replace all the stuff that contains a Date //0008 0012 DA ID Instance Creation Date //0008 0020 DA ID Study Date @@ -1231,7 +1322,7 @@ bool File::Write(std::string fileName, FileType filetype) std::ios::out | std::ios::binary); if (*fp == NULL) { - gdcmVerboseMacro("Failed to open (write) File: " << fileName.c_str()); + gdcmWarningMacro("Failed to open (write) File: " << fileName.c_str()); return false; } @@ -1301,40 +1392,8 @@ bool File::Write(std::string fileName, FileType filetype) } } - -#ifdef GDCM_WORDS_BIGENDIAN - // Super Super hack that will make gdcm a BOMB ! but should - // Fix temporarily the dashboard - BinEntry *b = GetBinEntry(GrPixel,NumPixel); - if ( GetPixelSize() == 16 ) - { - uint16_t *im16 = (uint16_t *)b->GetBinArea(); - int lgr = b->GetLength(); - for( int i = 0; i < lgr / 2; i++ ) - { - im16[i]= (im16[i] >> 8) | (im16[i] << 8 ); - } - } -#endif //GDCM_WORDS_BIGENDIAN - - Document::WriteContent(fp, filetype); - -#ifdef GDCM_WORDS_BIGENDIAN - // Flip back the pixel ... I told you this is a hack - if ( GetPixelSize() == 16 ) - { - uint16_t *im16 = (uint16_t*)b->GetBinArea(); - int lgr = b->GetLength(); - for( int i = 0; i < lgr / 2; i++ ) - { - im16[i]= (im16[i] >> 8) | (im16[i] << 8 ); - } - } -#endif //GDCM_WORDS_BIGENDIAN - - fp->close(); delete fp; @@ -1351,13 +1410,6 @@ bool File::Write(std::string fileName, FileType filetype) */ void File::InitializeDefaultFile() { - typedef struct - { - const char *value; - uint16_t group; - uint16_t elem; - } DICOM_DEFAULT_VALUE; - std::string date = Util::GetCurrentDate(); std::string time = Util::GetCurrentTime(); std::string uid = Util::CreateUniqueUID(); @@ -1367,56 +1419,72 @@ void File::InitializeDefaultFile() std::string uidStudy = Util::CreateUniqueUID(); std::string uidSerie = Util::CreateUniqueUID(); - static DICOM_DEFAULT_VALUE defaultvalue[] = { - { "146 ", 0x0002, 0x0000}, // Meta Element Group Length // FIXME: how to recompute ? - { "1.2.840.10008.5.1.4.1.1.2", 0x0002, 0x0002}, // Media Storage SOP Class UID (CT Image Storage) - { uidClass.c_str(), 0x0002, 0x0003}, // Media Storage SOP Instance UID - { "1.2.840.10008.1.2.1 ", 0x0002, 0x0010}, // Transfer Syntax UID (Explicit VR Little Endian) - { uidClass.c_str(), 0x0002, 0x0012}, // META Implementation Class UID - { "GDCM", 0x0002, 0x0016}, // Source Application Entity Title - - { date.c_str(), 0x0008, 0x0012}, // Instance Creation Date - { time.c_str(), 0x0008, 0x0013}, // Instance Creation Time - { "1.2.840.10008.5.1.4.1.1.2", 0x0008, 0x0016}, // SOP Class UID - { uidInst.c_str(), 0x0008, 0x0018}, // SOP Instance UID - { "CT", 0x0008, 0x0060}, // Modality - { "GDCM", 0x0008, 0x0070}, // Manufacturer - { "GDCM", 0x0008, 0x0080}, // Institution Name - { "http://www-creatis.insa-lyon.fr/Public/Gdcm", 0x0008, 0x0081}, // Institution Address - - { "GDCM", 0x0010, 0x0010}, // Patient's Name - { "GDCMID", 0x0010, 0x0020}, // Patient ID - - { uidStudy.c_str(), 0x0020, 0x000d}, // Study Instance UID - { uidSerie.c_str(), 0x0020, 0x000e}, // Series Instance UID - { "1", 0x0020, 0x0010}, // StudyID - { "1", 0x0020, 0x0011}, // SeriesNumber - - { "1", 0x0028, 0x0002}, // Samples per pixel 1 or 3 - { "MONOCHROME1", 0x0028, 0x0004}, // photochromatic interpretation - { "0", 0x0028, 0x0010}, // nbRows - { "0", 0x0028, 0x0011}, // nbCols - { "8", 0x0028, 0x0100}, // BitsAllocated 8 or 12 or 16 - { "8", 0x0028, 0x0101}, // BitsStored <= BitsAllocated - { "7", 0x0028, 0x0102}, // HighBit <= BitsAllocated - 1 - { "0", 0x0028, 0x0103}, // Pixel Representation 0(unsigned) or 1(signed) - { 0, 0, 0 } - }; + // Meta Element Group Length + InsertValEntry("146 ", 0x0002, 0x0000); + // Media Storage SOP Class UID (CT Image Storage) + InsertValEntry("1.2.840.10008.5.1.4.1.1.2", 0x0002, 0x0002); + // Media Storage SOP Instance UID + InsertValEntry(uidMedia.c_str(), 0x0002, 0x0003); + // Transfer Syntax UID (Explicit VR Little Endian) + InsertValEntry("1.2.840.10008.1.2.1 ", 0x0002, 0x0010); + // META Implementation Class UID + InsertValEntry(uidClass.c_str(), 0x0002, 0x0012); + // Source Application Entity Title + InsertValEntry("GDCM", 0x0002, 0x0016); + + // Instance Creation Date + InsertValEntry(date.c_str(), 0x0008, 0x0012); + // Instance Creation Time + InsertValEntry(time.c_str(), 0x0008, 0x0013); + // SOP Class UID + InsertValEntry("1.2.840.10008.5.1.4.1.1.2", 0x0008, 0x0016); + // SOP Instance UID + InsertValEntry(uidInst.c_str(), 0x0008, 0x0018); + // Modality + InsertValEntry("CT", 0x0008, 0x0060); + // Manufacturer + InsertValEntry("GDCM", 0x0008, 0x0070); + // Institution Name + InsertValEntry("GDCM", 0x0008, 0x0080); + // Institution Address + InsertValEntry("http://www-creatis.insa-lyon.fr/Public/Gdcm", 0x0008, 0x0081); + + // Patient's Name + InsertValEntry("GDCM", 0x0010, 0x0010); + // Patient ID + InsertValEntry("GDCMID", 0x0010, 0x0020); + + // Study Instance UID + InsertValEntry(uidStudy.c_str(), 0x0020, 0x000d); + // Series Instance UID + InsertValEntry(uidSerie.c_str(), 0x0020, 0x000e); + // StudyID + InsertValEntry("1", 0x0020, 0x0010); + // SeriesNumber + InsertValEntry("1", 0x0020, 0x0011); + + // Samples per pixel 1 or 3 + InsertValEntry("1", 0x0028, 0x0002); + // photochromatic interpretation + InsertValEntry("MONOCHROME1", 0x0028, 0x0004); + // nbRows + InsertValEntry("0", 0x0028, 0x0010); + // nbCols + InsertValEntry("0", 0x0028, 0x0011); + // BitsAllocated 8 or 12 or 16 + InsertValEntry("8", 0x0028, 0x0100); + // BitsStored <= BitsAllocated + InsertValEntry("8", 0x0028, 0x0101); + // HighBit <= BitsAllocated - 1 + InsertValEntry("7", 0x0028, 0x0102); + // Pixel Representation 0(unsigned) or 1(signed) + InsertValEntry("0", 0x0028, 0x0103); // default value // Special case this is the image (not a string) GrPixel = 0x7fe0; NumPixel = 0x0010; InsertBinEntry(0, 0, GrPixel, NumPixel); - - // All remaining strings: - unsigned int i = 0; - DICOM_DEFAULT_VALUE current = defaultvalue[i]; - while( current.value ) - { - InsertValEntry(current.value, current.group, current.elem); - current = defaultvalue[++i]; - } } //----------------------------------------------------------------------------- @@ -1469,7 +1537,7 @@ void File::ComputeRLEInfo() if ( nbRleSegments > 16 ) { // There should be at most 15 segments (refer to RLEFrame class) - gdcmVerboseMacro( "Too many segments."); + gdcmWarningMacro( "Too many segments."); } uint32_t rleSegmentOffsetTable[16]; @@ -1512,7 +1580,7 @@ void File::ComputeRLEInfo() // Delimiter Item': if ( !ReadTag(0xfffe, 0xe0dd) ) { - gdcmVerboseMacro( "No sequence delimiter item at end of RLE item sequence"); + gdcmWarningMacro( "No sequence delimiter item at end of RLE item sequence"); } } @@ -1553,7 +1621,7 @@ void File::ComputeJPEGFragmentInfo() // Delimiter Item': if ( !ReadTag(0xfffe, 0xe0dd) ) { - gdcmVerboseMacro( "No sequence delimiter item at end of JPEG item sequence"); + gdcmWarningMacro( "No sequence delimiter item at end of JPEG item sequence"); } } @@ -1575,7 +1643,7 @@ bool File::ReadTag(uint16_t testGroup, uint16_t testElement) long positionOnEntry = Fp->tellg(); long currentPosition = Fp->tellg(); // On debugging purposes - //// Read the Item Tag group and element, and make + // Read the Item Tag group and element, and make // sure they are what we expected: uint16_t itemTagGroup; uint16_t itemTagElement; @@ -1591,7 +1659,7 @@ bool File::ReadTag(uint16_t testGroup, uint16_t testElement) } if ( itemTagGroup != testGroup || itemTagElement != testElement ) { - gdcmVerboseMacro( "Wrong Item Tag found:" + gdcmWarningMacro( "Wrong Item Tag found:" << " We should have found tag (" << std::hex << testGroup << "," << testElement << ")" << std::endl << " but instead we encountered tag (" @@ -1631,7 +1699,7 @@ uint32_t File::ReadTagLength(uint16_t testGroup, uint16_t testElement) long currentPosition = Fp->tellg(); uint32_t itemLength = ReadInt32(); { - gdcmVerboseMacro( "Basic Item Length is: " + gdcmWarningMacro( "Basic Item Length is: " << itemLength << std::endl << " at address: " << std::hex << (unsigned int)currentPosition); } @@ -1663,7 +1731,7 @@ void File::ReadAndSkipEncapsulatedBasicOffsetTable() { uint32_t individualLength = str2num( &basicOffsetTableItemValue[i], uint32_t); - gdcmVerboseMacro( "Read one length: " << + gdcmWarningMacro( "Read one length: " << std::hex << individualLength ); } #endif //GDCM_DEBUG