--- /dev/null
+metaElem 0x0002 0x0000 "12345" // Meta Group Length : to be computed later
+metaElem 0x0002 0x0001 "\2\0\0\0" // File Meta Information Version
+metaElem 0x0002 0x0002 "1.2.840.10008.1.3.10" // Media Stored SOP Class UID i.e. : 'Media Storage Directory Storage'
+metaElem 0x0002 0x0003 "" // Media Stored SOP Instance UID : may be forged later
+metaElem 0x0002 0x0010 "1.2.840.10008.1.2.1" // Transfer Syntax UID i.e. : Explicit VR - Little Endian
+metaElem 0x0002 0x0012 "" // Implementation Class UID : may be forged later
+metaElem 0x0002 0x0013 "gdcmLib" // Implementation Version Name
+metaElem 0x0004 0x1130 "" // File-set ID
+metaElem 0x0004 0x1200 "0" // Offset of the first dir of root dir entity : to be computed later
+metaElem 0x0004 0x1202 "0" // Offset of the last dir of root dir entity : to be computed later
+metaElem 0x0004 0x1212 "0" // File-set consistency flag
+metaElem 0x0004 0x1220 "0" // Directory record sequence : *length* to be set later
+
+patientElem 0xfffe 0xe000 "0"
+patientElem 0x0004 0x1400 "0" // Offset of next directory record : to be computed later
+patientElem 0x0004 0x1410 "65535" // Record in use flag : 65535 ?
+patientElem 0x0004 0x1420 "0" // Offset of referenced lower-level dir entity : to be computed later
+patientElem 0x0004 0x1430 "PATIENT " // Directory Record Type don't remove trailing space !
+patientElem 0x0008 0x0005 "ISO_IR 100" // Specific Character Set
+patientElem 0x0010 0x0010 "" // Patient's Name
+patientElem 0x0010 0x0020 "" // Patient ID
+patientElem 0x0010 0x0030 "" // Patient's Birthdate
+patientElem 0x0010 0x0040 "" // Patient's Sex
+
+studyElem 0xfffe 0xe000 "0"
+studyElem 0x0004 0x1400 "0" // Offset of next directory record : to be computed later
+studyElem 0x0004 0x1410 "65535" // Record in use flag : 65535 ?
+studyElem 0x0004 0x1420 "0" // Offset of referenced lower-level dir entity : to be computed later
+studyElem 0x0004 0x1430 "STUDY " // Directory Record Type don't remove trailing space !
+studyElem 0x0008 0x0005 "ISO_IR 100" // Specific Character Set
+studyElem 0x0008 0x0020 "" // Study Date
+studyElem 0x0008 0x0030 "" // Study Time
+studyElem 0x0008 0x0050 "" // Accession Number
+studyElem 0x0008 0x1030 "" // Study Description
+studyElem 0x0020 0x000d "" // Study Instance UID : may be forged later
+studyElem 0x0020 0x0010 "" // Study ID : may be forged later
+
+serieElem 0xfffe 0xe000 "0"
+serieElem 0x0004 0x1400 "0" // Offset of next directory record : to be computed later
+serieElem 0x0004 0x1410 "65535" // Record in use flag : 65535 ?
+serieElem 0x0004 0x1420 "0" // Offset of referenced lower-level dir entity : to be computed later
+serieElem 0x0004 0x1430 "SERIES" // Directory Record Type don't add trailing space !
+serieElem 0x0008 0x0005 "ISO_IR 100" // Specific Character Set
+serieElem 0x0008 0x0021 "" // Series Date
+serieElem 0x0008 0x0031 "" // Series Time
+serieElem 0x0008 0x0060 "" // Modality
+serieElem 0x0008 0x0080 "" // Institution Name : may be forged later
+serieElem 0x0008 0x0081 "" // Institution Address : may be forged later
+serieElem 0x0008 0x103e "" // Series Description : may be forged later
+serieElem 0x0020 0x000e "" // Series Instance UID : may be forged later
+serieElem 0x0020 0x0011 "0" // Series Number : may be forged later
+
+imageElem 0xfffe 0xe000 "0"
+imageElem 0x0004 0x1400 "0" // Offset of next directory record : to be computed later
+imageElem 0x0004 0x1410 "65535" // Record in use flag : 65535 ?
+imageElem 0x0004 0x1420 "0" // Offset of referenced lower-level dir entity : to be computed later
+imageElem 0x0004 0x1430 "IMAGE " // Directory Record Type don't remove trailing space !
+imageElem 0x0004 0x1500 "" // Referenced File ID : to be set later relative File Name
+imageElem 0x0004 0x1510 "" // Referenced SOP Class UID in File : may be forged later
+imageElem 0x0004 0x1511 "" // Referenced SOP Class UID in File : may be forged later
+imageElem 0x0004 0x1512 "" // Referenced Transfer Syntax in File
+imageElem 0x0008 0x0005 "ISO_IR 100" // Specific Character Set
+imageElem 0x0008 0x0008 "" // Image Type
+imageElem 0x0008 0x0016 "" // SOP Class UID : to be set/forged later
+imageElem 0x0008 0x0018 "" // SOP Instance UID : to be set/forged later
+imageElem 0x0008 0x0023 "" // Content Date
+imageElem 0x0008 0x0033 "" // Content Time
+imageElem 0x0008 0x1040 "" // Referenced Image Sequence : to be set/forged later
+imageElem 0xfffe 0xe000 "0"
+imageElem 0x0008 0x1150 "" // Referenced SOP Class UID : to be set/forged later
+imageElem 0x0008 0x1155 "" // Referenced SOP Instance UID : to be set/forged later
+imageElem 0x0020 0x0013 "0" // Image Number
+imageElem 0x0020 0x0032 "0" // Image Position Patient
+imageElem 0x0020 0x0037 "0" // Image Orientation Patient
+imageElem 0x0020 0x0052 "0" // Frame of Reference UID
+imageElem 0x0028 0x0010 "0" // Rows
+imageElem 0x0028 0x0011 "0" // Columns
+imageElem 0x0028 0x0030 "0" // Pixel Spacing
+imageElem 0x0050 0x0004 "0" // Calibration Image
+
#include <sys/types.h>
#include <errno.h>
-//-----------------------------------------------------------------------------
-class ELEMENTS
-{
-public :
- ELEMENTS(unsigned short int _group,unsigned short int _elem,std::string _value)
- {group=_group;elem=_elem;value=_value;}
-
- unsigned short int group;
- unsigned short int elem;
- std::string value;
-};
-
-ELEMENTS metaElem[]={
- //Meta Group Length : to be computed later
- ELEMENTS(0x0002,0x0000,"12345"),
- //File Meta Information Version
- ELEMENTS(0x0002,0x0001,"\2\0\0\0"),
- //Media Stored SOP Class UID i.e. : 'Media Storage Directory Storage'
- ELEMENTS(0x0002,0x0002,"1.2.840.10008.1.3.10"),
- //Media Stored SOP Instance UID : may be forged later
- ELEMENTS(0x0002,0x0003,""),
- //Transfer Syntax UID i.e. : Explicit VR - Little Endian
- ELEMENTS(0x0002,0x0010,"1.2.840.10008.1.2.1"),
- //Implementation Class UID : may be forged later
- ELEMENTS(0x0002,0x0012,""),
- //Implementation Version Name
- ELEMENTS(0x0002,0x0013,"gdcmLib"),
- //File-set ID :
- ELEMENTS(0x0004,0x1130,""),
- //Offset of the first dir of root dir entity : to be computed later
- ELEMENTS(0x0004,0x1200,"0"),
- //Offset of the last dir of root dir entity : to be computed later
- ELEMENTS(0x0004,0x1202,"0"),
- //File-set consistency flag
- ELEMENTS(0x0004,0x1212,"0"),
- //Directory record sequence : *length* to be set later
- ELEMENTS(0x0004,0x1220,"0"),
- ELEMENTS(0xffff,0xffff,"")
-} ;
-
-ELEMENTS patientElem[]={
- ELEMENTS(0xfffe,0xe000,"0"),
- // Offset of next directory record : to be computed later
- ELEMENTS(0x0004,0x1400,"0"),
- // Record in use flag : 65535(?)
- ELEMENTS(0x0004,0x1410,"65535"),
- // Offset of referenced lower-level dir entity : to be computed later
- ELEMENTS(0x0004,0x1420,"0"),
- // Directory Record Type
- ELEMENTS(0x0004,0x1430,"PATIENT "), // don't remove trailing space !
-
- // Specific Character Set
- ELEMENTS(0x0008,0x0005,"ISO_IR 100"),
- // Patient's Name
- ELEMENTS(0x0010,0x0010,""),
- // Patient ID
- ELEMENTS(0x0010,0x0020,""),
- // Patient's Birthdate
- ELEMENTS(0x0010,0x0030,""),
- // Patient's Sex
- ELEMENTS(0x0010,0x0040,""),
- ELEMENTS(0xffff,0xffff,"")
- };
-
-ELEMENTS studyElem[]={
- ELEMENTS(0xfffe,0xe000,"0"),
- // Offset of next directory record : to be computed later
- ELEMENTS(0x0004,0x1400,"0"),
- // Record in use flag : 65535(?)
- ELEMENTS(0x0004,0x1410,"65535"),
- // Offset of referenced lower-level dir entity : to be computed later
- ELEMENTS(0x0004,0x1420,"0"),
- // Directory Record Type
- ELEMENTS(0x0004,0x1430,"STUDY "), // don't remove trailing space !
-
- // Specific Character Set
- ELEMENTS(0x0008,0x0005,"ISO_IR 100"),
- // Study Date
- ELEMENTS(0x0008,0x0020,""),
- // Study Time
- ELEMENTS(0x0008,0x0030,""),
- // Accession Number
- ELEMENTS(0x0008,0x0050,""),
- // Study Description
- ELEMENTS(0x0008,0x1030,""),
- // Study Instance UID : may be forged later
- ELEMENTS(0x0020,0x000d,""),
- // Study ID : may be forged later
- ELEMENTS(0x0020,0x0010,""),
- ELEMENTS(0xffff,0xffff,"")
-};
-
-
-ELEMENTS serieElem[]={
- ELEMENTS(0xfffe,0xe000,"0"),
- // Offset of next directory record : to be computed later
- ELEMENTS(0x0004,0x1400,"0"),
- // Record in use flag : 65535(?)
- ELEMENTS(0x0004,0x1410,"65535"),
- // Offset of referenced lower-level dir entity : to be computed later
- ELEMENTS(0x0004,0x1420,"0"),
- // Directory Record Type
- ELEMENTS(0x0004,0x1430,"SERIES"), // don't add trailing space !
-
- // Specific Character Set
- ELEMENTS(0x0008,0x0005,"ISO_IR 100"),
- // Series Date
- ELEMENTS(0x0008,0x0021,""),
- // Series Time
- ELEMENTS(0x0008,0x0031,""),
- // Modality
- ELEMENTS(0x0008,0x0060,""),
- // Institution Name : may be forged later
- ELEMENTS(0x0008,0x0080,""),
- // Institution Address : may be forged later
- ELEMENTS(0x0008,0x0081,""),
- // Series Description : may be forged later
- ELEMENTS(0x0008,0x103e,""),
- // Series Instance UID : may be forged later
- ELEMENTS(0x0020,0x000e,""),
- // Series Number : may be forged later
- ELEMENTS(0x0020,0x0011,"0"),
- ELEMENTS(0xffff,0xffff,"")
-};
-
-ELEMENTS imageElem[]={
- ELEMENTS(0xfffe,0xe000,"0"),
- // Offset of next directory record : to be computed later
- ELEMENTS(0x0004,0x1400,"0"),
- // Record in use flag : 65535(?)
- ELEMENTS(0x0004,0x1410,"65535"),
- // Offset of referenced lower-level dir entity : to be computed later
- ELEMENTS(0x0004,0x1420,"0"),
- // Directory Record Type
- ELEMENTS(0x0004,0x1430,"IMAGE "), // don't remove trailing space !
-
- // Referenced File ID : to be set later(relative File Name)
- ELEMENTS(0x0004,0x1500,""),
- // Referenced SOP Class UID in File : may be forged later
- ELEMENTS(0x0004,0x1510,""),
- // Referenced SOP Class UID in File : may be forged later
- ELEMENTS(0x0004,0x1511,""),
- // Referenced Transfer Syntax in File
- ELEMENTS(0x0004,0x1512,""),
- // Specific Character Set
- ELEMENTS(0x0008,0x0005,"ISO_IR 100"),
- // Image Type
- ELEMENTS(0x0008,0x0008,""),
- // SOP Class UID : to be set/forged later
- ELEMENTS(0x0008,0x0016,""),
- // SOP Instance UID : to be set/forged later
- ELEMENTS(0x0008,0x0018,""),
- // Content Date
- ELEMENTS(0x0008,0x0023,""),
- // Content Time
- ELEMENTS(0x0008,0x0033,""),
- // Referenced Image Sequence : to be set/forged later
- ELEMENTS(0x0008,0x1040,""),
- ELEMENTS(0xfffe,0xe000,"0"),
- // Referenced SOP Class UID : to be set/forged later
- ELEMENTS(0x0008,0x1150,""),
- // Referenced SOP Instance UID : to be set/forged later
- ELEMENTS(0x0008,0x1155,""),
- // Image Number
- ELEMENTS(0x0020,0x0013,"0"),
- // Image Position Patient
- ELEMENTS(0x0020,0x0032,"0"),
- // Image Orientation(Patient)
- ELEMENTS(0x0020,0x0037,"0"),
- // Frame of Reference UID
- ELEMENTS(0x0020,0x0052,"0"),
- // Rows
- ELEMENTS(0x0028,0x0010,"0"),
- // Columns
- ELEMENTS(0x0028,0x0011,"0"),
- // Pixel Spacing
- ELEMENTS(0x0028,0x0030,"0"),
- // Calibration Image
- ELEMENTS(0x0050,0x0004,"0"),
- ELEMENTS(0xffff,0xffff,"")
-};
-
//-----------------------------------------------------------------------------
// Constructor / Destructor
/*
*/
void gdcmDicomDir::SetElement(std::string &path,gdcmDicomDirType type,gdcmHeader *header)
{
- ELEMENTS *elemList;
+ std::list<gdcmElement> elemList;
+ std::list<gdcmElement>::iterator it;
guint16 tmpGr, tmpEl;
gdcmDictEntry *dictEntry;
gdcmHeaderEntry *entry;
switch(type)
{
case GDCM_PATIENT:
- elemList=patientElem;
+ elemList=gdcmGlobal::GetDicomDirElements()->GetPatientElements();
break;
case GDCM_STUDY:
- elemList=studyElem;
+ elemList=gdcmGlobal::GetDicomDirElements()->GetStudyElements();
break;
case GDCM_SERIE:
- elemList=serieElem;
+ elemList=gdcmGlobal::GetDicomDirElements()->GetSerieElements();
break;
case GDCM_IMAGE:
- elemList=imageElem;
+ elemList=gdcmGlobal::GetDicomDirElements()->GetImageElements();
break;
case GDCM_NONE:
- elemList=metaElem;
+ elemList=gdcmGlobal::GetDicomDirElements()->GetMetaElements();
break;
default:
return;
}
- for(int i=0;;i++)
+ for(it=elemList.begin();it!=elemList.end();++it)
{
- tmpGr=elemList[i].group;
- tmpEl=elemList[i].elem;
- if(tmpGr==0xffff)
- break;
+ tmpGr=it->group;
+ tmpEl=it->elem;
dictEntry=GetPubDict()->GetDictEntryByNumber(tmpGr,tmpEl);
-
entry=new gdcmHeaderEntry(dictEntry);
entry->SetOffset(0); // just to avoid missprinting
}
else
{
- val=elemList[i].value;
+ val=it->value;
}
}
entry->SetValue(val);
--- /dev/null
+// gdcmDicomDirElement.cxx
+//-----------------------------------------------------------------------------
+#include <fstream>
+
+#include "gdcmDicomDirElement.h"
+#include "gdcmUtil.h"
+
+#ifndef PUB_DICT_PATH
+# define PUB_DICT_PATH "../Dicts/"
+#endif
+#define DICT_ELEM "DicomDir.dic"
+
+#include <iostream>
+#ifdef GDCM_NO_ANSI_STRING_STREAM
+# include <strstream>
+# define ostringstream ostrstream
+# else
+# include <sstream>
+#endif
+
+//-----------------------------------------------------------------------------
+// Constructor / Destructor
+gdcmDicomDirElement::gdcmDicomDirElement(void)
+{
+ std::string filename=gdcmDictSet::BuildDictPath() + std::string(DICT_ELEM);
+ std::ifstream from(filename.c_str());
+ dbg.Error(!from, "gdcmDicomDirElement::gdcmDicomDirElement: can't open dictionary",filename.c_str());
+
+ char buff[1024];
+ std::string type;
+ gdcmElement elem;
+
+ while (!from.eof()) {
+ eatwhite(from);
+ from.getline(buff, 1024, ' ');
+ type = buff;
+
+ if( (type=="metaElem") || (type=="patientElem") ||
+ (type=="studyElem") || (type=="serieElem") ||
+ (type=="imageElem") )
+ {
+ from >> std::hex >> elem.group >> elem.elem;
+
+ eatwhite(from);
+ from.getline(buff, 1024, '"');
+ eatwhite(from);
+ from.getline(buff, 1024, '"');
+ elem.value = buff;
+
+ if(type=="metaElem")
+ MetaList.push_back(elem);
+ else if(type=="patientElem")
+ PatientList.push_back(elem);
+ else if(type=="studyElem")
+ StudyList.push_back(elem);
+ else if(type=="serieElem")
+ SerieList.push_back(elem);
+ else if(type=="imageElem")
+ ImageList.push_back(elem);
+ }
+
+ from.getline(buff, 1024, '\n');
+ }
+ from.close();
+}
+
+gdcmDicomDirElement::~gdcmDicomDirElement()
+{
+ MetaList.clear();
+ PatientList.clear();
+ StudyList.clear();
+ SerieList.clear();
+ ImageList.clear();
+}
+
+//-----------------------------------------------------------------------------
+// Print
+/**
+ * \ingroup gdcmVR
+ * \brief Print all
+ * @param os The output stream to be written to.
+ */
+void gdcmDicomDirElement::Print(std::ostream &os)
+{
+ std::ostringstream s;
+ std::list<gdcmElement>::iterator it;
+ char greltag[10]; //group element tag
+
+ s << "Meta Elements :"<<std::endl;
+ for (it = MetaList.begin();it!=MetaList.end();++it)
+ {
+ sprintf(greltag,"%04x|%04x ",it->group,it->elem);
+ s << " ("<<greltag<<") = "<< it->value<<std::endl;
+ }
+
+ s << "Patient Elements :"<<std::endl;
+ for (it = PatientList.begin();it!=PatientList.end();++it)
+ {
+ sprintf(greltag,"%04x|%04x ",it->group,it->elem);
+ s << " ("<<greltag<<") = "<< it->value<<std::endl;
+ }
+
+ s << "Study Elements :"<<std::endl;
+ for (it = StudyList.begin();it!=StudyList.end();++it)
+ {
+ sprintf(greltag,"%04x|%04x ",it->group,it->elem);
+ s << " ("<<greltag<<") = "<< it->value<<std::endl;
+ }
+
+ s << "Serie Elements :"<<std::endl;
+ for (it = SerieList.begin();it!=SerieList.end();++it)
+ {
+ sprintf(greltag,"%04x|%04x ",it->group,it->elem);
+ s << " ("<<greltag<<") = "<< it->value<<std::endl;
+ }
+
+ s << "Image Elements :"<<std::endl;
+ for (it = ImageList.begin();it!=ImageList.end();++it)
+ {
+ sprintf(greltag,"%04x|%04x ",it->group,it->elem);
+ s << " ("<<greltag<<") = "<< it->value<<std::endl;
+ }
+
+ os << s.str();
+}
+
+//-----------------------------------------------------------------------------
+// Public
+
+//-----------------------------------------------------------------------------
+// Protected
+
+//-----------------------------------------------------------------------------
+// Private
+
+//-----------------------------------------------------------------------------
git://git.creatis.insa-lyon.fr / gdcm.git / commitdiff