X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSerieHelper.h;h=1b9a8ff8fbc6d767697baaf95433412bacdd4d73;hb=79d1ce76dfcb136e8b77aaeac859ba59973e7ae4;hp=72fa2d3ad8db870555950308f1aabb21e081c0f8;hpb=6b4aa7387613d98b62ee41d18aba2dbe0306b4ba;p=gdcm.git

diff --git a/src/gdcmSerieHelper.h b/src/gdcmSerieHelper.h
index 72fa2d3a..1b9a8ff8 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/11/25 13:56:32 $
-  Version:   $Revision: 1.30 $
+  Date:      $Date: 2006/01/18 15:25:07 $
+  Version:   $Revision: 1.36 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -19,10 +19,9 @@
 #ifndef GDCMSERIEHELPER_H
 #define GDCMSERIEHELPER_H
 
-#include "gdcmCommon.h" 
+#include "gdcmRefCounter.h"
 #include "gdcmTagKey.h" 
 #include "gdcmDebug.h"  // for LEGACY
-#include "gdcmRefCounter.h"
  
 #include <vector>
 #include <iostream>
@@ -101,7 +100,12 @@ public:
                              { return  (*ItFileSetHt).first; }
    /// All the following allow user to restrict DICOM file to be part
    /// of a particular serie
+   /// \todo : find a trick to allow user to say the retrictetons are ored
+   ///         (not only anded) 
+   ///         ex : keep the images whose SerieNumber is 101 or 102 or 103.
    void AddRestriction(TagKey const &key, std::string const &value, int op);
+   void AddRestriction(uint16_t group, uint16_t elem, std::string const &value,
+                                                                    int op);
 
    /// \brief Use additional series information such as ProtocolName
    ///        and SeriesName to identify when a single SeriesUID contains
@@ -109,12 +113,12 @@ public:
    void SetUseSeriesDetails( bool useSeriesDetails )
                                    { m_UseSeriesDetails = useSeriesDetails;}
    bool GetUseSeriesDetails( ){ return m_UseSeriesDetails; }
-
-   // \brief Create a string that uniquely identifies a series.   By default
-   //         uses the SeriesUID.   If UseSeriesDetails(true) has been called,
-   //         then additional identifying information is used.
+   
+   void AddSeriesDetail(uint16_t group, uint16_t elem, bool convert);
+   
    std::string CreateUniqueSeriesIdentifier( File * inFile );
-
+   
+   std::string CreateUserDefinedFileIdentifier( File * inFile );
  
 /**
  * \brief Sets the LoadMode as a boolean string. 
@@ -165,7 +169,7 @@ private:
    typedef std::vector<Rule> SerieRestrictions;
    SerieRestrictions Restrictions;
    
-   // New style for (extented) Rules (Moreover old one doesn't compile)
+   // New style for (extented) Rules
    typedef struct {
       uint16_t group;
       uint16_t elem;
@@ -174,6 +178,15 @@ private:
    } ExRule;
    typedef std::vector<ExRule> SerieExRestrictions;
    SerieExRestrictions ExRestrictions;
+   
+   typedef struct {
+      uint16_t group;
+      uint16_t elem;
+      bool convert;
+   } ExDetail;
+   typedef std::vector<ExDetail> SeriesExDetails; 
+   SeriesExDetails ExDetails;
+    
    bool m_UseSeriesDetails;
    
    /// \brief Bit string integer (each one considered as a boolean)
@@ -190,6 +203,7 @@ private:
    ///        he may supply his own comparison function.
     BOOL_FUNCTION_PFILE_PFILE_POINTER UserLessThanFunction;
 
+    void Sort(FileList *fileList, bool (*pt2Func)( File *file1, File *file2) );
 };
 
 } // end namespace gdcm