X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSerieHelper.h;h=ae6ca5a42ef6d499b2b4a800b7678c464e433b36;hb=aed339028b8f3af17ae97874379853c8a9534c88;hp=9264eb18677a8b0a7401d2b51719c143ea0c97f9;hpb=a585fafed1e72e092c6a1942c8692991c1688e7f;p=gdcm.git

diff --git a/src/gdcmSerieHelper.h b/src/gdcmSerieHelper.h
index 9264eb18..ae6ca5a4 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/21 09:46:27 $
-  Version:   $Revision: 1.29 $
+  Date:      $Date: 2005/12/09 12:23:38 $
+  Version:   $Revision: 1.33 $
                                                                                 
   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>
@@ -102,6 +101,19 @@ public:
    /// All the following allow user to restrict DICOM file to be part
    /// of a particular serie
    void AddRestriction(TagKey const &key, 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; }
+
+   // \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.
+   std::string CreateUniqueSeriesIdentifier( File * inFile );
+
  
 /**
  * \brief Sets the LoadMode as a boolean string. 
@@ -152,7 +164,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 +173,8 @@ private:
    } ExRule;
    typedef std::vector<ExRule> SerieExRestrictions;
    SerieExRestrictions ExRestrictions;
-
+   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