Program: gdcm
Module: $RCSfile: gdcmDicomDirElement.cxx,v $
Language: C++
- Date: $Date: 2005/11/04 15:29:59 $
- Version: $Revision: 1.42 $
+ 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
#include <fstream>
#include <iostream>
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
/// \brief auto generate function, to fill up the default elements for
else
{
char buff[1024];
+ char buff2[1024];
std::string strType;
DicomElement elem;
DicomDirType type;
-
while (!from.eof())
{
from >> std::ws;
if ( type!=DD_UNKNOWN )
{
- from >> 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');
* @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)
+ uint16_t group, uint16_t elem, VRKey vr)
{
DicomElement el;
el.Group = group;
el.Elem = elem;
+ el.VR = vr;
el.Value = "";
AddEntry(type, el);
}
{
std::ostringstream s;
std::list<DicomElement>::iterator it;
- //char greltag[10]; //group element tag
TagKey greltag;
s << "Meta Elements :"<<std::endl;