Program: gdcm
Module: $RCSfile: gdcmDicomDirElement.cxx,v $
Language: C++
- Date: $Date: 2004/06/20 18:08:47 $
- Version: $Revision: 1.12 $
+ Date: $Date: 2005/01/06 20:03:26 $
+ Version: $Revision: 1.23 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
- http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+ http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
=========================================================================*/
-#include <fstream>
-#include <stdio.h> // For sprintf
-#include <iostream>
-
#include "gdcmDicomDirElement.h"
#include "gdcmUtil.h"
#include "gdcmDebug.h"
#include "gdcmDictSet.h"
+#include <fstream>
+#include <iostream>
+namespace gdcm
+{
+void FillDefaultDIRDict(DicomDirElement *dde);
//-----------------------------------------------------------------------------
// Constructor / Destructor
* \brief constructor : populates the chained lists
* from the file 'Dicts/DicomDir.dic'
*/
- gdcmDicomDirElement::gdcmDicomDirElement(void) {
- std::string filename=gdcmDictSet::BuildDictPath() + std::string(DICT_ELEM);
+DicomDirElement::DicomDirElement()
+{
+ std::string filename = DictSet::BuildDictPath() + 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(!from)
+ {
+ dbg.Verbose(2,
+ "DicomDirElement::DicomDirElement: can't open dictionary",
+ filename.c_str());
+ FillDefaultDIRDict( this );
+ }
+ else
+ {
+ char buff[1024];
+ std::string type;
+ Element elem;
- if( (type=="metaElem") || (type=="patientElem") ||
- (type=="studyElem") || (type=="serieElem") ||
- (type=="imageElem") )
+ while (!from.eof())
{
- 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")
- DicomDirMetaList.push_back(elem);
- else if(type=="patientElem")
- DicomDirPatientList.push_back(elem);
- else if(type=="studyElem")
- DicomDirStudyList.push_back(elem);
- else if(type=="serieElem")
- DicomDirSerieList.push_back(elem);
- else if(type=="imageElem")
- DicomDirImageList.push_back(elem);
+ from >> std::ws;
+ from.getline(buff, 1024, ' ');
+ type = buff;
+
+ if( type == "metaElem" || type == "patientElem" ||
+ type == "studyElem" || type == "serieElem" ||
+ type == "imageElem" )
+ {
+ from >> std::hex >> elem.Group >> elem.Elem;
+
+ from >> std::ws;
+ from.getline(buff, 1024, '"');
+ from >> std::ws;
+ from.getline(buff, 1024, '"');
+ elem.Value = buff;
+
+ AddNewEntry(type, elem);
+ }
+ from.getline(buff, 1024, '\n');
}
- from.getline(buff, 1024, '\n');
+ from.close();
}
- from.close();
}
/**
- * \ingroup gdcmDicomDirElement
+ * \ingroup DicomDirElement
* \brief canonical destructor
*/
- gdcmDicomDirElement::~gdcmDicomDirElement() {
+DicomDirElement::~DicomDirElement()
+{
DicomDirMetaList.clear();
DicomDirPatientList.clear();
DicomDirStudyList.clear();
//-----------------------------------------------------------------------------
// Print
/**
- * \ingroup gdcmDicomDirElement
+ * \ingroup DicomDirElement
* \brief Print all
* \todo add a 'Print Level' check
* @param os The output stream to be written to.
*/
-void gdcmDicomDirElement::Print(std::ostream &os) {
+void DicomDirElement::Print(std::ostream &os)
+{
std::ostringstream s;
- std::list<gdcmElement>::iterator it;
- char greltag[10]; //group element tag
+ std::list<Element>::iterator it;
+ //char greltag[10]; //group element tag
+ std::string greltag;
s << "Meta Elements :"<<std::endl;
- for (it = DicomDirMetaList.begin();it!=DicomDirMetaList.end();++it)
+ for (it = DicomDirMetaList.begin(); it != DicomDirMetaList.end(); ++it)
{
- sprintf(greltag,"%04x|%04x ",it->group,it->elem);
- s << " ("<<greltag<<") = "<< it->value<<std::endl;
+ greltag = Util::Format("%04x|%04x ",it->Group,it->Elem);
+ s << " (" << greltag << ") = " << it->Value << std::endl;
}
s << "Patient Elements :"<<std::endl;
- for (it = DicomDirPatientList.begin();it!=DicomDirPatientList.end();++it)
+ for (it = DicomDirPatientList.begin(); it != DicomDirPatientList.end(); ++it)
{
- sprintf(greltag,"%04x|%04x ",it->group,it->elem);
- s << " ("<<greltag<<") = "<< it->value<<std::endl;
+ greltag = Util::Format("%04x|%04x ",it->Group,it->Elem);
+ s << " (" << greltag << ") = " << it->Value << std::endl;
}
s << "Study Elements :"<<std::endl;
- for (it = DicomDirStudyList.begin();it!=DicomDirStudyList.end();++it)
+ for (it = DicomDirStudyList.begin(); it != DicomDirStudyList.end(); ++it)
{
- sprintf(greltag,"%04x|%04x ",it->group,it->elem);
- s << " ("<<greltag<<") = "<< it->value<<std::endl;
+ greltag = Util::Format("%04x|%04x ", it->Group, it->Elem);
+ s << " (" << greltag << ") = " << it->Value << std::endl;
}
s << "Serie Elements :"<<std::endl;
- for (it = DicomDirSerieList.begin();it!=DicomDirSerieList.end();++it)
+ for (it = DicomDirSerieList.begin(); it != DicomDirSerieList.end(); ++it)
{
- sprintf(greltag,"%04x|%04x ",it->group,it->elem);
- s << " ("<<greltag<<") = "<< it->value<<std::endl;
+ greltag = Util::Format("%04x|%04x ", it->Group, it->Elem);
+ s << " (" << greltag << ") = " << it->Value << std::endl;
}
s << "Image Elements :"<<std::endl;
- for (it = DicomDirImageList.begin();it!=DicomDirImageList.end();++it)
+ for (it = DicomDirImageList.begin(); it != DicomDirImageList.end(); ++it)
{
- sprintf(greltag,"%04x|%04x ",it->group,it->elem);
- s << " ("<<greltag<<") = "<< it->value<<std::endl;
+ greltag = Util::Format("%04x|%04x ", it->Group, it->Elem);
+ s << " (" << greltag << ") = " << it->Value << std::endl;
}
os << s.str();
//-----------------------------------------------------------------------------
// Public
+bool DicomDirElement::AddNewEntry(std::string const &type,
+ Element const &elem)
+{
+ if( type == "metaElem" )
+ {
+ DicomDirMetaList.push_back(elem);
+ }
+ else if( type == "patientElem" )
+ {
+ DicomDirPatientList.push_back(elem);
+ }
+ else if( type == "studyElem" )
+ {
+ DicomDirStudyList.push_back(elem);
+ }
+ else if( type == "serieElem" )
+ {
+ DicomDirSerieList.push_back(elem);
+ }
+ else if( type == "imageElem" )
+ {
+ DicomDirImageList.push_back(elem);
+ }
+ else
+ {
+ return false;
+ }
+ return true;
+}
//-----------------------------------------------------------------------------
// Protected
// Private
//-----------------------------------------------------------------------------
+
+} // end namespace gdcm
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff