adding testDICICOMDIR.cxx to check DICOMDIR utilities

[gdcm.git] / src / gdcmDictSet.cxx

diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx
index fe95d73a8b8da1be1080219f1ebfd82663e9c1d0..518eb728deebc892d337aa7d1ef36aa6d573c582 100644 (file)
--- a/src/gdcmDictSet.cxx
+++ b/src/gdcmDictSet.cxx
@@ -78,16 +78,9 @@ void gdcmDictSet::Print(std::ostream& os)
  * \sa      gdcmDictSet::GetPubDictTagNamesByCategory
  * @return  A list of all entries of the public dicom dictionnary.
  */
-std::list<std::string> *gdcmDictSet::GetPubDictTagNames(void) 
+std::list<std::string> *gdcmDictSet::GetPubDictEntryNames(void) 
 {
-   std::list<std::string> *Result = new std::list<std::string>;
-   TagKeyHT entries = GetDefaultPubDict()->GetEntries();
-   
-   for (TagKeyHT::iterator tag = entries.begin(); tag != entries.end(); ++tag)
-   {
-      Result->push_back( tag->second->GetName() );
-   }
-   return Result;
+   return(GetDefaultPubDict()->GetDictEntryNames());
 }
 
 /** 
@@ -114,16 +107,9 @@ std::list<std::string> *gdcmDictSet::GetPubDictTagNames(void)
  *          corresponding values are lists of all the dictionnary entries
  *          among that group.
  */
-std::map<std::string, std::list<std::string> > *gdcmDictSet::GetPubDictTagNamesByCategory(void) 
+std::map<std::string, std::list<std::string> > *gdcmDictSet::GetPubDictEntryNamesByCategory(void) 
 {
-   std::map<std::string, std::list<std::string> > *Result = new std::map<std::string, std::list<std::string> >;
-   TagKeyHT entries = GetDefaultPubDict()->GetEntries();
-
-   for (TagKeyHT::iterator tag = entries.begin(); tag != entries.end(); ++tag)
-   {
-      (*Result)[tag->second->GetFourth()].push_back(tag->second->GetName());
-   }
-   return Result;
+   return(GetDefaultPubDict()->GetDictEntryNamesByCategory());
 }
 
 /**
@@ -135,10 +121,11 @@ std::map<std::string, std::list<std::string> > *gdcmDictSet::GetPubDictTagNamesB
  * @param   Name Symbolic name that be used as identifier of the newly 
  *          created dictionary.
  */
-void gdcmDictSet::LoadDictFromFile(std::string FileName, DictKey Name) 
+gdcmDict *gdcmDictSet::LoadDictFromFile(std::string FileName, DictKey Name) 
 {
    gdcmDict *NewDict = new gdcmDict(FileName);
    AppendDict(NewDict,Name);
+   return(NewDict);
 }
 
 /**
@@ -177,7 +164,7 @@ gdcmDictEntry *gdcmDictSet::NewVirtualDictEntry(guint16 group, guint16 element,
                                                 std::string name)
 {
    gdcmDictEntry *entry;
-   std::string tag=gdcmDictEntry::TranslateToKey(group,element)+vr;
+   std::string tag=gdcmDictEntry::TranslateToKey(group,element)+"#"+vr+"#"+fourth+"#"+name;
    std::map<std::string,gdcmDictEntry *>::iterator it;
    
    it=virtualEntry.find(tag);