Program: gdcm
Module: $RCSfile: SplitIntoDirectories.cxx,v $
Language: C++
- Date: $Date: 2007/09/26 08:14:27 $
- Version: $Revision: 1.1 $
+ Date: $Date: 2007/10/19 14:12:31 $
+ Version: $Revision: 1.3 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
" dirout=outputDirectoryName ",
" { [keep= list of seriesNumber to process] ",
" | [drop= list of seriesNumber to ignore] } ",
- " [listonly] ",
+ " [listonly] [skel] [seriedescr] ",
" [noshadowseq][noshadow][noseq] [verbose] [debug] ",
" ",
" dirout : will be created if doesn't exist ",
" drop : if user wants to ignore a limited number of series ",
" he gives the list of 'SeriesNumber' (tag 0020|0011) ",
" SeriesNumber are short enough to be human readable ",
- " e.g : 1030,1035,1043 ",
+ " e.g : 1030,1035,1043 ",
+ " seriedescr : SerieDescription+SerieNumber use for directory name ",
+ " (instead of SeriesInstanceUID) ",
+ " skel : name skeleton eg : patName_1.nema -> skel=patName_ ",
" noshadowseq: user doesn't want to load Private Sequences ",
" noshadow : user doesn't want to load Private groups (odd number) ",
" noseq : user doesn't want to load Sequences ",
FINISH_USAGE
+ // VERY IMPORTANT :
+ // Respect this order while creating 'UserFileIdentifier'
+ // (mind the order of the 'AddSeriesDetail' !)
+
enum Index
{
IND_PatientName,
IND_StudyInstanceUID,
- IND_SerieInstanceUID
+ IND_SerieInstanceUID,
+ IND_SerieDescription,
+ IND_SerieNumber,
+ IND_FileName
};
std::cout << "... inside " << argv[0] << std::endl;
if (am->ArgMgrDefined("debug"))
GDCM_NAME_SPACE::Debug::DebugOn();
- bool verbose = ( 0 != am->ArgMgrDefined("verbose") );
- bool listonly = ( 0 != am->ArgMgrDefined("listonly") );
-
+ bool verbose = ( 0 != am->ArgMgrDefined("verbose") );
+ bool listonly = ( 0 != am->ArgMgrDefined("listonly") );
+ bool seriedescr = ( 0 != am->ArgMgrDefined("seriedescr") );
+
int nbSeriesToKeep;
int *seriesToKeep = am->ArgMgrGetListOfInt("keep", &nbSeriesToKeep);
int nbSeriesToDrop;
return 0;
}
- int hasSkel = am->ArgMgrDefined("skel");
+ bool hasSkel = ( 0 != am->ArgMgrDefined("hasSkel") );
const char *skel;
if (hasSkel)
skel = am->ArgMgrGetString("skel");
-
+
+
const char *input = am->ArgMgrGetString("input","DCM");
// if unused Param we give up
std::string userFileIdentifier;
SortedFiles sf;
+
+
+ // VERY IMPORTANT :
+ // Respect the order you choosed in 'enum Index' !
+/*
+ enum Index
+ {
+ IND_PatientName,
+ IND_StudyInstanceUID,
+ IND_SerieInstanceUID,
+ IND_SerieDescription,
+ IND_SerieNumber,
+ IND_FileName
+ };
+*/
s->AddSeriesDetail(0x0010, 0x0010, false); // Patient's Name (false : no convert)
// You may prefer 0020 0010 Study ID
// use :
// s->AddSeriesDetail(0x0020, 0x0011, true);
s->AddSeriesDetail(0x0020, 0x000e, false); // Series Instance UID (false : no convert)
+
+ s->AddSeriesDetail(0x0008, 0x103e, false); // Serie Description
+ s->AddSeriesDetail(0x0020, 0x0011, false); // Serie Number (more than 1 serie may have the same Descr. don't 'convert!)
// Feel free to add more fields, if they can help a suitable (for you)
// image sorting
f->Delete();
continue;
}
- }
+ }
- userFileIdentifier=s->CreateUserDefinedFileIdentifier(f);
+ userFileIdentifier=s->CreateUserDefinedFileIdentifier(f);
tokens.clear();
- GDCM_NAME_SPACE::Util::Tokenize (userFileIdentifier, tokens, token);
-
- int imageNum; // Within FileName
+ GDCM_NAME_SPACE::Util::Tokenize (userFileIdentifier, tokens, token);
+
+ //int imageNum; // Within FileName
char newName[1024];
-
+ ///this is a trick to build up a lexicographical compliant name :
+ /// eg : fich001.ima vs fich100.ima as opposed to fich1.ima vs fich100.ima
+ std::string name = GDCM_NAME_SPACE::Util::GetName( *it );
+
+ if (hasSkel)
+ {
+ int imageNum; // Within FileName
+ GDCM_NAME_SPACE::Util::Tokenize (name, tokensForFileName, skel);
+ imageNum = atoi ( tokensForFileName[0].c_str() );
+ // probabely we could write something much more complicated using C++ !
+ sprintf (newName, "%s%06d.dcm", skel, imageNum);
+ tokens[IND_FileName] = newName;
+ tokensForFileName.clear();
+ }
+ else
+ {
+ tokens[IND_FileName] = name;
+ }
+
// Patient's Name
// Study Instance UID
// Series Instance UID
+ // file Name
userFileIdentifier = tokens[IND_PatientName] + token +
tokens[IND_StudyInstanceUID] + token +
- tokens[IND_SerieInstanceUID] + token;
+ tokens[IND_SerieInstanceUID] + token +
+
+ tokens[IND_SerieDescription] + token +
+ tokens[IND_SerieNumber] + token +
+ tokens[IND_FileName];
if (verbose)
std::cout << "[" << userFileIdentifier << "] : " << *it << std::endl;
std::string previousStudyInstanceUID, currentStudyInstanceUID;
std::string previousSerieInstanceUID, currentSerieInstanceUID;
+ std::string currentSerieDescription, currentSerieNumber;
std::string writeDir, currentWriteDir;
std::string currentPatientWriteDir;
- std::string currentStudyWriteDir;
+ std::string currentStudyWriteDir;
std::string currentSerieWriteDir;
std::string fullWriteFilename;
currentPatientName = tokens[IND_PatientName];
currentStudyInstanceUID = tokens[IND_StudyInstanceUID];
currentSerieInstanceUID = tokens[IND_SerieInstanceUID];
-
+ currentSerieDescription = tokens[IND_SerieDescription];
+ currentSerieNumber = tokens[IND_SerieNumber];
+
if (previousPatientName != currentPatientName)
{
previousPatientName = currentPatientName;
currentPatientWriteDir = writeDir + currentPatientName;
systemCommand = "mkdir " + currentPatientWriteDir;
- if (verbose)
- std::cout << systemCommand << std::endl;
-
- system ( systemCommand.c_str() );
+ if (verbose || listonly)
+ std::cout << "[" << systemCommand << "]" << std::endl;
+ if (!listonly)
+ system ( systemCommand.c_str() );
}
if (previousStudyInstanceUID != currentStudyInstanceUID)
{
+ previousStudyInstanceUID = currentStudyInstanceUID;
if (verbose)
std::cout << "==== === new Study [" << currentStudyInstanceUID << "]"
<< std::endl;
currentStudyWriteDir = currentPatientWriteDir + GDCM_NAME_SPACE::GDCM_FILESEPARATOR
+ currentStudyInstanceUID;
- systemCommand = "mkdir " + currentStudyWriteDir;
- system (systemCommand.c_str());
+ systemCommand = "mkdir " + currentStudyWriteDir;
+
+ if (listonly)
+ std::cout << "[" << systemCommand << "]" << std::endl;
+ else
+ system (systemCommand.c_str());
- previousStudyInstanceUID = currentStudyInstanceUID;
}
if (previousSerieInstanceUID != currentSerieInstanceUID)
{
+ previousSerieInstanceUID = currentSerieInstanceUID;
if (verbose)
std::cout << "=== ==== === new Serie [" << currentSerieInstanceUID << "]"
- << std::endl;
-
- currentSerieWriteDir = currentStudyWriteDir + GDCM_NAME_SPACE::GDCM_FILESEPARATOR
- + currentSerieInstanceUID;
- systemCommand = "mkdir " + currentSerieWriteDir;
- system (systemCommand.c_str());
-
- previousSerieInstanceUID = currentSerieInstanceUID;
+ << std::endl;
+
+ if (seriedescr) // more human readable!
+ currentSerieWriteDir = currentStudyWriteDir + GDCM_NAME_SPACE::GDCM_FILESEPARATOR
+ + currentSerieDescription + "_" + currentSerieNumber;
+ else
+ currentSerieWriteDir = currentStudyWriteDir + GDCM_NAME_SPACE::GDCM_FILESEPARATOR
+ + currentSerieInstanceUID;
+
+ systemCommand = "mkdir " + currentSerieWriteDir;
+
+ if (listonly)
+ std::cout << "[" << systemCommand << "]" << std::endl;
+ else
+ system (systemCommand.c_str());
}
if ( GDCM_NAME_SPACE::Debug::GetDebugFlag())
+ lastFilename;
systemCommand = "cp " + fullFilename + " " + fullWriteFilename;
- system ( systemCommand.c_str());
+
+ if (listonly)
+ std::cout << "[" << systemCommand << "]" << std::endl;
+ else
+ system (systemCommand.c_str());
}
return 0;
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff