Program: gdcm
Module: $RCSfile: gdcmDocument.cxx,v $
Language: C++
- Date: $Date: 2007/07/26 08:36:49 $
- Version: $Revision: 1.364 $
+ Date: $Date: 2007/10/08 15:20:17 $
+ Version: $Revision: 1.373 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
/**
* \brief This default constructor neither loads nor parses the file.
- * You should then invoke \ref Document::Load.
+ * You should then invoke Document::Load.
*
*/
Document::Document()
//
// -----------------File I/O ---------------
/**
- * \brief Tries to open the file \ref Document::Filename and
+ * \brief Tries to open the file Document::Filename and
* checks the preamble when existing,
* or if the file starts with an ACR-NEMA look-like element.
* @return The FILE pointer on success, 0 on failure.
* @param filetype Type of the File to be written
* (ACR-NEMA, ExplicitVR, ImplicitVR)
*/
-void Document::WriteContent(std::ofstream *fp, FileType filetype)
+void Document::WriteContent(std::ofstream *fp, FileType filetype, bool, bool)
{
// Skip if user wants to write an ACR-NEMA file
* --> was too much tricky / we were [in a hurry / too lazy]
* --> We don't write the element 0x0000 (group length)
*/
-
- ElementSet::WriteContent(fp, filetype, false); // This one is recursive
+ // This one is recursive
+ // false : outside MetaElements
+ // false : outside Sequence
+ ElementSet::WriteContent(fp, filetype, false, false);
}
// -----------------------------------------
//}
/**
- * \brief Compares two documents, according to \ref DicomDir rules
+ * \brief Compares two documents, according to DicomDir rules
* \warning Does NOT work with ACR-NEMA files
* \todo Find a trick to solve the pb (use RET fields ?)
* @param document to compare with current one
vr = entry->GetVR();
//if ( (vr == "OB")||(vr == "OW")||(vr == "UT")||(vr == "SQ"))
- // (no SQ, OW, UT in group 0x0002;)
+ // (no SQ, OW, OL, UT in group 0x0002;)
if ( vr == "OB" )
{
- // explicit VR AND (OB, OW, SQ, UT) : 4 more bytes
+ // explicit VR AND (OB, OW, OL, SQ, UT) : 4 more bytes
groupLength += 4;
}
groupLength += 2 + 2 + 4 + entry->GetLength();
gdcmWarningMacro("in ParseSQ : should never get here!");
UnexpectedEOF = true;
return false;
- //break;
}
if ( delim_mode )
{
// in the following line.
// (the 'straight' images will no longer be readable ...)
- if ( vr == "OB" || vr == "OW" || vr == "SQ" || vr == "UT"
+ if ( vr == "OB" || vr == "OW" || vr == "OL" || vr == "SQ" || vr == "UT"
|| vr == "UN" || changeFromUN == true)
{
changeFromUN = false;
// "7.1.2 Data element structure with explicit vr", p 27) must be
// skipped before proceeding on reading the length on 4 bytes.
- //Fp->seekg( 2L, std::ios::cur); // Once per OW,OB,SQ DocEntry
- uint32_t length32 = ReadInt32(); // Once per OW,OB,SQ DocEntry
+ //Fp->seekg( 2L, std::ios::cur); // Once per OB,OW,OL,SQ DocEntry
+ uint32_t length32 = ReadInt32(); // Once per Ob,OW,OL,SQ DocEntry
CurrentOffsetPosition+=4;
- if ( (vr == "OB" || vr == "OW") && length32 == 0xffffffff )
+ if ( (vr == "OB" || vr == "OW" || vr == "OL") && length32 == 0xffffffff )
{
uint32_t lengthOB;
try
uint16_t elem;
try
- {
+ { ///\todo make sure there is never OL encoded pixel data!
+
//group = ReadInt16(); // Once per fragment (if any) of OB,OW DataElements
//elem = ReadInt16(); // Once per fragment (if any) of OB,OW DataElements
ReadBegBuffer(4); // Once per fragment (if any) of OB,OW DataElements
}
// Check if next 2 bytes are a VR
// Probabely something more time-consuming exists with std::string
- const char VRvalues[] = "AEASCSDADSFLFDISLOLTPNSHSLSSSTTMUIULUSUTOBOWOFATUNSQ";
- int nbVal = 26;
+ const char VRvalues[] = "AEASATCSDADTFLFDISLOLTPNSHSLSSSTTMUIULUSUTOBOWOLOFATUNSQRT";
+ int nbVal = 29;
const char *pt = VRvalues;
for (int i=0;i<nbVal;i++)
{
- if(*(deb+4) == *pt++)
- if(*(deb+5) == *pt++) {
- Filetype = ExplicitVR;
- return true;
- }
-
+ if(*(deb+4) == *pt++) {
+ if(*(deb+5) == *pt++) {
+ Filetype = ExplicitVR;
+ return true;
+ }
+ else {
+ pt++;
+ }
+ }
}
Filetype = ImplicitVR;
return true;
// Data Elements are Explicit VR and some other ones Implicit VR
// -> Better we fix the problem at Write time
- else if (CurrentGroup%2 == 1 &&
- (CurrentElem >= 0x0010 && CurrentElem <=0x00ff ))
- {
- // DICOM PS 3-5 7.8.1 a) states that those
- // (gggg-0010->00FF where gggg is odd) attributes have to be LO
- realVR = "LO";
+ else if (CurrentGroup%2 == 1 )
+ {
+ if (CurrentElem >= 0x0010 && CurrentElem <=0x00ff )
+ // DICOM PS 3-5 7.8.1 a) states that :
+ // Private Creator Data Elements numbered (gggg,0010-00FF) (gggg is odd)
+ // attributes have to be LO (Long String) and the VM shall be equal to 1
+ realVR = "LO";
+
+ // Seems not to be true
+ // Still in gdcmtk, David Clunnie disagrees, Marco Eichelberg says it's OK ...
+ // We let it for a while?
+ //(We should check length==4, for more security, but we don't have it yet !)
+ else if ( CurrentElem == 0x0001)
+ realVR = "UL"; // Private Group Length To End
}
else
// for VR = "UN", length is always stored on 4 bytes.
changeFromUN=true;
/// \todo : fixme If inside a supposed to be UN DataElement (but SQ according to a private dictionnary)
- /// there is some more supposed to UN DataElements, it will probabely fail.
+ /// there is some more supposed to be UN DataElements, it will probabely fail.
/// --> find a -non time consuming- trick to store changeFromUN info at DataElement level,
/// not at the Document level.
}
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff