Comments

diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx
index 845114d235816d3fd7a8badef24a73ee3899207d..1af0d6b5da07990c6b495ff6199187f8bd2ebf15 100644 (file)
--- a/src/gdcmDict.cxx
+++ b/src/gdcmDict.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDict.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/10/23 15:32:30 $
-  Version:   $Revision: 1.82 $
+  Date:      $Date: 2005/11/05 13:25:26 $
+  Version:   $Revision: 1.83 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -305,7 +305,7 @@ void Dict::DoTheLoadingJob(std::ifstream &from)
       from >> vm;
       from >> std::ws;  //remove white space
       std::getline(from, name);
- 
+
       newEntry = DictEntry::New(group, elem, vr, vm, name);
       AddEntry(newEntry);
       newEntry->Delete();

diff --git a/src/gdcmTagKey.h b/src/gdcmTagKey.h
index e6bd2857cf5d6187f9a94338dd01932843b9706c..3ec9f19f65b4ba9ae9001ea757a6dd5a6ca0511c 100644 (file)
--- a/src/gdcmTagKey.h
+++ b/src/gdcmTagKey.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmTagKey.h,v $
   Language:  C++
-  Date:      $Date: 2005/11/04 15:26:53 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2005/11/05 13:25:26 $
+  Version:   $Revision: 1.9 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -58,10 +58,10 @@ public :
    }
 
    TagKey(const TagKey &_val)
-     {
+   {
      tag[0] = _val[0];
      tag[1] = _val[1];
-     }
+   }
 
    const uint16_t &operator[](const unsigned int &_id) const
    {

diff --git a/src/gdcmValidator.cxx b/src/gdcmValidator.cxx
index c287469fd2fc94563b9fbb88e1af69438b2538e9..045a95d193098ee128b2130a7aca1a21352fe05c 100644 (file)
--- a/src/gdcmValidator.cxx
+++ b/src/gdcmValidator.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmValidator.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/11/04 16:08:08 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2005/11/05 13:25:26 $
+  Version:   $Revision: 1.9 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -20,11 +20,15 @@
 #include "gdcmElementSet.h"
 #include "gdcmDataEntry.h"
 #include "gdcmUtil.h"
+#include <map>
 
 #include <sstream>
 
 namespace gdcm 
 {
+//-----------------------------------------------------------------------------
+typedef std::map<uint16_t, int> GroupHT;    //  Hash Table
+//-----------------------------------------------------------------------------
 
 Validator::Validator()
 {
@@ -46,13 +50,6 @@ bool CheckVM(DataEntry *entry)
      
   const std::string &s = entry->GetString();
 
-/*  std::string::size_type n = s.find("\\");
-  if ( n == s.npos ) // none found
-  {
-    n = 0;
-  }
-*/
-
   unsigned int n = Util::CountSubstring( s , "\\");
   
   n++; // number of '\' + 1 == Value Multiplicity
@@ -71,8 +68,22 @@ bool CheckVM(DataEntry *entry)
 
 void Validator::SetInput(ElementSet *input)
 {
-  // berk for now SetInput do two things at the same time
+// First stage to check group length
+  GroupHT grHT;
   DocEntry *d=input->GetFirstEntry();
+  while(d)
+  {
+    grHT[d->GetGroup()] = 0;
+    d=input->GetNextEntry();
+  }
+  for (GroupHT::iterator it = grHT.begin(); it != grHT.end(); ++it)  
+  {
+      std::cout << std::hex << it->first << std::endl; 
+  } 
+
+
+  // berk for now SetInput do two things at the same time
+  d=input->GetFirstEntry();
   if (!d)
   {
      std::cout << "No Entry found" << std::endl;
@@ -105,7 +116,7 @@ void Validator::SetInput(ElementSet *input)
     {
       // We skip pb of SQ recursive exploration
     }
-      d=input->GetNextEntry();
+    d=input->GetNextEntry();
   }
 }