X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDirElement.cxx;h=3d5733d505f80d23aa3185be9ba5c08b7b5478bc;hb=224876ca6cbe71952f2a1d66d9853eca7745d3a0;hp=b526b5bcabe5dfabd4c5b875792224d311c3df7d;hpb=95e43356511d138225d8f718f632b3e7a8fcc106;p=gdcm.git diff --git a/src/gdcmDicomDirElement.cxx b/src/gdcmDicomDirElement.cxx index b526b5bc..3d5733d5 100644 --- a/src/gdcmDicomDirElement.cxx +++ b/src/gdcmDicomDirElement.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDirElement.cxx,v $ Language: C++ - Date: $Date: 2005/02/05 01:37:08 $ - Version: $Revision: 1.34 $ + Date: $Date: 2007/05/23 14:18:08 $ + Version: $Revision: 1.45 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -24,9 +24,11 @@ #include #include -namespace gdcm +namespace GDCM_NAME_SPACE { //----------------------------------------------------------------------------- +/// \brief auto generate function, to fill up the default elements for +/// a DICOMDIR, if relevant file is not found on user's disk void FillDefaultDIRDict(DicomDirElement *dde); //----------------------------------------------------------------------------- @@ -39,7 +41,7 @@ DicomDirElement::DicomDirElement() { std::string filename = DictSet::BuildDictPath() + DICT_ELEM; std::ifstream from(filename.c_str()); - if(!from) + if ( !from ) { gdcmWarningMacro( "Can't open DicomDirElement dictionary" << filename.c_str()); @@ -48,43 +50,50 @@ DicomDirElement::DicomDirElement() else { char buff[1024]; + char buff2[1024]; std::string strType; - Element elem; + DicomElement elem; DicomDirType type; - while (!from.eof()) { from >> std::ws; from.getline(buff, 1024, ' '); strType = buff; - if( strType == "metaElem" ) - type = DD_META; - else if( strType == "patientElem" ) - type = DD_PATIENT; - else if( strType == "studyElem" ) - type = DD_STUDY; - else if( strType == "serieElem" ) - type = DD_SERIE; - else if( strType == "imageElem" ) + if ( strType == "imageElem" ) type = DD_IMAGE; + else if ( strType == "serieElem" ) + type = DD_SERIE; + else if ( strType == "studyElem" ) + type = DD_STUDY; + else if ( strType == "patientElem" ) + type = DD_PATIENT; + else if ( strType == "metaElem" ) + type = DD_META; else { - gdcmWarningMacro("Unknown type found in the file : " - <> std::hex >> elem.Group >> elem.Elem; + from >> std::hex >> elem.Group >> elem.Elem;// >> elem.VR; + from.getline(buff2, 1024, '"'); + from >> std::ws; + from.getline(buff2, 1024, '"'); + elem.VR[0] = buff2[0]; + elem.VR[1] = buff2[1]; + // std::cout << "VR : [" << elem.VR[0] << elem.VR[1] << "]" << std::endl; // JPR from >> std::ws; from.getline(buff, 1024, '"'); from >> std::ws; from.getline(buff, 1024, '"'); elem.Value = buff; - + AddEntry(type, elem); } from.getline(buff, 1024, '\n'); @@ -108,28 +117,29 @@ DicomDirElement::~DicomDirElement() //----------------------------------------------------------------------------- // Public /** - * \brief Add an entry - * @param type type + * \brief Add an entry to one of the DicomDir Elements + * (Patient, Study, Serie, Image) + * @param type Element type (DD_PATIENT, DD_STUDY, DD_SERIE, DD_IMAGE) * @param elem elem */ -bool DicomDirElement::AddEntry(DicomDirType type, Element const &elem) +bool DicomDirElement::AddEntry(DicomDirType type, DicomElement const &elem) { switch( type ) { - case DD_META : - DicomDirMetaList.push_back(elem); + case DD_IMAGE : + DicomDirImageList.push_back(elem); break; - case DD_PATIENT : - DicomDirPatientList.push_back(elem); + case DD_SERIE : + DicomDirSerieList.push_back(elem); break; case DD_STUDY : DicomDirStudyList.push_back(elem); break; - case DD_SERIE : - DicomDirSerieList.push_back(elem); + case DD_PATIENT : + DicomDirPatientList.push_back(elem); break; - case DD_IMAGE : - DicomDirImageList.push_back(elem); + case DD_META : + DicomDirMetaList.push_back(elem); break; default : return false; @@ -137,6 +147,25 @@ bool DicomDirElement::AddEntry(DicomDirType type, Element const &elem) return true; } +/** + * \brief Add an entry to one of the DicomDir Elements + * (Patient, Study, Serie, Image) + * @param type Element type (DD_PATIENT, DD_STUDY, DD_SERIE, DD_IMAGE) + * @param group Group number of the entry to be added + * @param elem Element number of the entry to be added + * @param vr Value Representation of the entry to be added + */ +void DicomDirElement::AddDicomDirElement(DicomDirType type, + uint16_t group, uint16_t elem, VRKey vr) +{ + DicomElement el; + el.Group = group; + el.Elem = elem; + el.VR = vr; + el.Value = ""; + AddEntry(type, el); +} + //----------------------------------------------------------------------------- // Protected @@ -149,45 +178,44 @@ bool DicomDirElement::AddEntry(DicomDirType type, Element const &elem) * \brief Print all * @param os The output stream to be written to. */ -void DicomDirElement::Print(std::ostream &os) +void DicomDirElement::Print(std::ostream &os,std::string const &) { std::ostringstream s; - std::list::iterator it; - //char greltag[10]; //group element tag - std::string greltag; + std::list::iterator it; + TagKey greltag; s << "Meta Elements :"<Group,it->Elem); + greltag = DictEntry::TranslateToKey(it->Group,it->Elem); s << " (" << greltag << ") = " << it->Value << std::endl; } s << "Patient Elements :"<Group,it->Elem); + greltag = DictEntry::TranslateToKey(it->Group,it->Elem); s << " (" << greltag << ") = " << it->Value << std::endl; } s << "Study Elements :"<Group, it->Elem); + greltag = DictEntry::TranslateToKey(it->Group, it->Elem); s << " (" << greltag << ") = " << it->Value << std::endl; } s << "Serie Elements :"<Group, it->Elem); + greltag = DictEntry::TranslateToKey( it->Group, it->Elem); s << " (" << greltag << ") = " << it->Value << std::endl; } s << "Image Elements :"<Group, it->Elem); + greltag = DictEntry::TranslateToKey(it->Group, it->Elem); s << " (" << greltag << ") = " << it->Value << std::endl; }