- void AddSeriesDetail(uint16_t group, uint16_t elem, bool convert);

[gdcm.git] / src / gdcmSerieHelper.h

diff --git a/src/gdcmSerieHelper.h b/src/gdcmSerieHelper.h
index 9264eb18677a8b0a7401d2b51719c143ea0c97f9..5781546cde6fcfd18398351899ead0c3364ee512 100644 (file)
--- 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/21 09:46:27 $
-  Version:   $Revision: 1.29 $
+  Date:      $Date: 2005/12/21 14:48:09 $
+  Version:   $Revision: 1.35 $
                                                                                 
   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,25 @@ 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
+   ///        multiple 3D volumes - as can occur with perfusion and DTI imaging
+   void SetUseSeriesDetails( bool useSeriesDetails )
+                                   { m_UseSeriesDetails = useSeriesDetails;}
+   bool GetUseSeriesDetails( ){ return m_UseSeriesDetails; }
+   
+   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. 
@@ -152,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;
@@ -161,7 +178,17 @@ 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)
    ///        Bit 0 : Skip Sequences,    if possible
    ///        Bit 1 : Skip Shadow Groups if possible