X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSerieHelper.h;h=95a62acaad9e8d42b7674ac24058ac207726fdb3;hb=c1a305b54c1a9dd1bfe2173940ba84ccd1b4bb27;hp=2743a112e63b8e607e5a0dfe77535a05e195db7f;hpb=cb69bd56675d6a06c5835a01afabc5aae7a6fed0;p=gdcm.git

diff --git a/src/gdcmSerieHelper.h b/src/gdcmSerieHelper.h
index 2743a112..95a62aca 100644
--- 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/11 19:49:38 $
-  Version:   $Revision: 1.39 $
+  Date:      $Date: 2009/05/19 15:08:37 $
+  Version:   $Revision: 1.45 $
                                                                                 
   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',
@@ -79,11 +81,11 @@ public:
    /// \todo should return bool or throw error ?
    void AddFileName(std::string const &filename);
    bool AddFile(File *header);
-#ifndef GDCM_LEGACY_REMOVE
-   bool AddGdcmFile(File* header) { return AddFile(header); }
-#endif
+ //  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(); }
@@ -95,9 +97,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();
@@ -141,7 +143,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);
@@ -163,6 +165,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;  }
@@ -238,6 +246,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;