X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOTreeAttributeDescriptor.cpp;h=13616ce47fe574973d642066e3eb508a44e4129a;hb=f1caae70392f96f30dd90eb073be6be10fbf1caa;hp=f01e26000b1b1c6a6cf9b0946c54b04facc77a28;hpb=cbf693fa62cd51f4ca5c881838bbb609edc447b0;p=creaImageIO.git

diff --git a/src2/creaImageIOTreeAttributeDescriptor.cpp b/src2/creaImageIOTreeAttributeDescriptor.cpp
index f01e260..13616ce 100644
--- a/src2/creaImageIOTreeAttributeDescriptor.cpp
+++ b/src2/creaImageIOTreeAttributeDescriptor.cpp
@@ -1,42 +1,120 @@
 #include <creaImageIOTreeAttributeDescriptor.h>
+#include <creaImageIOSystem.h>
 
 #include <gdcmGlobal.h>
 #include <gdcmDictSet.h>
 
+#include <boost/algorithm/string/replace.hpp>
+
 namespace creaImageIO
 {
 
   namespace tree
   {
 
+    //========================================================================
+    void AttributeDescriptor::CleanName(std::string& str) const
+    {
+      // quote must be doubled for SQL
+      //    crea::Utils::Replace( str, "'", "''" );
+      boost::algorithm::replace_all(str,"'","''");
+      // Found strange strings which contained NULL char INSIDE string 
+      int i,size=str.size();
+      for (i=0;i<size;++i) 
+	{
+	  if (str[i]==0) 
+	    {
+	      str = str.substr(0,i);
+	      break;
+	    }
+	}
+    }
+    //========================================================================
+
+    //=====================================================================
+    // Ctor with key, name and flags
+     AttributeDescriptor::AttributeDescriptor(const std::string& key,
+					     const std::string& name,
+					     unsigned int flags)
+      : mKey(key), mName(name), mGroup(0), mElement(0), mFlags(flags)
+    {
+
+      CleanName(mName);
+      GimmickDebugMessage(3,"AttributeDescriptor : '"<<key
+			  <<"' ["<<flags<<"]"<<std::endl);
+      GimmickDebugMessage(3,"='"<<mName<<"'"<<std::endl);
+    }
 
-    // Ctor with name and flags
-    // If the name is of the form "1056|8948" (a pipe at 5th position)
-    // it is interpreted as a Dicom Tag 
+    //=====================================================================
+
+     //=====================================================================
+   // Ctor with dicom group, elem and flags
+    // The key is built as 'Dgroup_elem'
     // The user name is retreived from dicom dictionnary
-    // and the group and elem are filled
-    AttributeDescriptor::AttributeDescriptor(const std::string& key,
+    AttributeDescriptor::AttributeDescriptor(unsigned short group,
+					     unsigned short element,
 					     unsigned int flags)
-      : mKey(key), mGroup(0), mElement(0), mFlags(flags)
+      : mGroup(group), mElement(element), mFlags(flags)
     {
-      // Is the key a Dicom tag ?
-      if ((key.size()==9)&&(key[4]=='|'))
+      
+      //GDCM_NAME_SPACE::TagKey tag(group,element);
+      char ctag[12];
+      sprintf(ctag,"D%04x_%04x",group,element);
+      mKey = ctag;
+
+      GimmickDebugMessage(3,"AttributeDescriptor : '"<<mKey
+			  <<"' ["<<flags<<"]"<<std::endl);
+
+      // Retrieve the name from gdcm dict
+      GDCM_NAME_SPACE::DictEntry* entry =
+	GDCM_NAME_SPACE::Global::GetDicts()
+	->GetDefaultPubDict()->GetEntry(mGroup,mElement);
+
+      if (entry)
 	{
-	  // Decode group & elem
-	  sscanf(key.c_str(),"%04x|%04x",&mGroup,&mElement);
-	  // Retrieve the name from gdcm dict
-	  GDCM_NAME_SPACE::DictEntry* entry =
-	    GDCM_NAME_SPACE::Global::GetDicts()
-	    ->GetDefaultPubDict()->GetEntry(mGroup,mElement);
 	  mName = entry->GetName();
+	  CleanName(mName);
+	  GimmickDebugMessage(3,"='"<<mName<<"'"<<std::endl);
 	}
       else
 	{
-	  mName = mKey;
+	  GimmickMessage(1,"!! WARNING : tag '"<<mKey
+			 <<"' is not in DICOM dictionnary ! "
+			 <<"Considering it as a user attribute"
+			 << std::endl);
+	  mName = "UNKNOWN";
+	  mGroup = mElement = 0;
 	}
+      
     }
+    //=====================================================================
 
 
+    //=====================================================================
+    /// Extracts group and element from a key of the form "Dgroup_elem" 
+    void AttributeDescriptor::GetDicomGroupElementFromKey(const std::string& key,
+							  unsigned short& group,
+							  unsigned short& elem)
+    {
+      group = elem = 0;
+      if ( (key.size()==10) &&
+	   (key[0] == 'D') &&
+	   (key[5] == '_') )
+	{
+	  std::string g = key.substr(1,4);
+	  sscanf(key.c_str(),"D %04x _ %04x ",&group,&elem);  
+	  sscanf(g.c_str(),"%04x",&group);
+	  GimmickMessage(5,"GetDicomGroupElementFromKey '"<<g<<"' : "
+			 <<group<<"|"<<elem<<std::endl);
+	}
+      else 
+	{ 
+	  GimmickMessage(5,"GetDicomGroupElementFromKey '"<<key<<"' : "
+			 <<" not a DICOM key format"<<std::endl);
+	}
+      return;
+    }
+    //=====================================================================
 
   } // EO namespace tree