Program: gdcm
Module: $RCSfile: gdcmDocument.cxx,v $
Language: C++
- Date: $Date: 2005/01/24 14:14:11 $
- Version: $Revision: 1.205 $
+ Date: $Date: 2005/01/28 09:31:51 $
+ Version: $Revision: 1.215 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmDebug.h"
#include "gdcmTS.h"
#include "gdcmDictSet.h"
-#include "gdcmRLEFramesInfo.h"
-#include "gdcmJPEGFragmentsInfo.h"
#include "gdcmDocEntrySet.h"
#include "gdcmSQItem.h"
*/
Document::Document( std::string const &filename ) : ElementSet(-1)
{
- RLEInfo = NULL;
- JPEGInfo = NULL;
-
SetMaxSizeLoadEntry(MAX_SIZE_LOAD_ELEMENT_VALUE);
Filename = filename;
Initialize();
// Load 'non string' values
- std::string PhotometricInterpretation = GetEntry(0x0028,0x0004);
+ std::string PhotometricInterpretation = GetEntryValue(0x0028,0x0004);
if( PhotometricInterpretation == "PALETTE COLOR " )
{
LoadEntryBinArea(0x0028,0x1200); // gray LUT
// we switch lineNumber and columnNumber
//
std::string RecCode;
- RecCode = GetEntry(0x0008, 0x0010); // recognition code (RET)
+ RecCode = GetEntryValue(0x0008, 0x0010); // recognition code (RET)
if (RecCode == "ACRNEMA_LIBIDO_1.1" ||
RecCode == "CANRME_AILIBOD1_1." ) // for brain-damaged softwares
// with "little-endian strings"
{
Filetype = ACR_LIBIDO;
- std::string rows = GetEntry(0x0028, 0x0010);
- std::string columns = GetEntry(0x0028, 0x0011);
- SetEntry(columns, 0x0028, 0x0010);
- SetEntry(rows , 0x0028, 0x0011);
+ std::string rows = GetEntryValue(0x0028, 0x0010);
+ std::string columns = GetEntryValue(0x0028, 0x0011);
+ SetValEntry(columns, 0x0028, 0x0010);
+ SetValEntry(rows , 0x0028, 0x0011);
}
// ----------------- End of ACR-LibIDO kludge ------------------
}
*/
Document::Document() : ElementSet(-1)
{
- RLEInfo = NULL;
- JPEGInfo = NULL;
-
Fp = 0;
SetMaxSizeLoadEntry(MAX_SIZE_LOAD_ELEMENT_VALUE);
{
RefPubDict = NULL;
RefShaDict = NULL;
-
- if( RLEInfo )
- delete RLEInfo;
- if( JPEGInfo )
- delete JPEGInfo;
}
//-----------------------------------------------------------------------------
/**
* \brief Prints The Dict Entries of THE public Dicom Dictionary
+ * @param os ostream to print to
* @return
*/
void Document::PrintPubDict(std::ostream &os)
/**
* \brief Prints The Dict Entries of THE shadow Dicom Dictionary
+ * @param os ostream to print to
* @return
*/
void Document::PrintShaDict(std::ostream &os)
return false;
}
- //if( TagHT.empty() )
if ( IsEmpty() )
{
gdcmVerboseMacro( "No tag in internal hash table.");
*/
std::ifstream *Document::OpenFile()
{
-
HasDCMPreamble = false;
if (Filename.length() == 0)
{
if(Fp)
{
gdcmVerboseMacro( "File already open: " << Filename.c_str());
+ CloseFile();
}
Fp = new std::ifstream(Filename.c_str(), std::ios::in | std::ios::binary);
delete Fp;
Fp = 0;
}
-
return true; //FIXME how do we detect a non-closed ifstream ?
}
* @param fp file pointer on an already open file (actually: Output File Stream)
* @param filetype Type of the File to be written
* (ACR-NEMA, ExplicitVR, ImplicitVR)
- * \return Always true.
+ * @return Always true.
*/
void Document::WriteContent(std::ofstream *fp, FileType filetype)
{
- /// \todo move the following lines (and a lot of others, to be written)
- /// to a future function CheckAndCorrectHeader
- /// (necessary if user wants to write a DICOM V3 file
- /// starting from an ACR-NEMA (V2) Header
+ // \TODO move the following lines (and a lot of others, to be written)
+ // to a future function CheckAndCorrectHeader
+
+ // (necessary if user wants to write a DICOM V3 file
+ // starting from an ACR-NEMA (V2) Header
if ( filetype == ImplicitVR || filetype == ExplicitVR )
{
fp->write("DICM", 4);
}
-/**
+/*
* \todo rewrite later, if really usefull
* - 'Group Length' element is optional in DICOM
* - but un-updated odd groups lengthes can causes pb
ElementSet::WriteContent(fp, filetype); // This one is recursive
}
-/**
- * \brief Modifies the value of a given Doc Entry (Dicom Element)
- * when it exists. Create it with the given value when unexistant.
- * @param value (string) Value to be set
- * @param group Group number of the Entry
- * @param elem Element number of the Entry
- * @param vr V(alue) R(epresentation) of the Entry -if private Entry-
- * \return pointer to the modified/created Header Entry (NULL when creation
- * failed).
- */
-ValEntry *Document::ReplaceOrCreate(std::string const &value,
- uint16_t group,
- uint16_t elem,
- TagName const &vr )
-{
- ValEntry *valEntry = 0;
- DocEntry *currentEntry = GetDocEntry( group, elem);
-
- if (currentEntry)
- {
- valEntry = dynamic_cast< ValEntry* >(currentEntry);
-
- // Verify the VR
- if( valEntry )
- if( valEntry->GetVR()!=vr )
- valEntry=NULL;
-
- // if currentEntry doesn't correspond to the requested valEntry
- if( !valEntry)
- {
- if (!RemoveEntry(currentEntry))
- {
- gdcmVerboseMacro( "Removal of previous DocEntry failed.");
-
- return NULL;
- }
- }
- }
-
- // Create a new valEntry if necessary
- if (!valEntry)
- {
- valEntry = NewValEntry(group, elem, vr);
-
- if ( !AddEntry(valEntry))
- {
- gdcmVerboseMacro("AddEntry failed although this is a creation.");
-
- delete valEntry;
- return NULL;
- }
- }
-
- // Set the binEntry value
- SetEntry(value, valEntry);
- return valEntry;
-}
-
-/*
- * \brief Modifies the value of a given Header Entry (Dicom Element)
- * when it exists. Create it with the given value when unexistant.
- * A copy of the binArea is made to be kept in the Document.
- * @param binArea (binary) value to be set
- * @param group Group number of the Entry
- * @param elem Element number of the Entry
- * @param vr V(alue) R(epresentation) of the Entry -if private Entry-
- * \return pointer to the modified/created Header Entry (NULL when creation
- * failed).
- */
-BinEntry *Document::ReplaceOrCreate(uint8_t *binArea,
- int lgth,
- uint16_t group,
- uint16_t elem,
- TagName const &vr )
-{
- BinEntry *binEntry = 0;
- DocEntry *currentEntry = GetDocEntry( group, elem);
-
- // Verify the currentEntry
- if (currentEntry)
- {
- binEntry = dynamic_cast< BinEntry* >(currentEntry);
-
- // Verify the VR
- if( binEntry )
- if( binEntry->GetVR()!=vr )
- binEntry=NULL;
-
- // if currentEntry doesn't correspond to the requested valEntry
- if( !binEntry)
- {
- if (!RemoveEntry(currentEntry))
- {
- gdcmVerboseMacro( "Removal of previous DocEntry failed.");
-
- return NULL;
- }
- }
- }
-
- // Create a new binEntry if necessary
- if (!binEntry)
- {
- binEntry = NewBinEntry(group, elem, vr);
-
- if ( !AddEntry(binEntry))
- {
- gdcmVerboseMacro( "AddEntry failed allthough this is a creation.");
-
- delete binEntry;
- return NULL;
- }
- }
-
- // Set the binEntry value
- uint8_t *tmpArea;
- if (lgth>0 && binArea)
- {
- tmpArea = new uint8_t[lgth];
- memcpy(tmpArea,binArea,lgth);
- }
- else
- {
- tmpArea = 0;
- }
- if (!SetEntry(tmpArea,lgth,binEntry))
- {
- if (tmpArea)
- {
- delete[] tmpArea;
- }
- }
-
- return binEntry;
-}
-
-/*
- * \brief Modifies the value of a given Header Entry (Dicom Element)
- * when it exists. Create it when unexistant.
- * @param group Group number of the Entry
- * @param elem Element number of the Entry
- * \return pointer to the modified/created SeqEntry (NULL when creation
- * failed).
- */
-SeqEntry *Document::ReplaceOrCreate( uint16_t group, uint16_t elem)
-{
- SeqEntry *seqEntry = 0;
- DocEntry *currentEntry = GetDocEntry( group, elem);
-
- // Verify the currentEntry
- if (currentEntry)
- {
- seqEntry = dynamic_cast< SeqEntry* >(currentEntry);
-
- // Verify the VR
- if( seqEntry )
- if( seqEntry->GetVR()!="SQ" )
- seqEntry=NULL;
-
- // if currentEntry doesn't correspond to the requested valEntry
- if( !seqEntry)
- {
- if (!RemoveEntry(currentEntry))
- {
- gdcmVerboseMacro( "Removal of previous DocEntry failed.");
-
- return NULL;
- }
- }
- }
- // Create a new seqEntry if necessary
- if (!seqEntry)
- {
- seqEntry = NewSeqEntry(group, elem);
-
- if ( !AddEntry(seqEntry))
- {
- gdcmVerboseMacro( "AddEntry failed allthough this is a creation.");
-
- delete seqEntry;
- return NULL;
- }
- }
- return seqEntry;
-}
-
-/**
- * \brief Set a new value if the invoked element exists
- * Seems to be useless !!!
- * @param value new element value
- * @param group group number of the Entry
- * @param elem element number of the Entry
- * \return boolean
- */
-bool Document::ReplaceIfExist(std::string const &value,
- uint16_t group, uint16_t elem )
-{
- SetEntry(value, group, elem);
-
- return true;
-}
-
//-----------------------------------------------------------------------------
// Protected
-
-/**
- * \brief Searches within Header Entries (Dicom Elements) parsed with
- * the public and private dictionaries
- * for the element value representation of a given tag..
- * Obtaining the VR (Value Representation) might be needed by caller
- * to convert the string typed content to caller's native type
- * (think of C++ vs Python). The VR is actually of a higher level
- * of semantics than just the native C++ type.
- * @param group Group number of the searched tag.
- * @param elem Element number of the searched tag.
- * @return Corresponding element value representation when it exists,
- * and the string GDCM_UNFOUND ("gdcm::Unfound") otherwise.
- */
-std::string Document::GetEntryVR(uint16_t group, uint16_t elem)
-{
- DocEntry *element = GetDocEntry(group, elem);
- if ( !element )
- {
- return GDCM_UNFOUND;
- }
- return element->GetVR();
-}
-
-/**
- * \brief Searches within Header Entries (Dicom Elements) parsed with
- * the public and private dictionaries
- * for the value length of a given tag..
- * @param group Group number of the searched tag.
- * @param elem Element number of the searched tag.
- * @return Corresponding element length; -2 if not found
- */
-int Document::GetEntryLength(uint16_t group, uint16_t elem)
-{
- DocEntry *element = GetDocEntry(group, elem);
- if ( !element )
- {
- return -2; //magic number
- }
- return element->GetLength();
-}
-
-/**
- * \brief Accesses an existing DocEntry (i.e. a Dicom Element)
- * through it's (group, element) and modifies it's content with
- * the given value.
- * @param content new value (string) to substitute with
- * @param group group number of the Dicom Element to modify
- * @param elem element number of the Dicom Element to modify
- */
-bool Document::SetEntry(std::string const& content,
- uint16_t group, uint16_t elem)
-{
- ValEntry *entry = GetValEntry(group, elem);
- if (!entry )
- {
- gdcmVerboseMacro( "No corresponding ValEntry (try promotion first).");
- return false;
- }
- return SetEntry(content,entry);
-}
-
-/**
- * \brief Accesses an existing DocEntry (i.e. a Dicom Element)
- * through it's (group, element) and modifies it's content with
- * the given value.
- * @param content new value (void* -> uint8_t*) to substitute with
- * @param lgth new value length
- * @param group group number of the Dicom Element to modify
- * @param elem element number of the Dicom Element to modify
- */
-bool Document::SetEntry(uint8_t*content, int lgth,
- uint16_t group, uint16_t elem)
-{
- BinEntry *entry = GetBinEntry(group, elem);
- if (!entry )
- {
- gdcmVerboseMacro( "No corresponding ValEntry (try promotion first).");
- return false;
- }
-
- return SetEntry(content,lgth,entry);
-}
-
-/**
- * \brief Accesses an existing DocEntry (i.e. a Dicom Element)
- * and modifies it's content with the given value.
- * @param content new value (string) to substitute with
- * @param entry Entry to be modified
- */
-bool Document::SetEntry(std::string const &content, ValEntry *entry)
-{
- if(entry)
- {
- entry->SetValue(content);
- return true;
- }
- return false;
-}
-
-/**
- * \brief Accesses an existing BinEntry (i.e. a Dicom Element)
- * and modifies it's content with the given value.
- * @param content new value (void* -> uint8_t*) to substitute with
- * @param entry Entry to be modified
- * @param lgth new value length
- */
-bool Document::SetEntry(uint8_t *content, int lgth, BinEntry *entry)
-{
- if(entry)
- {
- // Hope Binary field length is *never* wrong
- /*if(lgth%2) // Non even length are padded with a space (020H).
- {
- lgth++;
- //content = content + '\0'; // fing a trick to enlarge a binary field?
- }*/
-
- entry->SetBinArea(content);
- entry->SetLength(lgth);
- entry->SetValue(GDCM_BINLOADED);
- return true;
- }
- return false;
-}
-
-/**
- * \brief Gets (from Header) a 'non string' element value
- * (LoadElementValues has already be executed)
- * @param group group number of the Entry
- * @param elem element number of the Entry
- * @return Pointer to the 'non string' area
- */
-void *Document::GetEntryBinArea(uint16_t group, uint16_t elem)
-{
- DocEntry *entry = GetDocEntry(group, elem);
- if (!entry)
- {
- gdcmVerboseMacro( "No entry");
- return 0;
- }
- if ( BinEntry *binEntry = dynamic_cast<BinEntry*>(entry) )
- {
- return binEntry->GetBinArea();
- }
-
- return 0;
-}
-
/**
* \brief Loads (from disk) the element content
* when a string is not suitable
{
if ( newBinEntry )
{
- if ( Filetype == ExplicitVR && ! Global::GetVR()->IsVROfBinaryRepresentable(vr) )
+ if ( Filetype == ExplicitVR &&
+ !Global::GetVR()->IsVROfBinaryRepresentable(vr) )
{
////// Neither ValEntry NOR BinEntry: should mean UNKOWN VR
gdcmVerboseMacro( std::hex << newDocEntry->GetGroup()
}
}
- if ( ( newDocEntry->GetGroup() == 0x7fe0 )
- && ( newDocEntry->GetElement() == 0x0010 ) )
- {
- std::string ts = GetTransferSyntax();
- if ( Global::GetTS()->IsRLELossless(ts) )
- {
- long positionOnEntry = Fp->tellg();
- Fp->seekg( newDocEntry->GetOffset(), std::ios::beg );
- ComputeRLEInfo();
- Fp->seekg( positionOnEntry, std::ios::beg );
- }
- else if ( Global::GetTS()->IsJPEG(ts) )
- {
- long positionOnEntry = Fp->tellg();
- Fp->seekg( newDocEntry->GetOffset(), std::ios::beg );
- ComputeJPEGFragmentInfo();
- Fp->seekg( positionOnEntry, std::ios::beg );
- }
- }
-
// Just to make sure we are at the beginning of next entry.
SkipToNextDocEntry(newDocEntry);
}
newDocEntry->GetOffset(),
l, delim_mode);
}
- set->AddEntry( newSeqEntry );
+ if( !set->AddEntry( newSeqEntry ) )
+ {
+ used = false;
+ }
if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max)
{
+ if( !used )
+ delete newDocEntry;
break;
}
}
- if(!used)
+ if( !used )
delete newDocEntry;
}
}
{
RefPubDict = Global::GetDicts()->GetDefaultPubDict();
RefShaDict = NULL;
- RLEInfo = new RLEFramesInfo;
- JPEGInfo = new JPEGFragmentsInfo;
Filetype = Unknown;
}
std::string Document::GetTransferSyntaxName()
{
// use the TS (TS : Transfer Syntax)
- std::string transferSyntax = GetEntry(0x0002,0x0010);
+ std::string transferSyntax = GetEntryValue(0x0002,0x0010);
if ( (transferSyntax.find(GDCM_NOTLOADED) < transferSyntax.length()) )
{
//}
/**
- * \brief Assuming the internal file pointer \ref Document::Fp
- * is placed at the beginning of a tag check whether this
- * tag is (TestGroup, TestElement).
- * \warning On success the internal file pointer \ref Document::Fp
- * is modified to point after the tag.
- * On failure (i.e. when the tag wasn't the expected tag
- * (TestGroup, TestElement) the internal file pointer
- * \ref Document::Fp is restored to it's original position.
- * @param testGroup The expected group of the tag.
- * @param testElement The expected Element of the tag.
- * @return True on success, false otherwise.
+ * \brief Compares two documents, according to \ref DicomDir rules
+ * \warning Does NOT work with ACR-NEMA files
+ * \todo Find a trick to solve the pb (use RET fields ?)
+ * @param document
+ * @return true if 'smaller'
*/
-bool Document::ReadTag(uint16_t testGroup, uint16_t testElement)
+bool Document::operator<(Document &document)
{
- long positionOnEntry = Fp->tellg();
- long currentPosition = Fp->tellg(); // On debugging purposes
-
- //// Read the Item Tag group and element, and make
- // sure they are what we expected:
- uint16_t itemTagGroup;
- uint16_t itemTagElement;
- try
- {
- itemTagGroup = ReadInt16();
- itemTagElement = ReadInt16();
- }
- catch ( FormatError e )
+ // Patient Name
+ std::string s1 = GetEntryValue(0x0010,0x0010);
+ std::string s2 = document.GetEntryValue(0x0010,0x0010);
+ if(s1 < s2)
{
- //std::cerr << e << std::endl;
- return false;
+ return true;
}
- if ( itemTagGroup != testGroup || itemTagElement != testElement )
+ else if( s1 > s2 )
{
- gdcmVerboseMacro( "Wrong Item Tag found:"
- << " We should have found tag ("
- << std::hex << testGroup << "," << testElement << ")" << std::endl
- << " but instead we encountered tag ("
- << std::hex << itemTagGroup << "," << itemTagElement << ")"
- << " at address: " << " 0x(" << (unsigned int)currentPosition << ")"
- ) ;
- Fp->seekg(positionOnEntry, std::ios::beg);
-
return false;
}
- return true;
-}
-
-/**
- * \brief Assuming the internal file pointer \ref Document::Fp
- * is placed at the beginning of a tag (TestGroup, TestElement),
- * read the length associated to the Tag.
- * \warning On success the internal file pointer \ref Document::Fp
- * is modified to point after the tag and it's length.
- * On failure (i.e. when the tag wasn't the expected tag
- * (TestGroup, TestElement) the internal file pointer
- * \ref Document::Fp is restored to it's original position.
- * @param testGroup The expected group of the tag.
- * @param testElement The expected Element of the tag.
- * @return On success returns the length associated to the tag. On failure
- * returns 0.
- */
-uint32_t Document::ReadTagLength(uint16_t testGroup, uint16_t testElement)
-{
-
- if ( !ReadTag(testGroup, testElement) )
- {
- return 0;
- }
-
- //// Then read the associated Item Length
- long currentPosition = Fp->tellg();
- uint32_t itemLength = ReadInt32();
- {
- gdcmVerboseMacro( "Basic Item Length is: "
- << itemLength << std::endl
- << " at address: " << std::hex << (unsigned int)currentPosition);
- }
- return itemLength;
-}
-
-/**
- * \brief When parsing the Pixel Data of an encapsulated file, read
- * the basic offset table (when present, and BTW dump it).
- */
-void Document::ReadAndSkipEncapsulatedBasicOffsetTable()
-{
- //// Read the Basic Offset Table Item Tag length...
- uint32_t itemLength = ReadTagLength(0xfffe, 0xe000);
-
- // When present, read the basic offset table itself.
- // Notes: - since the presence of this basic offset table is optional
- // we can't rely on it for the implementation, and we will simply
- // trash it's content (when present).
- // - still, when present, we could add some further checks on the
- // lengths, but we won't bother with such fuses for the time being.
- if ( itemLength != 0 )
- {
- char *basicOffsetTableItemValue = new char[itemLength + 1];
- Fp->read(basicOffsetTableItemValue, itemLength);
-
-#ifdef GDCM_DEBUG
- for (unsigned int i=0; i < itemLength; i += 4 )
- {
- uint32_t individualLength = str2num( &basicOffsetTableItemValue[i],
- uint32_t);
- gdcmVerboseMacro( "Read one length: " <<
- std::hex << individualLength );
- }
-#endif //GDCM_DEBUG
-
- delete[] basicOffsetTableItemValue;
- }
-}
-
-/**
- * \brief Parse pixel data from disk of [multi-]fragment RLE encoding.
- * Compute the RLE extra information and store it in \ref RLEInfo
- * for later pixel retrieval usage.
- */
-void Document::ComputeRLEInfo()
-{
- std::string ts = GetTransferSyntax();
- if ( !Global::GetTS()->IsRLELossless(ts) )
+ else
{
- return;
- }
-
- // Encoded pixel data: for the time being we are only concerned with
- // Jpeg or RLE Pixel data encodings.
- // As stated in PS 3.5-2003, section 8.2 p44:
- // "If sent in Encapsulated Format (i.e. other than the Native Format) the
- // value representation OB is used".
- // Hence we expect an OB value representation. Concerning OB VR,
- // the section PS 3.5-2003, section A.4.c p 58-59, states:
- // "For the Value Representations OB and OW, the encoding shall meet the
- // following specifications depending on the Data element tag:"
- // [...snip...]
- // - the first item in the sequence of items before the encoded pixel
- // data stream shall be basic offset table item. The basic offset table
- // item value, however, is not required to be present"
-
- ReadAndSkipEncapsulatedBasicOffsetTable();
-
- // Encapsulated RLE Compressed Images (see PS 3.5-2003, Annex G)
- // Loop on the individual frame[s] and store the information
- // on the RLE fragments in a RLEFramesInfo.
- // Note: - when only a single frame is present, this is a
- // classical image.
- // - when more than one frame are present, then we are in
- // the case of a multi-frame image.
- long frameLength;
- while ( (frameLength = ReadTagLength(0xfffe, 0xe000)) )
- {
- // Parse the RLE Header and store the corresponding RLE Segment
- // Offset Table information on fragments of this current Frame.
- // Note that the fragment pixels themselves are not loaded
- // (but just skipped).
- long frameOffset = Fp->tellg();
-
- uint32_t nbRleSegments = ReadInt32();
- if ( nbRleSegments > 16 )
+ // Patient ID
+ s1 = GetEntryValue(0x0010,0x0020);
+ s2 = document.GetEntryValue(0x0010,0x0020);
+ if ( s1 < s2 )
{
- // There should be at most 15 segments (refer to RLEFrame class)
- gdcmVerboseMacro( "Too many segments.");
+ return true;
}
-
- uint32_t rleSegmentOffsetTable[16];
- for( int k = 1; k <= 15; k++ )
+ else if ( s1 > s2 )
{
- rleSegmentOffsetTable[k] = ReadInt32();
+ return false;
}
-
- // Deduce from both the RLE Header and the frameLength the
- // fragment length, and again store this info in a
- // RLEFramesInfo.
- long rleSegmentLength[15];
- // skipping (not reading) RLE Segments
- if ( nbRleSegments > 1)
+ else
{
- for(unsigned int k = 1; k <= nbRleSegments-1; k++)
+ // Study Instance UID
+ s1 = GetEntryValue(0x0020,0x000d);
+ s2 = document.GetEntryValue(0x0020,0x000d);
+ if ( s1 < s2 )
{
- rleSegmentLength[k] = rleSegmentOffsetTable[k+1]
- - rleSegmentOffsetTable[k];
- SkipBytes(rleSegmentLength[k]);
- }
- }
-
- rleSegmentLength[nbRleSegments] = frameLength
- - rleSegmentOffsetTable[nbRleSegments];
- SkipBytes(rleSegmentLength[nbRleSegments]);
-
- // Store the collected info
- RLEFrame *newFrameInfo = new RLEFrame;
- newFrameInfo->NumberFragments = nbRleSegments;
- for( unsigned int uk = 1; uk <= nbRleSegments; uk++ )
- {
- newFrameInfo->Offset[uk] = frameOffset + rleSegmentOffsetTable[uk];
- newFrameInfo->Length[uk] = rleSegmentLength[uk];
- }
- RLEInfo->Frames.push_back( newFrameInfo );
- }
-
- // Make sure that at the end of the item we encounter a 'Sequence
- // Delimiter Item':
- if ( !ReadTag(0xfffe, 0xe0dd) )
- {
- gdcmVerboseMacro( "No sequence delimiter item at end of RLE item sequence");
+ return true;
+ }
+ else if( s1 > s2 )
+ {
+ return false;
+ }
+ else
+ {
+ // Serie Instance UID
+ s1 = GetEntryValue(0x0020,0x000e);
+ s2 = document.GetEntryValue(0x0020,0x000e);
+ if ( s1 < s2 )
+ {
+ return true;
+ }
+ else if( s1 > s2 )
+ {
+ return false;
+ }
+ }
+ }
}
+ return false;
}
/**
- * \brief Parse pixel data from disk of [multi-]fragment Jpeg encoding.
- * Compute the jpeg extra information (fragment[s] offset[s] and
- * length) and store it[them] in \ref JPEGInfo for later pixel
- * retrieval usage.
+ * \brief Re-computes the length of a ACR-NEMA/Dicom group from a DcmHeader
+ * @param filetype Type of the File to be written
*/
-void Document::ComputeJPEGFragmentInfo()
+int Document::ComputeGroup0002Length( FileType filetype )
{
- // If you need to, look for comments of ComputeRLEInfo().
- std::string ts = GetTransferSyntax();
- if ( ! Global::GetTS()->IsJPEG(ts) )
+ uint16_t gr;
+ std::string vr;
+
+ int groupLength = 0;
+ bool found0002 = false;
+
+ // for each zero-level Tag in the DCM Header
+ DocEntry *entry = GetFirstEntry();
+ while(entry)
{
- return;
- }
-
- ReadAndSkipEncapsulatedBasicOffsetTable();
-
- // Loop on the fragments[s] and store the parsed information in a
- // JPEGInfo.
- long fragmentLength;
- while ( (fragmentLength = ReadTagLength(0xfffe, 0xe000)) )
- {
- long fragmentOffset = Fp->tellg();
-
- // Store the collected info
- JPEGFragment *newFragment = new JPEGFragment;
- newFragment->Offset = fragmentOffset;
- newFragment->Length = fragmentLength;
- JPEGInfo->Fragments.push_back( newFragment );
+ gr = entry->GetGroup();
- SkipBytes( fragmentLength );
- }
+ if (gr == 0x0002)
+ {
+ found0002 = true;
+ vr = entry->GetVR();
+
+ if (filetype == ExplicitVR)
+ {
+ if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") )
+ {
+ groupLength += 4; // explicit VR AND OB, OW, SQ : 4 more bytes
+ }
+ }
+ groupLength += 2 + 2 + 4 + entry->GetLength();
+ }
+ else if (found0002 )
+ break;
- // Make sure that at the end of the item we encounter a 'Sequence
- // Delimiter Item':
- if ( !ReadTag(0xfffe, 0xe0dd) )
- {
- gdcmVerboseMacro( "No sequence delimiter item at end of JPEG item sequence");
+ entry = GetNextEntry();
}
+ return groupLength;
}
/*
return FlatHT;
}*/
-
-
-/**
- * \brief Compares two documents, according to \ref DicomDir rules
- * \warning Does NOT work with ACR-NEMA files
- * \todo Find a trick to solve the pb (use RET fields ?)
- * @param document
- * @return true if 'smaller'
- */
-bool Document::operator<(Document &document)
-{
- // Patient Name
- std::string s1 = GetEntry(0x0010,0x0010);
- std::string s2 = document.GetEntry(0x0010,0x0010);
- if(s1 < s2)
- {
- return true;
- }
- else if( s1 > s2 )
- {
- return false;
- }
- else
- {
- // Patient ID
- s1 = GetEntry(0x0010,0x0020);
- s2 = document.GetEntry(0x0010,0x0020);
- if ( s1 < s2 )
- {
- return true;
- }
- else if ( s1 > s2 )
- {
- return false;
- }
- else
- {
- // Study Instance UID
- s1 = GetEntry(0x0020,0x000d);
- s2 = document.GetEntry(0x0020,0x000d);
- if ( s1 < s2 )
- {
- return true;
- }
- else if( s1 > s2 )
- {
- return false;
- }
- else
- {
- // Serie Instance UID
- s1 = GetEntry(0x0020,0x000e);
- s2 = document.GetEntry(0x0020,0x000e);
- if ( s1 < s2 )
- {
- return true;
- }
- else if( s1 > s2 )
- {
- return false;
- }
- }
- }
- }
- return false;
-}
-
-
-/**
- * \brief Re-computes the length of a ACR-NEMA/Dicom group from a DcmHeader
- * @param filetype Type of the File to be written
- */
-int Document::ComputeGroup0002Length( FileType filetype )
-{
- uint16_t gr, el;
- std::string vr;
-
- int groupLength = 0;
- bool found0002 = false;
-
- // for each zero-level Tag in the DCM Header
- DocEntry *entry = GetFirstEntry();
- while(entry)
- {
- gr = entry->GetGroup();
-
- if (gr == 0x0002)
- {
- found0002 = true;
-
- el = entry->GetElement();
- vr = entry->GetVR();
-
- if (filetype == ExplicitVR)
- {
- if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") )
- {
- groupLength += 4; // explicit VR AND OB, OW, SQ : 4 more bytes
- }
- }
- groupLength += 2 + 2 + 4 + entry->GetLength();
- }
- else if (found0002 )
- break;
-
- entry = GetNextEntry();
- }
- return groupLength;
-}
-
} // end namespace gdcm
//-----------------------------------------------------------------------------