X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSerieHelper.h;h=1b9a8ff8fbc6d767697baaf95433412bacdd4d73;hb=4962adb161e312436550b1569781c520d4fea97e;hp=693b82a67e105fea5233307260eec792fc063e20;hpb=9aa702d6397e3e490263a0791dd6c8ed2f3d1e83;p=gdcm.git diff --git a/src/gdcmSerieHelper.h b/src/gdcmSerieHelper.h index 693b82a6..1b9a8ff8 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: 2006/01/18 15:25:07 $ + Version: $Revision: 1.36 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -19,7 +19,7 @@ #ifndef GDCMSERIEHELPER_H #define GDCMSERIEHELPER_H -#include "gdcmCommon.h" +#include "gdcmRefCounter.h" #include "gdcmTagKey.h" #include "gdcmDebug.h" // for LEGACY @@ -30,40 +30,47 @@ 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 std::vector 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 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 SingleSerieUIDFileSetmap; typedef std::vector 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 +95,30 @@ 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); + /// \todo : find a trick to allow user to say the retrictetons are ored + /// (not only anded) + /// ex : keep the images whose SerieNumber is 101 or 102 or 103. + void AddRestriction(TagKey const &key, std::string const &value, int op); + void AddRestriction(uint16_t group, uint16_t elem, 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; } + + void AddSeriesDetail(uint16_t group, uint16_t elem, bool convert); + + std::string CreateUniqueSeriesIdentifier( File * inFile ); + + std::string CreateUserDefinedFileIdentifier( File * inFile ); /** * \brief Sets the LoadMode as a boolean string. @@ -119,7 +144,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); @@ -141,7 +169,7 @@ private: typedef std::vector 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; @@ -150,7 +178,17 @@ private: } ExRule; typedef std::vector SerieExRestrictions; SerieExRestrictions ExRestrictions; - + + typedef struct { + uint16_t group; + uint16_t elem; + bool convert; + } ExDetail; + typedef std::vector SeriesExDetails; + SeriesExDetails ExDetails; + + 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 @@ -165,6 +203,7 @@ private: /// he may supply his own comparison function. BOOL_FUNCTION_PFILE_PFILE_POINTER UserLessThanFunction; + void Sort(FileList *fileList, bool (*pt2Func)( File *file1, File *file2) ); }; } // end namespace gdcm