X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSerieHelper.h;h=2f20fe4f2911a43fcedcbef98ae1daf1d4dc9636;hb=fd5c14391627c6e42283ced90561271af2a161a2;hp=519255c8b0592efb312d6f0ec30c81dba36ef54f;hpb=46afb30d2d016a9b1581c7ee4ca96d614a35203c;p=gdcm.git diff --git a/src/gdcmSerieHelper.h b/src/gdcmSerieHelper.h index 519255c8..2f20fe4f 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/11/28 15:20:34 $ - Version: $Revision: 1.31 $ + 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,30 +16,34 @@ =========================================================================*/ -#ifndef GDCMSERIEHELPER_H -#define GDCMSERIEHELPER_H +#ifndef _GDCMSERIEHELPER_H_ +#define _GDCMSERIEHELPER_H_ -#include "gdcmCommon.h" +#include "gdcmRefCounter.h" #include "gdcmTagKey.h" #include "gdcmDebug.h" // for LEGACY -#include "gdcmCommandManager.h" + +#include "gdcmDicomDirSerie.h" #include #include #include -namespace gdcm +namespace GDCM_NAME_SPACE { class File; typedef std::vector FileList; - - /// \brief XCoherent stands for 'Extra Coherent', +#ifndef GDCM_LEGACY_REMOVE + typedef std::vector GdcmFileList; +#endif + + /// \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 std::map XCoherentFileSetmap; + typedef bool (*BOOL_FUNCTION_PFILE_PFILE_POINTER)(File *, File *); //----------------------------------------------------------------------------- @@ -56,13 +60,14 @@ class File; * into several XCoherent Filesets * XCoherent stands for 'Extra Coherent' (same orientation, or same position) */ -class GDCM_EXPORT SerieHelper : public CommandManager + +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 : + /// (List were actually std::vectors, and where no coherent at all : /// They were only Single SeriesInstanceUID File sets) typedef std::map SingleSerieUIDFileSetmap; @@ -76,12 +81,21 @@ public: /// \todo should return bool or throw error ? void AddFileName(std::string const &filename); - void AddGdcmFile(File *header); + bool AddFile(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 @@ -89,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(); @@ -99,22 +113,53 @@ public: /// brief returns the 'Series Instance UID' Single SerieUID FileSet std::string GetCurrentSerieUIDFileSetUID() { return (*ItFileSetHt).first; } + + /// \brief returns the distance between the 2 first -adjacent- slices, + /// along the slice normal; -1.0 if process failed + /// Computed during ImagePositionPatientOrdering() process. + /// To be use *immediately after* ImagePositionPatientOrdering() + /// (it's a member of the FileHelper, *not* of the FileList !) + double GetZSpacing() { return ZSpacing; } + /// All the following allow user to restrict DICOM file to be part /// of a particular serie + /// \todo : find a trick to allow user to say the restrictions are ored + /// (not only anded) + /// ex : keep the images whose SerieNumber is 101 or 102 or 103. + void AddRestriction(TagKey const &key); 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; } + { + m_UseSeriesDetails = useSeriesDetails; + } + bool GetUseSeriesDetails() + { + return m_UseSeriesDetails; + } + /// \brief This function will add the following DICOM tag as being part of a + /// 'fake' uid. This is usefull when the Serie UID is not enough to disseminate + /// into multiple sub serie when needed: + /// 0020 0011 Series Number + /// 0018 0024 Sequence Name + /// 0018 0050 Slice Thickness + /// 0028 0010 Rows + /// 0028 0011 Columns + void CreateDefaultUniqueSeriesIdentifier(); + + void AddSeriesDetail(uint16_t group, uint16_t elem, bool convert); + + std::string CreateUserDefinedFileIdentifier( File * inFile ); - // \brief Create a string that uniquely identifies a series. By default + /// \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. @@ -126,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; } @@ -140,17 +191,22 @@ public: XCoherentFileSetmap SplitOnOrientation(FileList *fileSet); XCoherentFileSetmap SplitOnPosition(FileList *fileSet); XCoherentFileSetmap SplitOnTagValue(FileList *fileSet, - uint16_t group, uint16_t elem); + 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); @@ -160,12 +216,14 @@ private: SingleSerieUIDFileSetmap SingleSerieUIDFileSetHT; SingleSerieUIDFileSetmap::iterator ItFileSetHt; - + +#ifndef GDCM_LEGACY_REMOVE typedef std::pair Rule; typedef std::vector SerieRestrictions; SerieRestrictions Restrictions; - - // New style for (extented) Rules (Moreover old one doesn't compile) +#endif + + // New style for (extented) Rules typedef struct { uint16_t group; uint16_t elem; @@ -174,7 +232,16 @@ private: } ExRule; typedef std::vector SerieExRestrictions; SerieExRestrictions ExRestrictions; - bool m_UseSeriesDetails; + SerieExRestrictions ExRefine; + + typedef struct { + uint16_t group; + uint16_t elem; + bool convert; + } ExDetail; + typedef std::vector SeriesExDetails; + SeriesExDetails ExDetails; + /// \brief Bit string integer (each one considered as a boolean) /// Bit 0 : Skip Sequences, if possible @@ -188,8 +255,19 @@ private: /// \brief If user knows more about his images than gdcm does, /// he may supply his own comparison function. - BOOL_FUNCTION_PFILE_PFILE_POINTER UserLessThanFunction; + BOOL_FUNCTION_PFILE_PFILE_POINTER UserLessThanFunction; + + bool DropDuplicatePositions; + void Sort(FileList *fileList, bool (*pt2Func)( File *file1, File *file2) ); + + bool m_UseSeriesDetails; + /// \brief distance between the 2 first -adjancent- slices, along the slice normal + /// Computed during ImagePositionPatientOrdering() process. + /// (we need to sort the whole image set to do that) + /// To be used *immediately after* ImagePositionPatientOrdering() + /// (it's a member of the FileHelper, *not* of the FileList !) + double ZSpacing; }; } // end namespace gdcm