Program: gdcm
Module: $RCSfile: gdcmDicomDirElement.cxx,v $
Language: C++
- Date: $Date: 2004/06/23 03:36:24 $
- Version: $Revision: 1.13 $
+ Date: $Date: 2004/10/08 04:43:37 $
+ Version: $Revision: 1.17 $
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 <stdio.h> // For sprintf
+#include <iostream>
//-----------------------------------------------------------------------------
// Constructor / Destructor
* \brief constructor : populates the chained lists
* from the file 'Dicts/DicomDir.dic'
*/
-gdcmDicomDirElement::gdcmDicomDirElement() {
- std::string filename=gdcmDictSet::BuildDictPath() + std::string(DICT_ELEM);
+gdcmDicomDirElement::gdcmDicomDirElement()
+{
+ 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());
+ 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);
+ while (!from.eof())
+ {
+ from >> std::ws; // used to be eatwhite(from);
from.getline(buff, 1024, ' ');
type = buff;
{
from >> std::hex >> elem.group >> elem.elem;
- eatwhite(from);
+ from >> std::ws; // used to be eatwhite(from);
from.getline(buff, 1024, '"');
- eatwhite(from);
+ from >> std::ws; // Used to be eatwhite(from);
from.getline(buff, 1024, '"');
elem.value = buff;
- if(type=="metaElem")
- DicomDirMetaList.push_back(elem);
- else if(type=="patientElem")
+ if( type == "metaElem" )
+ {
+ DicomDirMetaList.push_back(elem);
+ }
+ else if( type == "patientElem" )
+ {
DicomDirPatientList.push_back(elem);
- else if(type=="studyElem")
+ }
+ else if( type == "studyElem" )
+ {
DicomDirStudyList.push_back(elem);
- else if(type=="serieElem")
+ }
+ else if( type == "serieElem" )
+ {
DicomDirSerieList.push_back(elem);
- else if(type=="imageElem")
+ }
+ else if( type == "imageElem" )
+ {
DicomDirImageList.push_back(elem);
+ }
}
from.getline(buff, 1024, '\n');
}
* \ingroup gdcmDicomDirElement
* \brief canonical destructor
*/
-gdcmDicomDirElement::~gdcmDicomDirElement() {
+gdcmDicomDirElement::~gdcmDicomDirElement()
+{
DicomDirMetaList.clear();
DicomDirPatientList.clear();
DicomDirStudyList.clear();
* \todo add a 'Print Level' check
* @param os The output stream to be written to.
*/
-void gdcmDicomDirElement::Print(std::ostream &os) {
+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 = 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;
}
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;
}
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;
}
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;
}
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;