// gdcmElValSet.cxx
-#ifdef _MSC_VER
-// 'identifier' : class 'type' needs to have dll-interface to be used by
-// clients of class 'type2'
-#pragma warning ( disable : 4251 )
-// 'identifier' : identifier was truncated to 'number' characters in the
-// debug information
-#pragma warning ( disable : 4786 )
-#endif //_MSC_VER
-
-#include <sstream>
#include "gdcmUtil.h"
#include "gdcmElValSet.h"
#include "gdcmTS.h"
-using namespace std;
+#include <sstream>
gdcmElValSet::~gdcmElValSet() {
for (TagElValueHT::iterator tag = tagHt.begin(); tag != tagHt.end(); ++tag) {
return tagHt;
}
+
+ListTag & gdcmElValSet::GetListElem(void) {
+ return listElem;
+}
+
/**
* \ingroup gdcmElValSet
* \brief
void gdcmElValSet::Add(gdcmElValue * newElValue) {
tagHt [newElValue->GetKey()] = newElValue;
NameHt[newElValue->GetName()] = newElValue;
+
+// WARNING : push_bash in listElem ONLY during ParseHeader
+// TODO : something to allow further Elements addition
+// position to be taken care of !
+ listElem.push_back(newElValue);
}
/**
* @return
*/
int gdcmElValSet::CheckIfExistByNumber(guint16 Group, guint16 Elem ) {
- string key = TranslateToKey(Group, Elem );
+ std::string key = TranslateToKey(Group, Elem );
return (tagHt.count(key));
}
* \ingroup gdcmElValSet
* \brief
*/
-void gdcmElValSet::Print(ostream & os) {
+void gdcmElValSet::Print(std::ostream & os) {
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=d;
+ 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;
}
+
+ std::cout << "----------------------------------------------" << std::endl;
+
+ //for (ListTag::iterator i = listElem.begin();
+
+ char tag[9];
+
+ for (std::list<gdcmElValue*>::iterator i = listElem.begin();
+ i != listElem.end();
+ ++i){
+ sprintf(tag,"%04x|%04x",(*i)->GetGroup(),(*i)->GetElement());
+ g = (*i)->GetGroup();
+ e = (*i)->GetElement();
+ v = (*i)->GetValue();
+ o = (*i)->GetOffset();
+ d2 = _CreateCleanString(v); // replace non printable characters by '.'
+ //os << std::hex <<g << "|" << e << std::dec << ": ";
+ os << tag << " : ";
+ os << " lgr : " << (*i)->GetLength();
+ os << ", Offset : " << o;
+ os << " x(" << std::hex << o << std::dec << ") ";
+ os << "\t[" << (*i)->GetVR() << "]";
+ os << "\t[" << (*i)->GetName() << "]";
+ os << "\t[" << d2 << "]";
+
+ // Display the UID value (instead of displaying the rough code)
+ if (g == 0x0002) { // Any more to be displayed ?
+ if ( (e == 0x0010) || (e == 0x0002) )
+ os << " ==>\t[" << ts->GetValue(v) << "]";
+ } else {
+ if (g == 0x0008) {
+ if ( (e == 0x0016) || (e == 0x1150) )
+ os << " ==>\t[" << ts->GetValue(v) << "]";
+ }
+ }
+ os << std::endl;
+
+ }
+
}
/**
* \ingroup gdcmElValSet
* \brief
*/
-void gdcmElValSet::PrintByName(ostream & os) {
+void gdcmElValSet::PrintByName(std::ostream & os) {
for (TagElValueNameHT::iterator tag = NameHt.begin();
tag != NameHt.end();
++tag){
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();
+ int l = content.length();
+ if(l%2) { // Odd length are padded with a space (020H).
+ l++;
+ content = content + '\0';
+ }
+ tagHt[key]->SetValue(content);
+
+ std::string vr = tagHt[key]->GetVR();
guint32 lgr;
if( (vr == "US") || (vr == "SS") )
else if( (vr == "UL") || (vr == "SL") )
lgr = 4;
else
- lgr = content.length();
+ lgr = l;
tagHt[key]->SetLength(lgr);
+
+
+
return 1;
}
* @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;
+ int l = content.length();
+ if(l%2) { // Odd length are padded with a space (020H).
+ l++;
+ // Well. I know that '/0' is NOT a space
+ // but it doesn't work with a space.
+ // Use hexedit and see 0002|0010 value (Transfer Syntax UID)
+ content = content + '\0';
+ }
NameHt[TagName]->SetValue(content);
- string vr = NameHt[TagName]->GetVR();
+
+ std::string vr = NameHt[TagName]->GetVR();
guint32 lgr;
if( (vr == "US") || (vr == "SS") )
TagKey key = gdcmDictEntry::TranslateToKey(group, element);
if ( ! tagHt.count(key))
return 0;
+ if (length%2) length++; // length must be even
tagHt[key]->SetLength(length);
return 1 ;
}
* @param TagName
* @return
*/
-int gdcmElValSet::SetElValueLengthByName(guint32 length, string TagName) {
+int gdcmElValSet::SetElValueLengthByName(guint32 length, std::string TagName) {
if ( ! NameHt.count(TagName))
return 0;
+ if (length%2) length++; // length must be even
NameHt.find(TagName)->second->SetLength(length);
return 1 ;
}
*/
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;
+ std::vector<std::string> tokens;
void *ptr;
// Tout ceci ne marche QUE parce qu'on est sur un proc Little Endian
- // restent à tester les echecs en écriture (apres chaque fwrite)
+ // restent a tester les echecs en ecriture (apres chaque fwrite)
for (TagElValueHT::iterator tag2=tagHt.begin();
tag2 != tagHt.end();
val = tag2->second->GetValue().c_str();
vr = tag2->second->GetVR();
- // cout << "Tag "<< hex << gr << " " << el << "\n";
+ // std::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";
- SetElValueByNumber(implicitVRTransfertSyntax, 0x0002, 0x0010);
-
- //FIXME Refer to standards on page 21, chapter 6.2 "Value representation":
- // values with a VR of UI shall be padded with a single trailing null
- // Dans le cas suivant on doit pader manuellement avec un 0
-
- SetElValueLengthByNumber(18, 0x0002, 0x0010);
- }
// Question :
- // Comment pourrait-on savoir si le DcmHeader vient d'un fichier DicomV3 ou non ,
+ // Comment pourrait-on savoir si le DcmHeader vient d'un fichier DicomV3 ou non
// (FileType est un champ de gdcmHeader ...)
// WARNING : Si on veut ecrire du DICOM V3 a partir d'un DcmHeader ACR-NEMA
- // no way
-
- if (type == ExplicitVR) {
- string explicitVRTransfertSyntax = "1.2.840.10008.1.2.1";
- SetElValueByNumber(explicitVRTransfertSyntax, 0x0002, 0x0010);
- // See above comment
- SetElValueLengthByNumber(20, 0x0002, 0x0010);
- }
+ // no way
+ // a moins de se livrer a un tres complique ajout des champs manquants.
+ // faire un CheckAndCorrectHeader (?)
if ( (type == ImplicitVR) || (type == ExplicitVR) )
UpdateGroupLength(false,type);
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff