#include "gdcmUtil.h"
#include "gdcmElValSet.h"
#include "gdcmTS.h"
-using namespace std;
gdcmElValSet::~gdcmElValSet() {
for (TagElValueHT::iterator tag = tagHt.begin(); tag != tagHt.end(); ++tag) {
* @return
*/
int gdcmElValSet::CheckIfExistByNumber(guint16 Group, guint16 Elem ) {
- string key = TranslateToKey(Group, Elem );
+ std::string key = TranslateToKey(Group, Elem );
return (tagHt.count(key));
}
size_t o;
short int g, e;
TSKey v;
- char * d;
- string d2;
+ std::string d2;
gdcmTS * ts = gdcmGlobal::GetTS();
for (TagElValueHT::iterator tag = tagHt.begin();
e = tag->second->GetElement();
v = tag->second->GetValue();
o = tag->second->GetOffset();
- //d = _CreateCleanString(v); // replace non printable characters by '.'
- d2=v;
+ d2 = _CreateCleanString(v); // replace non printable characters by '.'
os << tag->first << ": ";
os << " lgr : " << tag->second->GetLength();
os << ", Offset : " << o;
- os << " x(" << hex << o << dec << ") ";
+ os << " x(" << std::hex << o << std::dec << ") ";
os << "\t[" << tag->second->GetVR() << "]";
os << "\t[" << tag->second->GetName() << "]";
os << "\t[" << d2 << "]";
os << " ==>\t[" << ts->GetValue(v) << "]";
}
}
- //free(d);
- os << endl;
+ os << std::endl;
}
}
os << tag->first << ": ";
os << "[" << tag->second->GetValue() << "]";
os << "[" << tag->second->GetKey() << "]";
- os << "[" << tag->second->GetVR() << "]" << endl;
+ os << "[" << tag->second->GetVR() << "]" << std::endl;
}
}
* \brief
* @return
*/
-gdcmElValue* gdcmElValSet::GetElementByName(string TagName) {
+gdcmElValue* gdcmElValSet::GetElementByName(std::string TagName) {
if ( ! NameHt.count(TagName))
return (gdcmElValue*)0;
return NameHt.find(TagName)->second;
* @param element
* @return
*/
-string gdcmElValSet::GetElValueByNumber(guint16 group, guint16 element) {
+std::string gdcmElValSet::GetElValueByNumber(guint16 group, guint16 element) {
TagKey key = gdcmDictEntry::TranslateToKey(group, element);
if ( ! tagHt.count(key))
return GDCM_UNFOUND;
* \brief
* @return
*/
-string gdcmElValSet::GetElValueByName(string TagName) {
+std::string gdcmElValSet::GetElValueByName(std::string TagName) {
if ( ! NameHt.count(TagName))
return GDCM_UNFOUND;
return NameHt.find(TagName)->second->GetValue();
* @param element
* @return
*/
-int gdcmElValSet::SetElValueByNumber(string content,
+int gdcmElValSet::SetElValueByNumber(std::string content,
guint16 group, guint16 element) {
TagKey key = gdcmDictEntry::TranslateToKey(group, element);
if ( ! tagHt.count(key))
return 0;
tagHt[key]->SetValue(content);
- string vr = tagHt[key]->GetVR();
+ std::string vr = tagHt[key]->GetVR();
guint32 lgr;
if( (vr == "US") || (vr == "SS") )
* @param TagName
* @return
*/
-int gdcmElValSet::SetElValueByName(string content, string TagName) {
+int gdcmElValSet::SetElValueByName(std::string content, std::string TagName) {
if ( ! NameHt.count(TagName))
return 0;
NameHt[TagName]->SetValue(content);
- string vr = NameHt[TagName]->GetVR();
+ std::string vr = NameHt[TagName]->GetVR();
guint32 lgr;
if( (vr == "US") || (vr == "SS") )
* @param TagName
* @return
*/
-int gdcmElValSet::SetElValueLengthByName(guint32 length, string TagName) {
+int gdcmElValSet::SetElValueLengthByName(guint32 length, std::string TagName) {
if ( ! NameHt.count(TagName))
return 0;
NameHt.find(TagName)->second->SetLength(length);
*/
void gdcmElValSet::UpdateGroupLength(bool SkipSequence, FileType type) {
guint16 gr, el;
- string vr;
+ std::string vr;
gdcmElValue *elem;
char trash[10];
- string str_trash;
+ std::string str_trash;
GroupKey key;
GroupHT groupHt; // to hold the length of each group
guint16 gr, el;
guint32 lgr;
const char * val;
- string vr;
+ std::string vr;
guint32 val_uint32;
guint16 val_uint16;
- vector<string> tokens;
+ vector<std::string> tokens;
void *ptr;
val = tag2->second->GetValue().c_str();
vr = tag2->second->GetVR();
- // cout << "Tag "<< hex << gr << " " << el << "\n";
+ // cout << "Tag "<< std::hex << gr << " " << el << std::endl;
if ( type == ACR ) {
if (gr < 0x0008) continue; // ignore pure DICOM V3 groups
int gdcmElValSet::Write(FILE * _fp, FileType type) {
if (type == ImplicitVR) {
- string implicitVRTransfertSyntax = "1.2.840.10008.1.2";
+ std::string implicitVRTransfertSyntax = "1.2.840.10008.1.2";
SetElValueByNumber(implicitVRTransfertSyntax, 0x0002, 0x0010);
//FIXME Refer to standards on page 21, chapter 6.2 "Value representation":
// no way
if (type == ExplicitVR) {
- string explicitVRTransfertSyntax = "1.2.840.10008.1.2.1";
+ std::string explicitVRTransfertSyntax = "1.2.840.10008.1.2.1";
SetElValueByNumber(explicitVRTransfertSyntax, 0x0002, 0x0010);
// See above comment
SetElValueLengthByNumber(20, 0x0002, 0x0010);