X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FDenseMultiFramesToDicom.cxx;h=18109cac808234b39b190eba5f272bdca531e48b;hb=3f4f97595ab182ee8c0f0f2732c3aaa52ba4df08;hp=cba55e5bab2be4089d5468f7ff67027d80b039b2;hpb=c5ac3331cd0380dd44c10ccb9a17ed8587380144;p=gdcm.git diff --git a/Example/DenseMultiFramesToDicom.cxx b/Example/DenseMultiFramesToDicom.cxx index cba55e5b..18109cac 100755 --- a/Example/DenseMultiFramesToDicom.cxx +++ b/Example/DenseMultiFramesToDicom.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: DenseMultiFramesToDicom.cxx,v $ Language: C++ - Date: $Date: 2007/06/26 15:42:14 $ - Version: $Revision: 1.6 $ + Date: $Date: 2007/10/29 17:13:59 $ + 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 @@ -20,6 +20,10 @@ #include //#include +#if defined(__BORLANDC__) +#include +#endif + #include "gdcmFile.h" #include "gdcmFileHelper.h" #include "gdcmDebug.h" @@ -36,9 +40,8 @@ * WARNING : directory must contain ONLY .txt files */ - void Load(std::ifstream &from, std::string imageName, std::string patName, - std::string strStudyUID, int serieNumber); + std::string strStudyUID, std::string strSerieUID, int serieNumber, int verbose); //std::ifstream& eatwhite(std::ifstream& is); @@ -129,15 +132,20 @@ int main(int argc, char *argv[]) int verbose = am->ArgMgrDefined("verbose"); int listonly = am->ArgMgrDefined("listonly"); std::string patName = am->ArgMgrGetString("patname", dirNamein); + + bool userDefinedStudy = ( 0 != am->ArgMgrDefined("studyUID") ); - bool userDefinedStudy = am->ArgMgrDefined("studyUID"); - const char *studyUID = am->ArgMgrGetString("studyUID"); + const char *studyUID; + if (userDefinedStudy) + studyUID = am->ArgMgrGetString("studyUID"); + + // not described *on purpose* in the Usage ! + bool userDefinedSerie = ( 0 != am->ArgMgrDefined("serieUID") ); + + const char *serieUID; + if(userDefinedSerie) + serieUID = am->ArgMgrGetString("serieUID"); -// not described *on purpose* in the Usage ! - bool userDefinedSerie = am->ArgMgrDefined("serieUID"); - const char *serieUID = am->ArgMgrGetString("serieUID"); - - // if unused Param we give up if ( am->ArgMgrPrintUnusedLabels() ) { @@ -157,7 +165,8 @@ int main(int argc, char *argv[]) } else { - std::cout << "OK : [" << dirNamein << "] is a Directory." << std::endl; + if (verbose) + std::cout << "OK : [" << dirNamein << "] is a Directory." << std::endl; } std::string strDirNamein(dirNamein); @@ -174,7 +183,19 @@ int main(int argc, char *argv[]) std::string filenameout; std::string strStudyUID; - strStudyUID = GDCM_NAME_SPACE::Util::CreateUniqueUID(); + std::string strSerieUID; + + if (userDefinedStudy) + strSerieUID = studyUID; + else + strStudyUID = GDCM_NAME_SPACE::Util::CreateUniqueUID(); + + if (userDefinedStudy) + strSerieUID = serieUID; + else + strStudyUID = GDCM_NAME_SPACE::Util::CreateUniqueUID(); + + int serieNumber =0; GDCM_NAME_SPACE::DirListType fileNames; fileNames = dirList.GetFilenames(); @@ -201,22 +222,26 @@ int main(int argc, char *argv[]) } else { - std::cout << "Success in open file" << *it << std::endl; - Load(from, *it, patName, strStudyUID, serieNumber); + if (verbose) + std::cout << "Success in open file" << *it << std::endl; + Load(from, *it, patName, strStudyUID, strSerieUID, serieNumber, verbose); serieNumber+=2; //return 0; } } + return 1; } void Load(std::ifstream &from, std::string imageName, std::string patName, - std::string strStudyUID, int serieNumber) + std::string strStudyUID, std::string strSerieUID, int serieNumber, int verbose) { - std::cout << " ========= Deal with file [" << imageName << "]" << std::endl; + if (verbose) + std::cout << " ========= Deal with file [" << imageName << "]" << std::endl; if (!from) return; - std::cout << " ========= Create Parametric images" << std::endl; + if (verbose) + std::cout << " ========= Create Parametric images" << std::endl; /* was OK for single frames eg : --------------------------- @@ -269,7 +294,8 @@ All pixels with zero strain values are outside the masks. from >> str1; from >> str1; // 52x59x14 - std::cout << "[" << str1 << "]" << std::endl; + if(verbose) + std::cout << "[" << str1 << "]" << std::endl; sscanf( str1.c_str(),"%dx%dx%d", &nx,&ny,&nf); std::cout << nx << " " << ny << " " << nf << std::endl; @@ -284,7 +310,8 @@ All pixels with zero strain values are outside the masks. float temporalResolution; sscanf( str1.c_str(),"%f",&temporalResolution); - std::cout << "temporal Resolution = " << temporalResolution << std::endl; + if(verbose) + std::cout << "temporal Resolution = " << temporalResolution << std::endl; std::getline(from, str1); from >> str1; // First @@ -310,15 +337,14 @@ All pixels with zero strain values are outside the masks. float *f = (float *) malloc(nx*ny*nf*sizeof(float)); // float mini = FLT_MAX, maxi = FLT_MIN; float val; - - std::string strSerieUID; - strSerieUID = GDCM_NAME_SPACE::Util::CreateUniqueUID(); + int imageNumber = 0; float currentTime; currentTime = timeStart; - for (int l=0; lInsertEntryString(charImagePosition,0x0020,0x1041, "DS"); //0008 103e LO 1 Series Description @@ -496,9 +522,10 @@ All pixels with zero strain values are outside the masks. fh->SetWriteTypeToDcmExplVR(); char numero[10]; - sprintf(numero, "%02d", l); + sprintf(numero, "%02d", l1); std::string fileName = imageName + "." + numero + ".dcm"; - std::cout << "fileName " << fileName << std::endl; + if(verbose) + std::cout << "fileName " << fileName << std::endl; if( !fh->Write(fileName)) std::cout << "Failed for [" << fileName << "]\n" @@ -518,7 +545,7 @@ All pixels with zero strain values are outside the masks. imageNumber = 0; currentTime = timeStart; - for (int l=0; lInsertEntryString(charImagePosition,0x0020,0x1041, "DS"); //0008 103e LO 1 Series Description @@ -642,7 +669,7 @@ All pixels with zero strain values are outside the masks. fh->SetWriteTypeToDcmExplVR(); char numero[10]; - sprintf(numero, "%02d", l); + sprintf(numero, "%02d", l1); std::string fileName = imageName + ".Anatomical." + numero + ".dcm"; std::cout << "fileName " << fileName << std::endl; @@ -657,4 +684,4 @@ All pixels with zero strain values are outside the masks. } // end loop on frames from.close(); -} +} // end void Load(