From e2b53c6ca71e08414aaab01dac851c36a6530903 Mon Sep 17 00:00:00 2001
From: malaterre <malaterre>
Date: Tue, 8 Nov 2005 16:31:21 +0000
Subject: [PATCH] ENH: A user does not know (and should not) what we internally
 use for representing a dicom tag, let him use TagKey instead

---
 src/gdcmSerieHelper.cxx | 10 +++++-----
 src/gdcmSerieHelper.h   |  7 +++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/gdcmSerieHelper.cxx b/src/gdcmSerieHelper.cxx
index 60de9c01..23e60112 100644
--- a/src/gdcmSerieHelper.cxx
+++ b/src/gdcmSerieHelper.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSerieHelper.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/10/27 09:14:15 $
-  Version:   $Revision: 1.33 $
+  Date:      $Date: 2005/11/08 16:31:21 $
+  Version:   $Revision: 1.34 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -218,12 +218,12 @@ void SerieHelper::AddGdcmFile(File *header)
  * @param value value to be checked to exclude File
  * @param op  operator we want to use to check
  */
-void SerieHelper::AddRestriction(uint16_t group, uint16_t elem, 
+void SerieHelper::AddRestriction(TagKey const &key, 
                                  std::string const &value, int op)
 {
    ExRule r;
-   r.group = group;
-   r.elem  = elem;
+   r.group = key[0];
+   r.elem  = key[1];
    r.value = value;
    r.op    = op;
    ExRestrictions.push_back( r ); 
diff --git a/src/gdcmSerieHelper.h b/src/gdcmSerieHelper.h
index b41c9ece..73fc8a94 100644
--- a/src/gdcmSerieHelper.h
+++ b/src/gdcmSerieHelper.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSerieHelper.h,v $
   Language:  C++
-  Date:      $Date: 2005/10/26 06:23:37 $
-  Version:   $Revision: 1.26 $
+  Date:      $Date: 2005/11/08 16:31:21 $
+  Version:   $Revision: 1.27 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -98,8 +98,7 @@ public:
    /// All the following allow user to restrict DICOM file to be part
    /// of a particular serie
    GDCM_LEGACY( void AddRestriction(TagKey const &key, std::string const &value) );
-   void AddRestriction(uint16_t group, uint16_t elem, 
-                       std::string const &value, int op);
+   void AddRestriction(TagKey const &key, std::string const &value, int op);
  
 /**
  * \brief Sets the LoadMode as a boolean string. 
-- 
2.45.1