Program: gdcm
Module: $RCSfile: gdcmDicomDirElement.cxx,v $
Language: C++
- Date: $Date: 2004/09/27 08:39:06 $
- Version: $Revision: 1.16 $
+ Date: $Date: 2004/10/12 04:35:44 $
+ Version: $Revision: 1.20 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
=========================================================================*/
-#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
+{
//-----------------------------------------------------------------------------
// Constructor / Destructor
* \brief constructor : populates the chained lists
* from the file 'Dicts/DicomDir.dic'
*/
-gdcmDicomDirElement::gdcmDicomDirElement()
+DicomDirElement::DicomDirElement()
{
- std::string filename = gdcmDictSet::BuildDictPath() + std::string(DICT_ELEM);
+ std::string filename = DictSet::BuildDictPath() + std::string(DICT_ELEM);
std::ifstream from(filename.c_str());
- dbg.Error(!from, "gdcmDicomDirElement::gdcmDicomDirElement: can't open dictionary",
+ dbg.Error(!from, "DicomDirElement::DicomDirElement: can't open dictionary",
filename.c_str());
char buff[1024];
std::string type;
- gdcmElement elem;
+ Element elem;
while (!from.eof())
{
- eatwhite(from);
+ from >> std::ws;
from.getline(buff, 1024, ' ');
type = buff;
(type=="studyElem") || (type=="serieElem") ||
(type=="imageElem") )
{
- from >> std::hex >> elem.group >> elem.elem;
+ from >> std::hex >> elem.Group >> elem.Elem;
- eatwhite(from);
+ from >> std::ws;
from.getline(buff, 1024, '"');
- eatwhite(from);
+ from >> std::ws;
from.getline(buff, 1024, '"');
- elem.value = buff;
+ elem.Value = buff;
if( type == "metaElem" )
{
}
/**
- * \ingroup gdcmDicomDirElement
+ * \ingroup DicomDirElement
* \brief canonical destructor
*/
-gdcmDicomDirElement::~gdcmDicomDirElement()
+DicomDirElement::~DicomDirElement()
{
DicomDirMetaList.clear();
DicomDirPatientList.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)
{
- 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)
{
- 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)
{
- 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)
{
- 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)
{
- 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();
// Private
//-----------------------------------------------------------------------------
+
+} // end namespace gdcm