Program: gdcm
Module: $RCSfile: gdcmDirList.cxx,v $
Language: C++
- Date: $Date: 2007/05/23 14:18:09 $
- Version: $Revision: 1.61 $
+ Date: $Date: 2007/06/08 12:49:37 $
+ Version: $Revision: 1.62 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmUtil.h"
#include "gdcmDebug.h"
+#include "gdcmDicomDirImage.h"
+
#include <iterator>
#include <assert.h>
#include <errno.h>
Explore(dirName, recursive);
}
+/**
+ * \brief Constructor
+ * @param dirName root directory name
+ * @param recursive whether we want to explore recursively or not
+ */
+DirList::DirList(DicomDirSerie *se)
+{
+ Explore(se);
+}
/**
* \brief Destructor
*/
//-----------------------------------------------------------------------------
// Private
+
+/**
+ * \brief Explores a DicomDirSerie
+ * return number of files found
+ * @param se DicomDirSerie to explore
+ */
+int DirList::Explore(DicomDirSerie *se)
+{
+ int numberOfFiles = 0;
+
+ DicomDirImage *im = se->GetFirstImage();
+ while ( im )
+ {
+ Filenames.push_back( im->GetEntryString(0x0004, 0x1500) );// File name (Referenced File ID)
+ numberOfFiles++;
+ im = se->GetNextImage();
+ }
+ return numberOfFiles;
+}
+
/**
* \brief Explore a directory with possibility of recursion
* return number of files read
Program: gdcm
Module: $RCSfile: gdcmDirList.h,v $
Language: C++
- Date: $Date: 2007/05/23 14:18:09 $
- Version: $Revision: 1.33 $
+ Date: $Date: 2007/06/08 12:49:37 $
+ Version: $Revision: 1.34 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#define GDCMDIRLIST_H
#include "gdcmBase.h"
+#include "gdcmDicomDirSerie.h"
#include <string>
#include <vector>
{
public :
DirList(std::string const &dirName, bool recursive);
+ DirList(DicomDirSerie *s);
~DirList();
void Print(std::ostream &os = std::cout, std::string const &indent = "" );
private :
int Explore(std::string const &dirName, bool recursive=false);
-
+ int Explore(DicomDirSerie *s);
+
/// List of file names
DirListType Filenames;
/// name of the root directory to explore
Program: gdcm
Module: $RCSfile: gdcmSerieHelper.cxx,v $
Language: C++
- Date: $Date: 2007/06/04 08:51:24 $
- Version: $Revision: 1.56 $
+ Date: $Date: 2007/06/08 12:49:37 $
+ Version: $Revision: 1.57 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
ClearAll();
UserLessThanFunction = 0;
DirectOrder = true;
+
}
/**
* e.g : 100 would be *before* 20; 000020.00 vs 00100.00 : OK
*/
void SerieHelper::AddSeriesDetail(uint16_t group, uint16_t elem, bool convert)
-{
-
+{
ExDetail d;
d.group = group;
d.elem = elem;
}
}
+/**
+ * \brief Sets the DicomDirSerie
+ * @param se DicomDirSerie to deal with
+ */
+void SerieHelper::SetDicomDirSerie(DicomDirSerie *se)
+{
+ DirList dirList(se);
+
+ DirListType filenames_list = dirList.GetFilenames();
+ for( DirListType::const_iterator it = filenames_list.begin();
+ it != filenames_list.end(); ++it)
+ {
+ AddFileName( *it );
+ }
+}
+
/**
* \brief Sorts the given Fileset
* \warning This could be implemented in a 'Strategy Pattern' approach
}
if (!ok)
{
- return false;
+ if (! DropDuplicatePositions)
+ return false;
}
// Now, we could calculate Z Spacing as the difference
++it3)
{
fileList->push_back( (*it3).second );
+ if (DropDuplicatePositions)
+ {
+ it3 = distmultimap.upper_bound((*it3).first); // skip all duplicates
+ if (it3 == distmultimap.end() ) // if last image, stop iterate
+ break;
+ }
}
}
else // user asked for reverse order
{
it4--;
fileList->push_back( (*it4).second );
+ if (DropDuplicatePositions) // skip all duplicates
+ {
+ it4 = distmultimap.upper_bound((*it4).first);
+ if (it4 == distmultimap.begin() ) // if first image, stop iterate
+ break;
+ }
} while (it4 != distmultimap.begin() );
}
Program: gdcm
Module: $RCSfile: gdcmSerieHelper.h,v $
Language: C++
- Date: $Date: 2007/05/23 14:18:11 $
- Version: $Revision: 1.42 $
+ Date: $Date: 2007/06/08 12:49:37 $
+ Version: $Revision: 1.43 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmRefCounter.h"
#include "gdcmTagKey.h"
#include "gdcmDebug.h" // for LEGACY
+
+#include "gdcmDicomDirSerie.h"
#include <vector>
#include <iostream>
// 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(); }
/// 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);
* @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; }
/// 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;
projects / gdcm.git / commitdiff