upgrades for 4DSplitter

[gdcm.git] / src / gdcmSerieHelper.h

diff --git a/src/gdcmSerieHelper.h b/src/gdcmSerieHelper.h
index ca6f727ee7fdd6f4b8a528b201a49380fda535d3..2f20fe4f2911a43fcedcbef98ae1daf1d4dc9636 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: 2006/05/23 14:16:08 $
-  Version:   $Revision: 1.40 $
+  Date:      $Date: 2011/03/29 07:36:00 $
+  Version:   $Revision: 1.47 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,24 +16,26 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMSERIEHELPER_H
-#define GDCMSERIEHELPER_H
+#ifndef _GDCMSERIEHELPER_H_
+#define _GDCMSERIEHELPER_H_
 
 #include "gdcmRefCounter.h"
 #include "gdcmTagKey.h" 
 #include "gdcmDebug.h"  // for LEGACY
+
+#include "gdcmDicomDirSerie.h"
  
 #include <vector>
 #include <iostream>
 #include <map>
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 class File;
 
    typedef std::vector<File* > FileList;
 #ifndef GDCM_LEGACY_REMOVE
-typedef std::vector<File* > GdcmFileList;
+  typedef std::vector<File* > GdcmFileList;
 #endif
 
    /// \brief XCoherent stands for 'Extra Coherent',
@@ -58,13 +60,14 @@ typedef std::vector<File* > GdcmFileList;
  *    into several XCoherent Filesets 
  *   XCoherent stands for 'Extra Coherent' (same orientation, or same position)
  */
+
 class GDCM_EXPORT SerieHelper  : public RefCounter
 {
    gdcmTypeMacro(SerieHelper);
    
 public:
    /// SingleSerieUIDFileSetmap replaces the former CoherentFileListmap
-   /// ( List were actually std::vectors, and where no coherent at all :
+   /// (List were actually std::vectors, and where no coherent at all :
    ///   They were only Single SeriesInstanceUID File sets)
    typedef std::map<std::string, FileList *> SingleSerieUIDFileSetmap;
 
@@ -79,13 +82,20 @@ public:
    /// \todo should return bool or throw error ?
    void AddFileName(std::string const &filename);
    bool AddFile(File *header);
-   GDCM_LEGACY(bool AddGdcmFile(File* header))
+ //  GDCM_LEGACY(bool AddGdcmFile(File* header))
 
    void SetDirectory(std::string const &dir, bool recursive=false);
+   void SetDicomDirSerie(DicomDirSerie *se);
+      
    bool IsCoherent(FileList *fileSet);
    void OrderFileList(FileList *fileSet);
    void Clear() { ClearAll(); }
 
+   bool UserOrdering(FileList *fileSet);
+   bool ImagePositionPatientOrdering(FileList *fileSet);
+   bool ImageNumberOrdering(FileList *fileSet);
+   bool FileNameOrdering(FileList *fileSet);
+
    /// \brief Gets the FIRST Single SerieUID Fileset.
    ///        Deprecated; kept not to break the API
    /// \note Caller must call OrderFileList first
@@ -93,9 +103,9 @@ public:
    const FileList &GetFileList()
                            { return *SingleSerieUIDFileSetHT.begin()->second; }
   
-   GDCM_LEGACY(   FileList *GetFirstCoherentFileList()  )
-   GDCM_LEGACY(   FileList *GetNextCoherentFileList()   )
-   GDCM_LEGACY(   FileList *GetCoherentFileList(std::string serieUID)  )
+ //  GDCM_LEGACY(   FileList *GetFirstCoherentFileList()  )
+ //  GDCM_LEGACY(   FileList *GetNextCoherentFileList()   )
+ //  GDCM_LEGACY(   FileList *GetCoherentFileList(std::string serieUID)  )
 
    FileList *GetFirstSingleSerieUIDFileSet();
    FileList *GetNextSingleSerieUIDFileSet();
@@ -139,7 +149,7 @@ public:
    /// 0018 0024 Sequence Name
    /// 0018 0050 Slice Thickness
    /// 0028 0010 Rows
-   /// 0028 0011 Columns
+   /// 0028 0011 Columns   
    void CreateDefaultUniqueSeriesIdentifier();
 
    void AddSeriesDetail(uint16_t group, uint16_t elem, bool convert);
@@ -161,6 +171,12 @@ public:
  * @param   mode Load mode to be used    
  */
    void SetLoadMode (int mode) { LoadMode = mode; }
+   
+/**
+ * \brief Sets the DropDuplicatePositions as a boolean.
+ * @param   drop  DropDuplicatePositions mode to be used   
+ */   
+   void SetDropDuplicatePositions (bool drop) { DropDuplicatePositions = drop; }   
 
 /// Brief User wants the files to be sorted Direct Order (default value)
    void SetSortOrderToDirect()  { DirectOrder = true;  }
@@ -176,16 +192,21 @@ public:
    XCoherentFileSetmap SplitOnPosition(FileList *fileSet); 
    XCoherentFileSetmap SplitOnTagValue(FileList *fileSet,
                                                uint16_t group, uint16_t element);
+   XCoherentFileSetmap SplitOnTagValueConvertToFloat(FileList *fileSet,
+                                               uint16_t group, uint16_t element);
 protected :
    SerieHelper();
    
 private:
    void ClearAll();
+
+   /*
+   //move them to public (usefull for aware user!)
    bool UserOrdering(FileList *fileSet);
    bool ImagePositionPatientOrdering(FileList *fileSet);
    bool ImageNumberOrdering(FileList *fileSet);
    bool FileNameOrdering(FileList *fileSet);
-   
+  */
    static bool ImageNumberLessThan(File *file1, File *file2);
    static bool ImageNumberGreaterThan(File *file1, File *file2);
    static bool FileNameLessThan(File *file1, File *file2);
@@ -236,6 +257,8 @@ private:
    ///        he may supply his own comparison function.
    BOOL_FUNCTION_PFILE_PFILE_POINTER UserLessThanFunction;
 
+   bool DropDuplicatePositions;
+
    void Sort(FileList *fileList, bool (*pt2Func)( File *file1, File *file2) );
 
    bool m_UseSeriesDetails;