ENH: Ok all tests are now passing even using FASTKEY

diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx
index e1c795cd28a80a96fd5a4781e70ab6ae8bcbef2a..ecef7934c3d3988d3e096d8da821c8af10f22017 100644 (file)
--- a/src/gdcmDictSet.cxx
+++ b/src/gdcmDictSet.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictSet.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/07/11 15:20:46 $
-  Version:   $Revision: 1.67 $
+  Date:      $Date: 2005/07/11 20:44:52 $
+  Version:   $Revision: 1.68 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -116,7 +116,7 @@ DictEntry *DictSet::NewVirtualDictEntry( uint16_t group,
   //
   // const std::string tag = DictEntry::TranslateToKey(group,elem)
   //                         + "#" + vr + "#" + vm + "#" + name;
-#if FASTTAGKEY
+#if FASTTAGKEY && 0
    // FIXME
    TagKey tag;
    tag.tab[0] = group;
@@ -124,11 +124,11 @@ DictEntry *DictSet::NewVirtualDictEntry( uint16_t group,
 #else
    char res[10];
    sprintf(res,"%04x|%04x", group, elem);
-   TagKey tag = res;
+   ExtendedTagKey tag = res;
    tag += "#" + vr + "#" + vm + "#" + name;  
 #endif
   
-   TagKeyHT::iterator it;
+   ExtendedTagKeyHT::iterator it;
    
    it = VirtualEntries.find(tag);
    if ( it != VirtualEntries.end() )
@@ -139,7 +139,7 @@ DictEntry *DictSet::NewVirtualDictEntry( uint16_t group,
    {
       DictEntry ent(group, elem, vr, vm, name);
       VirtualEntries.insert(
-         std::map<TagKey, DictEntry>::value_type(tag, ent) );
+         ExtendedTagKeyHT::value_type(tag, ent) );
       entry = &(VirtualEntries.find(tag)->second);
    }
 

diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h
index 9b5f3ab79c34cd7de55c186648b632394993d540..21900ae292ac7f1f3f3cb7079226427716d325dc 100644 (file)
--- a/src/gdcmDictSet.h
+++ b/src/gdcmDictSet.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictSet.h,v $
   Language:  C++
-  Date:      $Date: 2005/06/14 14:00:04 $
-  Version:   $Revision: 1.43 $
+  Date:      $Date: 2005/07/11 20:44:52 $
+  Version:   $Revision: 1.44 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -28,6 +28,8 @@
 namespace gdcm 
 {
 typedef std::map<DictKey, Dict*> DictSetHT;
+typedef std::string ExtendedTagKey;
+typedef std::map<ExtendedTagKey, DictEntry>  ExtendedTagKeyHT;
 
 //-----------------------------------------------------------------------------
 /**
@@ -83,7 +85,7 @@ private:
    std::string DictPath;
 
    /// H table for the on the fly created DictEntries  
-   TagKeyHT VirtualEntries; 
+   ExtendedTagKeyHT VirtualEntries; 
 };
 } // end namespace gdcm
 

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index 3386f159c86a72b0bc6a036ab8a3e551fcefb18d..9c0d009078ab8ed9129f1ee288e69400de0426f3 100644 (file)
--- a/src/gdcmDocument.cxx
+++ b/src/gdcmDocument.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/07/07 16:37:40 $
-  Version:   $Revision: 1.262 $
+  Date:      $Date: 2005/07/11 20:44:52 $
+  Version:   $Revision: 1.263 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -2102,6 +2102,10 @@ DocEntry *Document::ReadNextDocEntry()
    {
       group = ReadInt16();
       elem  = ReadInt16();
+      if ( group == 41 && 9728 == elem )
+        {
+        std::cout << "bla";
+        }
    }
    catch ( FormatError e )
    {

diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx
index e343ff9f7c16a9875450a14e4ff45942f7e7d9d1..eef8c5700dbccbe9857e6c1b9a060e01b2b9b1c1 100644 (file)
--- a/src/gdcmElementSet.cxx
+++ b/src/gdcmElementSet.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmElementSet.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/07/11 14:53:16 $
-  Version:   $Revision: 1.60 $
+  Date:      $Date: 2005/07/11 20:44:52 $
+  Version:   $Revision: 1.61 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -176,6 +176,7 @@ DocEntry *ElementSet::GetDocEntry(uint16_t group, uint16_t elem)
 
    if ( it!=TagHT.end() )
       return it->second;
+//   this->Print( std::cerr );
    return NULL;
 }