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

diff --git a/src/gdcmSerieHelper.h b/src/gdcmSerieHelper.h
index 693b82a6..72fa2d3a 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/19 13:17:05 $
-  Version:   $Revision: 1.24 $
+  Date:      $Date: 2005/11/25 13:56:32 $
+  Version:   $Revision: 1.30 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -22,6 +22,7 @@
 #include "gdcmCommon.h" 
 #include "gdcmTagKey.h" 
 #include "gdcmDebug.h"  // for LEGACY
+#include "gdcmRefCounter.h"
  
 #include <vector>
 #include <iostream>
@@ -30,40 +31,47 @@
 namespace gdcm 
 {
 class File;
-typedef std::vector<File* > FileList;
-   /// XCoherent stands for 'Extra Coherent', 
-   /// (The name 'Coherent' would be enough but it was used before;
-   /// I don't want to put a bomb in the code)
-   /// Any 'better name' is welcome !
-typedef std::map<std::string, FileList *> XCoherentFileSetmap;
+
+   typedef std::vector<File* > FileList;
    
-typedef bool (*BOOL_FUNCTION_PFILE_PFILE_POINTER)(File *, File *);
+   /// \brief XCoherent stands for 'Extra Coherent', 
+   ///        (The name 'Coherent' would be enough but it was used before;
+   ///        I don't want to put a bomb in the code)
+   ///        Any 'better name' is welcome !
+   typedef std::map<std::string, FileList *> XCoherentFileSetmap; 
+      
+   typedef bool (*BOOL_FUNCTION_PFILE_PFILE_POINTER)(File *, File *);
 
 //-----------------------------------------------------------------------------
 /**
  * \brief  
- * - This class should be used for a stack of 2D dicom images.
- *   It allows to explore (recursively or not) a directory and 
- *   makes a set of 'Coherent Files' lists (coherent : same SerieUID)
- *   It allows :
- *   - to sort any of the Coherent File list on the image position.
- *   - to split any of the Single SerieUID Filesets (better use this name than
- *   'Coherent File List' : it's NOT a std::list, files are NOT coherent ...)
+ *  This class should be used for a stack of 2D dicom images.
+ *
+ *   - It allows to explore (recursively or not) a directory and 
+ *   makes a set of 'Single SerieUID Filesets' 
+ *   - It allows :
+ *   - - to sort any of the 'Single SerieUID Fileset' on the image position.
+ *   - - to split any of the Single SerieUID Filesets (better use this name than
+ *   'CoherentFileList' : it's NOT a std::list, files are NOT coherent ...)
  *    into several XCoherent Filesets 
  *   XCoherent stands for 'Extra Coherent' (same orientation, or same position)
  */
-class GDCM_EXPORT SerieHelper 
+class GDCM_EXPORT SerieHelper  : public RefCounter
 {
+   gdcmTypeMacro(SerieHelper);
+   
 public:
-   // SingleSerieUIDFileSetmap replaces the former CoherentFileListmap
-   // ( List were actually std::vectors, and wher no coherent at all :
-   //   They were only Single SeriesInstanceUID File sets)
+   /// SingleSerieUIDFileSetmap replaces the former CoherentFileListmap
+   /// ( List were actually std::vectors, and wher no coherent at all :
+   ///   They were only Single SeriesInstanceUID File sets)
    typedef std::map<std::string, FileList *> SingleSerieUIDFileSetmap;
 
    typedef std::vector<File* > FileVector;
-   
-   SerieHelper();
-   ~SerieHelper();
+
+/// \brief Constructs a SerieHelper with a RefCounter
+    static SerieHelper *New() {return new SerieHelper();}
+     
+   virtual ~SerieHelper();
    void Print(std::ostream &os = std::cout, std::string const &indent = "" );
 
    /// \todo should return bool or throw error ?
@@ -88,12 +96,25 @@ public:
    FileList *GetFirstSingleSerieUIDFileSet();
    FileList *GetNextSingleSerieUIDFileSet();
    FileList *GetSingleSerieUIDFileSet(std::string serieUID);
-
+   /// brief returns the 'Series Instance UID' Single SerieUID FileSet
+   std::string GetCurrentSerieUIDFileSetUID()
+                             { return  (*ItFileSetHt).first; }
    /// 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 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. 
@@ -119,7 +140,10 @@ public:
    XCoherentFileSetmap SplitOnOrientation(FileList *fileSet); 
    XCoherentFileSetmap SplitOnPosition(FileList *fileSet); 
    XCoherentFileSetmap SplitOnTagValue(FileList *fileSet,
-                                                 uint16_t group, uint16_t element);
+                                               uint16_t group, uint16_t elem);
+protected :
+   SerieHelper();
+   
 private:
    void ClearAll();
    bool UserOrdering(FileList *fileSet);
@@ -150,7 +174,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