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 20:53:23 $
+ Version: $Revision: 1.223 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
// 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
//
// ---------------------------------------------------------------
#include "gdcmTS.h"
#include "gdcmValEntry.h"
#include "gdcmBinEntry.h"
+#include "gdcmSeqEntry.h"
#include "gdcmRLEFramesInfo.h"
#include "gdcmJPEGFragmentsInfo.h"
*/
float File::GetXSpacing()
{
- float xspacing, yspacing;
+ float xspacing = 1.0;
+ float yspacing = 1.0;
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.;
}
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;
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 );
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;
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
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.;
}
}
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.;
}
}
{
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
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
{
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
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
return zImPos;
}
}
- gdcmVerboseMacro( "Unfound Location (0020,0050)");
+ gdcmWarningMacro( "Unfound Location (0020,0050)");
return 0.; // Hopeless
}
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
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 !
*/
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
}
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
}
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() );
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
}
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() );
{
return 8;
}
- gdcmVerboseMacro( "Unknown pixel type");
+ gdcmWarningMacro( "Unknown pixel type");
return 0;
}
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
}
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" )
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() );
}
if ( PhotometricInterp == GDCM_UNFOUND )
{
- gdcmVerboseMacro( "Not found : Photometric Interpretation (0028,0004)");
+ gdcmWarningMacro( "Not found : Photometric Interpretation (0028,0004)");
}
return false;
}
}
if ( PhotometricInterp == GDCM_UNFOUND )
{
- gdcmVerboseMacro( "Not found : Palette color (0028,0004)");
+ gdcmWarningMacro( "Not found : Palette color (0028,0004)");
}
return false;
}
}
if ( PhotometricInterp == GDCM_UNFOUND )
{
- gdcmVerboseMacro( "Not found : YBR Full (0028,0004)");
+ gdcmWarningMacro( "Not found : YBR Full (0028,0004)");
}
return false;
}
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." );
}
}
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.");
}
}
*/
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;
}
}
*/
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 ?
+
+
+ gdcm::DocEntry *d;
+ uint32_t offset;
+ uint32_t lgth;
+ uint32_t valLgth = 0;
+ std::string *spaces;
+ 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<BinEntry *>(d)
+ || dynamic_cast<SeqEntry *>(d) )
+ continue;
+
+ offset = d->GetOffset();
+ lgth = d->GetLength();
+ if (valLgth < lgth)
{
- InsertValEntry(studyInstanceUID, 0x0010, 0x0010);
+ spaces = new std::string( lgth-valLgth, ' ');
+ (*it).Value = (*it).Value + *spaces;
+ delete spaces;
}
- else
+ fp->seekp( offset, std::ios::beg );
+ fp->write( (*it).Value.c_str(), lgth );
+
+ }
+ fp->close();
+ delete fp;
+}
+
+/**
+ * \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 anonymization
+ 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 ?)
{
- InsertValEntry("anonymised", 0x0010, 0x0010);
+ 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);
- // Just for fun :-(
- // (if any) remove or replace all the stuff that contains a Date
+ if ( d == NULL)
+ continue;
+
+ if ( dynamic_cast<BinEntry *>(d)
+ || dynamic_cast<SeqEntry *>(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
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;
}
}
}
-
-#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;
*/
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();
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];
- }
}
//-----------------------------------------------------------------------------
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];
// 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");
}
}
// 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");
}
}
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;
}
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 ("
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);
}
{
uint32_t individualLength = str2num( &basicOffsetTableItemValue[i],
uint32_t);
- gdcmVerboseMacro( "Read one length: " <<
+ gdcmWarningMacro( "Read one length: " <<
std::hex << individualLength );
}
#endif //GDCM_DEBUG
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff