X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElValSet.cxx;h=beb99fd364d5dc826c64b7b4c0ccfe39d9a88276;hb=595f90023c498f01bba240043841088ba5d45872;hp=d716e6af4afa7782926199f484256a50146216dd;hpb=97b05dcdd5e9fbc56fac5d4fa37c70fe6fee2645;p=gdcm.git

diff --git a/src/gdcmElValSet.cxx b/src/gdcmElValSet.cxx
index d716e6af..beb99fd3 100644
--- a/src/gdcmElValSet.cxx
+++ b/src/gdcmElValSet.cxx
@@ -1,29 +1,35 @@
 // gdcmElValSet.cxx
 
-#include "gdcm.h"
+#include <sstream>
 #include "gdcmUtil.h"
+#include "gdcmElValSet.h"
 
-TagElValueHT & ElValSet::GetTagHt(void) {
+#define DEBUG 0
+
+
+TagElValueHT & gdcmElValSet::GetTagHt(void) {
 	return tagHt;
 }
 
-void ElValSet::Add(ElValue * newElValue) {
+void gdcmElValSet::Add(gdcmElValue * newElValue) {
 	tagHt [newElValue->GetKey()]  = newElValue;
 	NameHt[newElValue->GetName()] = newElValue;
 }
 
-void ElValSet::Print(ostream & os) {
+void gdcmElValSet::Print(ostream & os) {
 	for (TagElValueHT::iterator tag = tagHt.begin();
 		  tag != tagHt.end();
 		  ++tag){
 		os << tag->first << ": ";
 		os << "[" << tag->second->GetValue() << "]";
 		os << "[" << tag->second->GetName()  << "]";
-		os << "[" << tag->second->GetVR()    << "]" << endl;
+		os << "[" << tag->second->GetVR()    << "]"; 
+		os << " lgr : " << tag->second->GetLength();
+		os << endl;
 	}
 } 
 
-void ElValSet::PrintByName(ostream & os) {
+void gdcmElValSet::PrintByName(ostream & os) {
 	for (TagElValueNameHT::iterator tag = NameHt.begin();
 		  tag != NameHt.end();
 		  ++tag){
@@ -34,235 +40,270 @@ void ElValSet::PrintByName(ostream & os) {
 	}
 }
 
-ElValue* ElValSet::GetElementByNumber(guint32 group, guint32 element) {
+gdcmElValue* gdcmElValSet::GetElementByNumber(guint16 group, guint16 element) {
 	TagKey key = gdcmDictEntry::TranslateToKey(group, element);
 	if ( ! tagHt.count(key))
-		return (ElValue*)0;
-	if (tagHt.count(key) > 1)
-		dbg.Verbose(0, "ElValSet::GetElementByNumber",
-		            "multiple entries for this key (FIXME) !");
+		return (gdcmElValue*)0;
 	return tagHt.find(key)->second;
 }
 
-ElValue* ElValSet::GetElementByName(string TagName) {
+gdcmElValue* gdcmElValSet::GetElementByName(string TagName) {
    if ( ! NameHt.count(TagName))
-      return (ElValue*)0;
-   if (NameHt.count(TagName) > 1)
-      dbg.Verbose(0, "ElValSet::GetElement",
-                  "multipe entries for this key (FIXME) !");
+      return (gdcmElValue*)0;
    return NameHt.find(TagName)->second;
 }
 
-string ElValSet::GetElValueByNumber(guint32 group, guint32 element) {
+string gdcmElValSet::GetElValueByNumber(guint16 group, guint16 element) {
 	TagKey key = gdcmDictEntry::TranslateToKey(group, element);
 	if ( ! tagHt.count(key))
 		return "gdcm::Unfound";
-	if (tagHt.count(key) > 1)
-		dbg.Verbose(0, "ElValSet::GetElValueByNumber",
-		            "multiple entries for this key (FIXME) !");
 	return tagHt.find(key)->second->GetValue();
 }
 
-string ElValSet::GetElValueByName(string TagName) {
+string gdcmElValSet::GetElValueByName(string TagName) {
 	if ( ! NameHt.count(TagName))
 		return "gdcm::Unfound";
-	if (NameHt.count(TagName) > 1)
-		dbg.Verbose(0, "ElValSet::GetElValue",
-		            "multipe entries for this key (FIXME) !");
 	return NameHt.find(TagName)->second->GetValue();
 }
 
-int ElValSet::SetElValueByNumber(string content, guint32 group, guint32 element) {
+
+int gdcmElValSet::SetElValueByNumber(string content,
+                                     guint16 group, guint16 element) {
 	TagKey key = gdcmDictEntry::TranslateToKey(group, element);
 	if ( ! tagHt.count(key))
 		return 0;
-	if (tagHt.count(key) > 1) {
-		dbg.Verbose(0, "ElValSet::SetElValueByNumber",
-		            "multiple entries for this key (FIXME) !");
-		return (0); 
-	}		                       
 	tagHt[key]->SetValue(content);
-
-	// Question : m à j LgrElem ?
-	tagHt[key]->SetLength(strlen(content.c_str()));	 
-
-	// FIXME should we really update the element length ?
 	tagHt[key]->SetLength(content.length());	 
-
-	return(1);		
+	return 1;
 }
 
-int ElValSet::SetElValueByName(string content, string TagName) {
+int gdcmElValSet::SetElValueByName(string content, string TagName) {
 	if ( ! NameHt.count(TagName))
 		return 0;
-	if (NameHt.count(TagName) > 1) {
-		dbg.Verbose(0, "ElValSet::SetElValueByName",
-		            "multipe entries for this key (FIXME) !");
-		return 0;
-	}
-	NameHt.find(TagName)->second->SetValue(content);
-	NameHt.find(TagName)->second->SetLength(strlen(content.c_str()));	 
-	return(1);		
+	NameHt[TagName]->SetValue(content);
+	NameHt[TagName]->SetLength(content.length());
+	return 1;		
 }
 
+/**
+ * \ingroup gdcmElValSet
+ * \brief   Generate a free TagKey i.e. a TagKey that is not present
+ *          in the TagHt dictionary.
+ * @param   group The generated tag must belong to this group.  
+ * @return  The element of tag with given group which is fee.
+ */
+guint32 gdcmElValSet::GenerateFreeTagKeyInGroup(guint16 group) {
+   for (guint32 elem = 0; elem < UINT32_MAX; elem++) {
+      TagKey key = gdcmDictEntry::TranslateToKey(group, elem);
+      if (tagHt.count(key) == 0)
+         return elem;
+   }
+   return UINT32_MAX;
+}
 
-int ElValSet::SetElValueLengthByNumber(guint32 l, guint32 group, guint32 element) {
+int gdcmElValSet::SetElValueLengthByNumber(guint32 length,
+                                           guint16 group, guint16 element) {
 	TagKey key = gdcmDictEntry::TranslateToKey(group, element);
 	if ( ! tagHt.count(key))
 		return 0;
-	if (tagHt.count(key) > 1) {
-		dbg.Verbose(0, "ElValSet::SetElValueLengthByNumber",
-		            "multiple entries for this key (FIXME) !");
-		return (0); 
-	}		                       
-	// m à j LgrElem 
-	tagHt[key]->SetLength(l);	 
-	return(1);		
+	tagHt[key]->SetLength(length);	 
+	return 1 ;		
 }
 
 
-int ElValSet::SetElValueLengthByName(guint32 l, string TagName) {
+int gdcmElValSet::SetElValueLengthByName(guint32 length, string TagName) {
 	if ( ! NameHt.count(TagName))
 		return 0;
-	if (NameHt.count(TagName) > 1) {
-		dbg.Verbose(0, "ElValSet::SetElValueByName",
-		            "multipe entries for this key (FIXME) !");
-		return 0;
-	}
-	NameHt.find(TagName)->second->SetLength(l);	 
-	return(1);		
+	NameHt.find(TagName)->second->SetLength(length);	 
+	return 1 ;		
 }
 
 
-int ElValSet::Write(FILE * _fp) {
 
-// ATTENTION : fonction non terminée (commitée a titre de precaution)
+void gdcmElValSet::UpdateGroupLength(bool SkipSequence, FileType type) {
+   guint16 gr, el;
+   string vr;
+   
+   gdcmElValue *elem;
+   char trash[10];
+   string str_trash;
+   GroupKey key;
+   GroupHT groupHt;
+   TagKey tk;
+   gdcmElValue *elemZ;
+   
+   for (TagElValueHT::iterator tag2 = tagHt.begin();
+        tag2 != tagHt.end();
+        ++tag2){
 
-	guint16 gr, el;
-	guint32 lgr;
-	const char * val;
-	string vr;
-	guint32 val_int32;
-	guint16 val_int16;
-	void *ptr;
-	char str_lgrCalcGroupe[10];
-	
-	string implicitVRTransfertSyntax = "1.2.840.10008.1.2";
-	
-	// Utilisées pour le calcul Group Length
-	int deja = 0;
-	guint32 lgrCalcGroupe=0;
-	ElValue *elem, *elemZ, *elemZPrec;
-	guint16 grCourant = 0;
-	
-	// Question :
-	// Comment pourrait-on tester si on est TrueDicom ou non ,
-	// (FileType est un champ de gdcmHeader ...)
-	//
-
-	// On parcourt la table pour recalculer la longueur des 'elements 0x0000'
-	// au cas ou un tag ai été ajouté par rapport à ce qui a été lu
-	// dans l'image native
-	//
-	// cf : code IdDcmWriteFile dans libido/src/dcmwrite.c
-		
-	for (TagElValueHT::iterator tag = tagHt.begin();
-		  tag != tagHt.end();
-		  ++tag){
+      elem  = tag2->second;
+      gr = elem->GetGroup();
+      el = elem->GetElement();
+      vr = elem->GetVR(); 
+                 
+      sprintf(trash, "%04x", gr);
+      key = trash;
+            
+      if (SkipSequence && vr == "SQ") continue;
+         // pas SEQUENCE en ACR-NEMA
+         // WARNING : pb CERTAIN
+         //           si on est descendu 'a l'interieur' des SQ 
+         //
+         // --> la descente a l'interieur' des SQ 
+         // devra etre faite avec une liste chainee, pas avec une HTable...
+             
+      if ( groupHt.count(key) == 0) { 
+         if (el ==0x0000) {
+            groupHt[key] = 0;
+         } else {
+            groupHt[key] =2 + 2 + 4 + elem->GetLength();
+         } 
+      } else {       
+         if (type = ExplicitVR) {
+            if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") ) {
+               groupHt[key] +=  4;
+            }
+         }
+         groupHt[key] += 2 + 2 + 4 + elem->GetLength(); 
+      } 
+   }
+  
+   unsigned short int gr_bid;
+  
+   for (GroupHT::iterator g = groupHt.begin();
+        g != groupHt.end();
+        ++g){ 
+  
+      tk = g->first + "|0000";
+      sscanf(g->first.c_str(),"%x",&gr_bid);
+               
+      if ( tagHt.count(tk) == 0) { 
+         gdcmDictEntry * tagZ = new gdcmDictEntry(gr_bid, 0x0000, "UL");       
+         elemZ = new gdcmElValue(tagZ);
+         elemZ->SetLength(4);
+         Add(elemZ);
+      } else {
+         elemZ=GetElementByNumber(gr_bid, 0x0000);
+      }
+      str_trash=trash;
+      elemZ->SetValue(str_trash);
+   }   
+   
+   // Liberer groupHt !
+   
+}
 
-		elem = tag->second;
-		printf("gr %04x el %04x lgr %d\n",elem->GetGroup(), elem->GetElement(), elem->GetLength());
-	
-		if ( (elem->GetGroup() != grCourant) &&	  
-			 (elem->GetGroup() != 0xfffe)	) { 	// On arrive sur un nv Groupe
-			 
-		printf("Nouv Groupegr %04x el %04x \n",elem->GetGroup(), elem->GetElement());
-
-			elemZ = elem; 
-			 
-			if(elemZ->GetElement() != 0x0000) { 	// pas d'element 'Lgr groupe'
-				// On crée
-			 	gdcmDictEntry * tagZ = new gdcmDictEntry(grCourant, 0x0000, "UL");
-				elemZ = new ElValue(tagZ); // on le cree
-				elemZ->SetLength(4);
-				Add(elemZ);	 				 // On l'accroche à sa place	
-			}	
-			
-			if (deja) {
-				sprintf(str_lgrCalcGroupe,"%d",lgrCalcGroupe);
-				elemZPrec->SetValue(str_lgrCalcGroupe);
-				lgrCalcGroupe = 0;
-			}
-			deja = 1;
-			
-			lgrCalcGroupe =  12; //2 + 2 + 4 + 4; // Gr + Num + Lgr + LgrGroupe
-			printf ("lgrCalcGroupe %d\n",lgrCalcGroupe);
-			
-			elemZPrec = elemZ;
-	 		grCourant = elem->GetGroup();
-							
-		} else {		// On n'EST PAS sur un nv Groupe
-		
-			printf ("lgrCalcGroupe avant : %d LgrElem %d\n",lgrCalcGroupe,elem->GetLength());
-
-			lgrCalcGroupe += 2 + 2 + 4 + elem->GetLength();  // Gr + Num + Lgr + LgrElem 
-			
-			printf ("lgrCalcGroupe apres %d\n",lgrCalcGroupe);
-
-		}		
-	}
+void gdcmElValSet::WriteElements(FileType type, FILE * _fp) {
+   guint16 gr, el;
+   guint32 lgr;
+   const char * val;
+   string vr;
+   guint32 val_uint32;
+   guint16 val_uint16;
+   
+   vector<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)
+
+   for (TagElValueHT::iterator tag2=tagHt.begin();
+        tag2 != tagHt.end();
+        ++tag2){
+
+      gr =  tag2->second->GetGroup();
+      el =  tag2->second->GetElement();
+      lgr = tag2->second->GetLength();
+      val = tag2->second->GetValue().c_str();
+      vr =  tag2->second->GetVR();
+      if(DEBUG)printf ("%04x %04x [%s] : [%s]\n",gr, el, vr.c_str(), val);
+
+      if ( type == ACR ) { 
+         if (gr < 0x0008) continue;
+         if (gr %2)   continue;
+         if (vr == "SQ" ) continue;
+      } 
+
+      fwrite ( &gr,(size_t)2 ,(size_t)1 ,_fp);  //group
+      fwrite ( &el,(size_t)2 ,(size_t)1 ,_fp);  //element
+
+      if ( (type == ExplicitVR) && (gr <= 0x0002) ) {
+         // On est en EXPLICIT VR
+         guint16 z=0, shortLgr;
+         fwrite (vr.c_str(),(size_t)2 ,(size_t)1 ,_fp);
+
+         if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") ) {
+            fwrite ( &z,  (size_t)2 ,(size_t)1 ,_fp);
+            fwrite ( &lgr,(size_t)4 ,(size_t)1 ,_fp);
+
+         } else {
+            shortLgr=lgr;
+            fwrite ( &shortLgr,(size_t)2 ,(size_t)1 ,_fp);
+         }
+      } else {
+         fwrite ( &lgr,(size_t)4 ,(size_t)1 ,_fp);
+      }
+
+      tokens.erase(tokens.begin(),tokens.end());
+      Tokenize (tag2->second->GetValue(), tokens, "\\");
+
+      if (vr == "US" || vr == "SS") {
+         for (unsigned int i=0; i<tokens.size();i++) {
+            val_uint16 = atoi(tokens[i].c_str());
+            ptr = &val_uint16;
+            fwrite ( ptr,(size_t)2 ,(size_t)1 ,_fp);
+         }
+         continue;
+      }
+      if (vr == "UL" || vr == "SL") {
+         for (unsigned int i=0; i<tokens.size();i++) {
+            val_uint32 = atoi(tokens[i].c_str());
+            ptr = &val_uint32;
+            fwrite ( ptr,(size_t)4 ,(size_t)1 ,_fp);
+         }
+         continue;
+      }
+
+      // Les pixels ne sont pas chargés dans l'element !
+      if ((gr == 0x7fe0) && (el == 0x0010) ) break;
+
+      fwrite ( val,(size_t)lgr ,(size_t)1 ,_fp); //valeur Elem
+   }
+}
+
+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 si le DcmHeader vient d'un fichoer 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
 	
-	// Si on fait de l'implicit VR little Endian 
-	// (pour moins se fairche sur processeur INTEL)
-	// penser a forcer le TRANSFERT SYNTAX UID
-				
-	SetElValueByNumber(implicitVRTransfertSyntax, 0x0002, 0x0010);	
-	SetElValueLengthByNumber(18, 0x0002, 0x0010);  // Le 0 de fin de chaine doit etre stocké, dans ce cas	
-		
-	// restent à tester les echecs en écriture (apres chaque fwrite)
 	
-	for (TagElValueHT::iterator tag2 = tagHt.begin();
-		  tag2 != tagHt.end();
-		  ++tag2){
-
-		// Question :
-		// peut-on se passer des affectations?
-		// - passer l'adresse du resultat d'une fonction (???)
-		// - acceder au champ sans passer par un accesseur ?
-		
-		gr =  tag2->second->GetGroup();
-		el =  tag2->second->GetElement();
-		lgr = tag2->second->GetLength();
-		val = tag2->second->GetValue().c_str();
-		vr =  tag2->second->GetVR();
-			
-		fwrite ( &gr,(size_t)2 ,(size_t)1 ,_fp); 	//group
-		fwrite ( &el,(size_t)2 ,(size_t)1 ,_fp); 	//element
-		
-		//fwrite ( vr,(size_t)2 ,(size_t)1 ,_fp); 	//VR
-		
-		// si on n'est pas en IMPLICIT VR voir pb (lgr  + VR)
-		
-		fwrite ( &lgr,(size_t)4 ,(size_t)1 ,_fp); 			//lgr
-		
-		if (vr == "US" || vr == "SS") {
-			val_int16 = atoi(val);
-			ptr = &val_int16;
-			fwrite ( ptr,(size_t)2 ,(size_t)1 ,_fp);	
-			continue;
-		}
-		if (vr == "UL" || vr == "SL") {
-			val_int32 = atoi(val);
-			ptr = &val_int32;
-			fwrite ( ptr,(size_t)4 ,(size_t)1 ,_fp);	
-			continue;
-		}	
-		
-		// Les pixels ne sont pas chargés dans l'element !
-		if ((gr == 0x7fe0) && (el == 0x0010) ) break;
-
-		fwrite ( val,(size_t)lgr ,(size_t)1 ,_fp); //valeur Elem
-	}
-		
-	return(1);
+   if (type == ExplicitVR) {
+      string explicitVRTransfertSyntax = "1.2.840.10008.1.2.1";
+      SetElValueByNumber(explicitVRTransfertSyntax, 0x0002, 0x0010);
+      // See above comment 
+      SetElValueLengthByNumber(20, 0x0002, 0x0010);
+   }
+
+   if ( (type == ImplicitVR) || (type == ExplicitVR) )
+      UpdateGroupLength(false,type);
+   if ( type == ACR)
+      UpdateGroupLength(true,ACR);
+
+   WriteElements(type, _fp);
+
+   return(1);
 }