X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FexXCoherentFileSet.cxx;h=8f22110c07ab4351c0172118a301ecfe08df978c;hb=6fc9a59ce58ba4bb71d63a57e6b1ef2c3c87292a;hp=4e60070acbcaec76a84733b149c1b6ae45230aee;hpb=1eba3390e6cf61ea34dae11dfcf7de4e353c97c6;p=gdcm.git diff --git a/Example/exXCoherentFileSet.cxx b/Example/exXCoherentFileSet.cxx index 4e60070a..8f22110c 100755 --- a/Example/exXCoherentFileSet.cxx +++ b/Example/exXCoherentFileSet.cxx @@ -1,15 +1,15 @@ /*========================================================================= - + Program: gdcm Module: $RCSfile: exXCoherentFileSet.cxx,v $ Language: C++ - Date: $Date: 2007/09/28 14:08:08 $ - Version: $Revision: 1.11 $ + Date: $Date: 2009/05/28 15:44:34 $ + Version: $Revision: 1.16 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. - + This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. @@ -21,40 +21,13 @@ #include #include "gdcmDirList.h" #include "gdcmUtil.h" - #include "gdcmArgMgr.h" - -void removeSpecChar(std::string &s); - -void removeSpecChar(std::string &s) { - unsigned int s_size = s.size(); - for(unsigned int i=0; i= '+' && s[i] <= '-') - || (s[i] >= 'a' && s[i] <= 'z') - || (s[i] >= '0' && s[i] <= '9') - || (s[i] >= 'A' && s[i] <= 'Z'))) - { - s.replace(i, 1, "_"); // ImagePositionPatient related stuff will be more human readable - } - } - - // deal with Dicom strings trailing '\0' - if(s[s_size-1] == '_') - s.erase(s_size-1, 1); - -} - int main(int argc, char *argv[]) -{ - +{ START_USAGE(usage) "\n exXCoherentFileSet :\n ", "Shows the various 'XCoherent' Filesets within a directory ", - "Optionaly copis the images in a Directories tree ", + "Optionaly copies the images in a Directories tree ", "usage: exXCoherentFileSet {dirin=inputDirectoryName} ", " dirout=outputDirectoryName ", " { tag=group-elem | pos | ori } [sort] [write] ", @@ -76,12 +49,12 @@ int main(int argc, char *argv[]) " 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 ", - " verbose : user wants to run the program in 'verbose mode' ", + " verbose : user wants to run the program in 'verbose mode' ", " debug : developper wants to run the program in 'debug mode' ", FINISH_USAGE // ----- Initialize Arguments Manager ------ - + GDCM_NAME_SPACE::ArgMgr *am = new GDCM_NAME_SPACE::ArgMgr(argc, argv); if (am->ArgMgrDefined("usage") || argc == 1) @@ -93,11 +66,11 @@ int main(int argc, char *argv[]) if (am->ArgMgrDefined("debug")) GDCM_NAME_SPACE::Debug::DebugOn(); - + int loadMode = GDCM_NAME_SPACE::LD_ALL; if ( am->ArgMgrDefined("noshadowseq") ) loadMode |= GDCM_NAME_SPACE::LD_NOSHADOWSEQ; - else + else { if ( am->ArgMgrDefined("noshadow") ) loadMode |= GDCM_NAME_SPACE::LD_NOSHADOW; @@ -111,16 +84,16 @@ int main(int argc, char *argv[]) std::cout <ArgMgrUsage(usage); // Display 'usage' delete am; return 0; } - const char *dirNameout; + const char *dirNameout; dirNameout = am->ArgMgrGetString("dirout","."); - bool pos = ( 0 != am->ArgMgrDefined("pos") ); - bool ori = ( 0 != am->ArgMgrDefined("ori") ); + bool pos = ( 0 != am->ArgMgrDefined("pos") ); + bool ori = ( 0 != am->ArgMgrDefined("ori") ); bool sort = ( 0 != am->ArgMgrDefined("sort") ); bool write = ( 0 != am->ArgMgrDefined("write") ); bool verbose = ( 0 != am->ArgMgrDefined("verbose") ); @@ -130,15 +103,15 @@ int main(int argc, char *argv[]) { std::cout << " POS, ORI and TAG are mutually exclusive" << std::endl; delete am; - return 0; + return 0; } if( (!tag && !pos && !ori)) { std::cout << " One of POS, ORI and TAG is mandatory!" << std::endl; delete am; - return 0; - } + return 0; + } int nb; uint16_t *groupelem; if (tag) @@ -150,16 +123,16 @@ int main(int argc, char *argv[]) delete am; return 0; } - } - + } + /* if unused Param we give up */ if ( am->ArgMgrPrintUnusedLabels() ) { am->ArgMgrUsage(usage); delete am; return 0; - } - + } + delete am; // ------ we don't need Arguments Manager any longer ------ GDCM_NAME_SPACE::SerieHelper *s; @@ -167,17 +140,17 @@ int main(int argc, char *argv[]) s = GDCM_NAME_SPACE::SerieHelper::New(); s->SetLoadMode(GDCM_NAME_SPACE::LD_ALL); // Load everything for each File - //GDCM_NAME_SPACE::TagKey t(0x0020,0x0013); + //GDCM_NAME_SPACE::TagKey t(0x0020,0x0013); //s->AddRestriction(t, "340", GDCM_NAME_SPACE::GDCM_LESS); // Keep only files where // restriction is true - + s->SetDirectory(dirName, true); // true : recursive exploration // The Dicom file set is splitted into several 'Single SerieUID Files Sets' // (a 'Single SerieUID Files Set' per SerieUID) // In some cases, it's not enough, since, in some cases // we can find scout view with the same SerieUID - + /* std::cout << " ---------------------------------------- " << "'Single UID' Filesets found in :[" @@ -189,8 +162,8 @@ int main(int argc, char *argv[]) */ std::string systemCommand; - std::string filenameout; - if (write) { + std::string filenameout; + if (write) { if (verbose) std::cout << "Check for output directory :[" << dirNameout << "]." < End of checking supposed-to-be-directory names - + int nbFiles; std::string fileName; - + // For all the Single SerieUID Files Sets of the GDCM_NAME_SPACE::Serie GDCM_NAME_SPACE::FileList *l = s->GetFirstSingleSerieUIDFileSet(); - GDCM_NAME_SPACE::XCoherentFileSetmap xcm; - + std::string serieUID; std::string currentSerieWriteDir = ""; - std::string xCoherentWriteDir = ""; - std::string xCoherentName = ""; + std::string xCoherentWriteDir = ""; + std::string xCoherentName = ""; std::string serieDirectory; std::string lastFilename; - - int controlCount = 0; + std::string rep("_"); + int controlCount = 0; + while (l) // for each 'Single SerieUID FileSet' { nbFiles = l->size() ; @@ -247,63 +219,64 @@ int main(int argc, char *argv[]) // Why not ? Just an example, for testing! { serieUID = s->GetCurrentSerieUIDFileSetUID(); - removeSpecChar(serieUID); - + GDCM_NAME_SPACE::Util::ReplaceSpecChar(serieUID, rep); + // --- for write if (write) { currentSerieWriteDir = currentSerieWriteDir + dirNameout; - unsigned int l = strlen(dirNameout)-1; - if ( dirNameout[l] != '/' && dirNameout[l] != '\\') + unsigned int lg = strlen(dirNameout)-1; + if ( dirNameout[lg] != '/' && dirNameout[lg] != '\\') currentSerieWriteDir = currentSerieWriteDir + GDCM_NAME_SPACE::GDCM_FILESEPARATOR; - + currentSerieWriteDir = currentSerieWriteDir + serieUID; if (verbose) std::cout << "[" << currentSerieWriteDir<< "]" << std::endl; // if ( ! GDCM_NAME_SPACE::DirList::IsDirectory(currentSerieWriteDir) ) - { + { systemCommand = "mkdir " + currentSerieWriteDir; system( systemCommand.c_str()); if (verbose) std::cout << "1 " <SplitOnOrientation(l); else if (pos) xcm = s->SplitOnPosition(l); - else if (groupelem != 0) + else if (groupelem != 0) { xcm = s->SplitOnTagValue(l, groupelem[0],groupelem[1] ); + } for (GDCM_NAME_SPACE::XCoherentFileSetmap::iterator i = xcm.begin(); i != xcm.end(); ++i) { - xCoherentName = (*i).first; + xCoherentName = (*i).first; if (verbose) std::cout << "xCoherentName = " << xCoherentName << std::endl; - removeSpecChar(xCoherentName); + GDCM_NAME_SPACE::Util::ReplaceSpecChar(serieUID, rep); // --- for write if (write) - { + { xCoherentWriteDir = currentSerieWriteDir + GDCM_NAME_SPACE::GDCM_FILESEPARATOR+ xCoherentName; // if ( ! GDCM_NAME_SPACE::DirList::IsDirectory(xCoherentWriteDir) ) - { + { systemCommand = "mkdir " + xCoherentWriteDir; system( systemCommand.c_str()); if (verbose) - std::cout << "2 " << systemCommand << std::endl; + std::cout << systemCommand << std::endl; } } // --- end for write - + if (ori) std::cout << "Orientation : "; else if (pos) @@ -312,20 +285,20 @@ int main(int argc, char *argv[]) std::cout << "Tag (" << std::hex << groupelem[0] << "|" << groupelem[1] << ") value : "; std::cout << "[" << (*i).first << "]" << std::endl; - + if (verbose) std::cout << "xCoherentName [" << xCoherentName << "]" << std::endl; - + // Within a 'just to see' program, // OrderFileList() causes trouble, since some files // (eg:MIP views) don't have 'Position', now considered as mandatory // Commented out for the moment. - + if (sort) { s->OrderFileList((*i).second); // sort the XCoherent Fileset std::cout << "ZSpacing for the file set " << s->GetZSpacing() << std::endl; - } + } for (GDCM_NAME_SPACE::FileList::iterator it = ((*i).second)->begin(); it != ((*i).second)->end(); @@ -334,20 +307,20 @@ int main(int argc, char *argv[]) controlCount ++; fileName = (*it)->GetFileName(); std::cout << " " << fileName << std::endl; - + // --- for write if (write) { lastFilename = GDCM_NAME_SPACE::Util::GetName( fileName ); - filenameout = xCoherentWriteDir + GDCM_NAME_SPACE::GDCM_FILESEPARATOR+ lastFilename; + filenameout = xCoherentWriteDir + GDCM_NAME_SPACE::GDCM_FILESEPARATOR+ lastFilename; systemCommand = "cp " + fileName + " " + filenameout; system( systemCommand.c_str()); if (verbose) std::cout << "3 " << systemCommand << std::endl; - } - // --- end for write - } - std::cout << std::endl; + } + // --- end for write + } + std::cout << std::endl; } } l = s->GetNextSingleSerieUIDFileSet(); @@ -355,7 +328,7 @@ int main(int argc, char *argv[]) if ( controlCount == 0 ) std::cout << "No suitable file was found!" << std::endl; - + s->Delete(); return 0;