From f556c218bc3bf673a0c19a0fc090440ab650cec9 Mon Sep 17 00:00:00 2001 From: jpr Date: Sat, 5 Nov 2005 13:25:26 +0000 Subject: [PATCH] Comments --- src/gdcmDict.cxx | 6 +++--- src/gdcmTagKey.h | 8 ++++---- src/gdcmValidator.cxx | 33 ++++++++++++++++++++++----------- 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx index 845114d2..1af0d6b5 100644 --- 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 e6bd2857..3ec9f19f 100644 --- 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 c287469f..045a95d1 100644 --- 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 #include namespace gdcm { +//----------------------------------------------------------------------------- +typedef std::map 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(); } } -- 2.48.1