X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestDict.cxx;h=2a85a6c85e1d84e08172234501ded0ccec254132;hb=b4c2328075505f0a7e95763848fa57a0337fe8b4;hp=db151958f1c070bd188ea57bbd73d2fa9262e369;hpb=0a9f25290006bdee6be492179f8b0dae7ba1c598;p=gdcm.git

diff --git a/Testing/TestDict.cxx b/Testing/TestDict.cxx
index db151958..2a85a6c8 100644
--- a/Testing/TestDict.cxx
+++ b/Testing/TestDict.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestDict.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/24 14:14:09 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2005/11/29 17:08:54 $
+  Version:   $Revision: 1.12 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -23,8 +23,20 @@
 #include <iostream>
 #include <iomanip>
 
-int TestDict(int , char* [])
-{  
+int TestDict(int , char *[])
+{ 
+
+   std::cout << "----- Test Default Dicom Dictionary : ----------" << std::endl;
+   // Just to improve test coverage:
+   gdcm::Dict *tempDict = gdcm::Dict::New("dummyFileNameThatDoesntExist");
+   // Default dict is supposed to be used.
+   tempDict->Print();
+   std::cout << "---- end Test Default Dicom Dictionary : -------" << std::endl;
+
+   // Lets delete it.
+   tempDict->Delete();
+
+ 
    // Print the DictSet
    std::cout<<"#######################################################\n";
    gdcm::DictSet *dicts=gdcm::Global::GetDicts();
@@ -36,17 +48,22 @@ int TestDict(int , char* [])
 
    std::cout<<"DictSet content :\n";
 
-   gdcm::Dict *d = dicts->GetFirstEntry();
+   gdcm::Dict *d = dicts->GetFirstDict();
    if (!d)
    {
       std::cout << "Dictset is empty" << std::endl;
       return 1;
    }
+
+   std::cout << "----------- Print DictSet contents: ----------" << std::endl;
+   dicts->Print();
+   std::cout << "----------- End Print DictSet contents: ------" << std::endl;
+
    while (d)
    {
       std::cout << "------------- a Dict is found : ----------" << std::endl;
       d->Print();
-      d = dicts->GetNextEntry();
+      d = dicts->GetNextDict();
    }
 
    // Print the Dict (public)
@@ -64,7 +81,7 @@ int TestDict(int , char* [])
    std::cout<<"#######################################################\n";
    const int ENTRY_GR = 0x10;
    const int ENTRY_EL = 0x20;
-   std::string key=gdcm::DictEntry::TranslateToKey(ENTRY_GR,ENTRY_EL);
+   gdcm::TagKey key = gdcm::DictEntry::TranslateToKey(ENTRY_GR,ENTRY_EL);
    gdcm::DictEntry *entry=pubDict->GetEntry(ENTRY_GR,ENTRY_EL);
    if(!entry)
    {
@@ -79,11 +96,17 @@ int TestDict(int , char* [])
    entry=pubDict->GetFirstEntry();
    while(entry)
    {
-      std::cout << entry->GetGroup() << "|" << entry->GetElement()
-                << " [" << entry->GetVR() << "] - M" << entry->GetVM()
-                << " : " << entry->GetName() << " ( " << entry->GetKey() << ")\n";
+      std::cout << std::hex << entry->GetGroup() << "|" << entry->GetElement()
+                << " [" << entry->GetVR() << "] - VM [" << entry->GetVM()
+                << "] : " << entry->GetName() << " ( " << entry->GetKey() << ")\n";
       entry=pubDict->GetNextEntry();
    }
 
+/*   // Let's play with DicEntry stuff !
+   // First, we try to break an Entry.
+   entry=pubDict->GetFirstEntry();
+   entry->SetVR("PN");
+   // Should warn us !*/
+
    return(0);
 }