X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSerieHelper.h;h=693b82a67e105fea5233307260eec792fc063e20;hb=916ae67b44d778882539541c31ed430f002e5bf3;hp=e30b08facb55b114a90e9e9b3be83f1a54d3e473;hpb=02e5b298070faff881e584dd818d85bfc05e92bf;p=gdcm.git diff --git a/src/gdcmSerieHelper.h b/src/gdcmSerieHelper.h index e30b08fa..693b82a6 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/08/30 08:12:40 $ - Version: $Revision: 1.17 $ + Date: $Date: 2005/10/19 13:17:05 $ + Version: $Revision: 1.24 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -20,6 +20,7 @@ #define GDCMSERIEHELPER_H #include "gdcmCommon.h" +#include "gdcmTagKey.h" #include "gdcmDebug.h" // for LEGACY #include @@ -30,7 +31,12 @@ namespace gdcm { class File; typedef std::vector 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 XCoherentFileSetmap; + typedef bool (*BOOL_FUNCTION_PFILE_PFILE_POINTER)(File *, File *); //----------------------------------------------------------------------------- @@ -38,15 +44,24 @@ 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' list (coherent : same Serie UID) - * It allows to sort any of the Coherent File list on the image position + * 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 ...) + * into several XCoherent Filesets + * XCoherent stands for 'Extra Coherent' (same orientation, or same position) */ class GDCM_EXPORT SerieHelper { public: - typedef std::map CoherentFileListmap; - typedef std::vector FileVector; + // 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 SingleSerieUIDFileSetmap; + typedef std::vector FileVector; + SerieHelper(); ~SerieHelper(); void Print(std::ostream &os = std::cout, std::string const &indent = "" ); @@ -56,30 +71,35 @@ public: void AddGdcmFile(File *header); void SetDirectory(std::string const &dir, bool recursive=false); - bool IsCoherent(FileList *coherentFileList); - void OrderFileList(FileList *coherentFileList); + bool IsCoherent(FileList *fileSet); + void OrderFileList(FileList *fileSet); - /// \brief Gets the FIRST *coherent* File List. + /// \brief Gets the FIRST Single SerieUID Fileset. /// Deprecated; kept not to break the API /// \note Caller must call OrderFileList first - /// @return the (first) *coherent* File List - const FileList &GetFileList() { return *CoherentFileListHT.begin()->second; } + /// @return the (first) Single SerieUID Fileset + const FileList &GetFileList() + { return *SingleSerieUIDFileSetHT.begin()->second; } - FileList *GetFirstCoherentFileList(); - FileList *GetNextCoherentFileList(); - FileList *GetCoherentFileList(std::string serieUID); + GDCM_LEGACY( FileList *GetFirstCoherentFileList() ); + GDCM_LEGACY( FileList *GetNextCoherentFileList() ); + GDCM_LEGACY( FileList *GetCoherentFileList(std::string serieUID) ); + + FileList *GetFirstSingleSerieUIDFileSet(); + FileList *GetNextSingleSerieUIDFileSet(); + FileList *GetSingleSerieUIDFileSet(std::string serieUID); /// 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); - + /** * \brief Sets the LoadMode as a boolean string. - * NO_SEQ, NO_SHADOW, NO_SHADOWSEQ - * (nothing more, right now) - * WARNING : before using NO_SHADOW, be sure *all* your files + * LD_NOSEQ, LD_NOSHADOW, LD_NOSHADOWSEQ + * ... (nothing more, right now) + * WARNING : before using LD_NOSHADOW, be sure *all* your files * contain accurate values in the 0x0000 element (if any) * of *each* Shadow Group. The parser will fail if the size is wrong ! * @param mode Load mode to be used @@ -94,12 +114,18 @@ public: /// to allow user to give is own comparison function void SetUserLessThanFunction( BOOL_FUNCTION_PFILE_PFILE_POINTER userFunc ) - { UserLessThanFunction = userFunc; } + { UserLessThanFunction = userFunc; } + + XCoherentFileSetmap SplitOnOrientation(FileList *fileSet); + XCoherentFileSetmap SplitOnPosition(FileList *fileSet); + XCoherentFileSetmap SplitOnTagValue(FileList *fileSet, + uint16_t group, uint16_t element); private: - bool UserOrdering(FileList *coherentFileList); - bool ImagePositionPatientOrdering(FileList *coherentFileList); - bool ImageNumberOrdering(FileList *coherentFileList); - bool FileNameOrdering(FileList *coherentFileList); + void ClearAll(); + 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); @@ -107,9 +133,10 @@ private: static bool FileNameGreaterThan(File *file1, File *file2); //Attributes: - CoherentFileListmap CoherentFileListHT; - CoherentFileListmap::iterator ItListHt; - + + SingleSerieUIDFileSetmap SingleSerieUIDFileSetHT; + SingleSerieUIDFileSetmap::iterator ItFileSetHt; + typedef std::pair Rule; typedef std::vector SerieRestrictions; SerieRestrictions Restrictions; @@ -136,7 +163,8 @@ private: /// \brief If user knows more about his images than gdcm does, /// he may supply his own comparison function. - /*static*/ BOOL_FUNCTION_PFILE_PFILE_POINTER UserLessThanFunction; + BOOL_FUNCTION_PFILE_PFILE_POINTER UserLessThanFunction; + }; } // end namespace gdcm