From: jpr Date: Fri, 15 Jun 2007 13:18:50 +0000 (+0000) Subject: Update comments X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=7dc67f3f6c048f30c66765c15710ceaa82f228e9;p=gdcm.git Update comments --- diff --git a/Example/Anonymize.cxx b/Example/Anonymize.cxx index 59671b23..908726dc 100644 --- a/Example/Anonymize.cxx +++ b/Example/Anonymize.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: Anonymize.cxx,v $ Language: C++ - Date: $Date: 2007/05/23 14:18:04 $ - Version: $Revision: 1.12 $ + Date: $Date: 2007/06/15 13:18:50 $ + Version: $Revision: 1.13 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -141,7 +141,7 @@ int main(int argc, char *argv[]) // Write a new file // ============================================================ - // Since we just Anonymized the file, we know no modification + // Since we just Anonymized the file, we know that no modification // was performed on the pixels. // The written image will not appear as a 'Secondary Captured image' // nor as a DERIVED one diff --git a/Example/CMakeLists.txt b/Example/CMakeLists.txt index ce901013..5372702b 100644 --- a/Example/CMakeLists.txt +++ b/Example/CMakeLists.txt @@ -8,6 +8,8 @@ INCLUDE_DIRECTORIES( SET(EXAMPLE_SOURCES #names starting with 'ex' are examples #Txt2Mat + exDicomRTStructSetFile + exExtractCSA exReadPapyrus exReadWriteFile exColorToRGB diff --git a/Example/exExtractCSA.cxx b/Example/exExtractCSA.cxx index 35c1a8a3..ff5e444a 100755 --- a/Example/exExtractCSA.cxx +++ b/Example/exExtractCSA.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: exExtractCSA.cxx,v $ Language: C++ - Date: $Date: 2007/06/07 16:13:14 $ - Version: $Revision: 1.1 $ + Date: $Date: 2007/06/15 13:18:51 $ + Version: $Revision: 1.2 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -395,7 +395,8 @@ if (verbose) uint32_t item_xx[4]; is.read((char*)&item_xx, 4*sizeof(uint32_t)); if (verbose) - std::cout << "item_xx=" << item_xx[0] << " " << item_xx[1] << " " + std::cout << std::dec + << "item_xx=" << item_xx[0] << " " << item_xx[1] << " " << item_xx[2] << " " << item_xx[3] << std::endl; //std::cout << "0x" << std::hex << is.tellg() << std::dec << std::endl; assert( item_xx[2] == 77 || item_xx[2] == 205 ); diff --git a/Example/exXCoherentFileSet.cxx b/Example/exXCoherentFileSet.cxx index 37daea6a..eced5e99 100755 --- a/Example/exXCoherentFileSet.cxx +++ b/Example/exXCoherentFileSet.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: exXCoherentFileSet.cxx,v $ Language: C++ - Date: $Date: 2007/05/23 14:18:05 $ - Version: $Revision: 1.9 $ + Date: $Date: 2007/06/15 13:18:51 $ + Version: $Revision: 1.10 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -29,7 +29,7 @@ int main(int argc, char *argv[]) "\n exXCoherentFileSet :\n ", "Shows the various 'XCoherent' Filesets within a directory ", "usage: exXCoherentFileSet {dirin=inputDirectoryName} ", - " { tag= group-elem | pos | ori } ", + " { tag= group-elem | pos | ori } sort ", " [ { [noshadowseq] | [noshadow][noseq] } ] [debug] ", " ", " inputDirectoryName : user wants to analyze *all* the files ", @@ -40,6 +40,8 @@ int main(int argc, char *argv[]) " 'Image Orientation ' ", " tag : group-elem (in hexa, no space) ", " the user wants to split on ", + " sort : user wants FileHelper to sort the images ", + " Warning : will probabely crah if sort has no meaning ", " 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 ", @@ -84,9 +86,10 @@ int main(int argc, char *argv[]) // FIXME : check only one of them is set ! - int pos = am->ArgMgrDefined("pos"); - int ori = am->ArgMgrDefined("ori"); - + int pos = am->ArgMgrDefined("pos"); + int ori = am->ArgMgrDefined("ori"); + int sort = am->ArgMgrDefined("sort"); + int nb; uint16_t *groupelem; groupelem = am->ArgMgrGetXInt16Enum("tag", &nb); @@ -177,9 +180,13 @@ int main(int argc, char *argv[]) // OrderFileList() causes trouble, since some files // (eg:MIP views) don't have 'Position', now considered as mandatory // Commented out for the moment. - - //s->OrderFileList((*i).second); // sort the XCoherent Fileset - + + 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(); ++it)