X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2Fsrc1%2Fbruker2dicom.cxx;h=05695f43927ab5da979b16a535df6c41b20dea40;hb=2da5837d36be6ef2a73036715343d436231556ff;hp=9cc2301872833ef373a9da3bbff32c25e1550a51;hpb=8f2fc8236f01d70abd3e4abe4152ea7985ab5b79;p=creaBruker.git diff --git a/lib/src1/bruker2dicom.cxx b/lib/src1/bruker2dicom.cxx index 9cc2301..05695f4 100644 --- a/lib/src1/bruker2dicom.cxx +++ b/lib/src1/bruker2dicom.cxx @@ -35,68 +35,153 @@ bool Bruker2Dicom::Execute() throw ( BrukerHopelessException ("Output directory creation failure ")); } - std::string strDirNamein(InputDirName); - GDCM_NAME_SPACE::DirList dirList(strDirNamein, false, true); // DON'T get recursively the list of files - std::string strDirNameout(OutputDirName); - -/* - if (listonly) - { - std::cout << "------------List of found files ------------" << std::endl; - dirList.Print(); - std::cout << std::endl; - return 1; - } -*/ - // // e.g : at level 0, in : B67d1.Bp1 // // 1 2 3 4 5 6 AdjStatePerStudy subject // + std::string strDirNamein(InputDirName); + +/* */ + GDCM_NAME_SPACE::DirList dirList(strDirNamein, false, true); // DON'T get recursively the list of files + GDCM_NAME_SPACE::DirListType fileNames; fileNames = dirList.GetFilenames(); - bool canOpen; - std::string outputFileName; - // BrukerDataSet br_subject; - std::string subject; - subject = GDCM_NAME_SPACE::Util::GetPath(*(fileNames.begin()))+ - GDCM_NAME_SPACE::GDCM_FILESEPARATOR + - "subject"; - if (verbose) - std::cout << " Subject : [" << subject << "]" << std::endl; - - bool subjectFound; - canOpen =br_subject.LoadFile(subject); - if (!canOpen) - { - //std::cout << "Hopeless! no 'subject' found" << std::endl; - //throw ( BrukerHopelessException ("Hopeless! no 'subject' found in root input directory ")); + std::string path = GDCM_NAME_SPACE::Util::GetPath(*(fileNames.begin())); + + std::string subject = path + + GDCM_NAME_SPACE::GDCM_FILESEPARATOR + + "subject"; + + std::string acqp = path + + GDCM_NAME_SPACE::GDCM_FILESEPARATOR + + "acqp"; + + if ( boost::filesystem::is_regular(subject) ) + subjectFound = true; + else + subjectFound = false; // user passed only a 'serie', not a 'study + + if ( boost::filesystem::is_regular(acqp) ) + acqpFound= true; + else + acqpFound = false; // user passed a 'non study' directory; Hope it's a 'set of studies' directory! - std::cout << "Not too much hope! no 'subject' found (Desperate try will be performed -default values- )" << std::endl; - subjectFound = false; - } - else - { - br_subject.FillMap(); - subjectFound = true; - } + int type; + if (subjectFound ) type = 1; // user passed a 'study + else if (acqpFound) type = 2; // user passed a 'serie' + else type = 3; // user passed a 'non study' directory; Hope it's a 'set of studies' directory! + /* */ + + + // 1 : if subjectFound : user passed a Single Study Directory + // 2 : if NOT subjectFound and acqpFound : user passed a Serie Directory + // 3 : if NOT subjectFound and NOT acqpFound : user passed a 'non Study Directory' (Hope it's a set of Single Study Directories) + + //int type = CheckUserDirectory(InputDirName); + + switch (type) + { + case 1: { + bool canOpen = br_subject.LoadFile(subject); + if (!canOpen) + { + std::cout << "Hopeless! 'subject' found / cannot be open" << std::endl; + throw ( BrukerHopelessException ("Hopeless! 'subject' found in root input directory / cannot be open")); + } + else + { + br_subject.FillMap(); + } //br_subject.PrintSelf(); // get info for 'Study Description' - if (subjectFound) - { - BrukerFieldData b_name=br_subject.GetFieldData("SUBJECT_name_string"); - subject_name = b_name.GetStringValue()[0]; - strPatientName = subject_name; - cleanString(subject_name); - } - else - subject_name ="defaultPatName"; + BrukerFieldData b_name=br_subject.GetFieldData("SUBJECT_name_string"); + subject_name = b_name.GetStringValue()[0]; + strPatientName = subject_name; + cleanString(subject_name); + DealWithSingleStudyDirectory (fileNames); + break; + } + + case 2: { + subject_name = "defaultPatName"; + strPatientName = subject_name; + DealWithSingleStudyDirectory (fileNames); + break; + } + + case 3: { + std::cout << " user passed a 'non study' directory; Hope it's a 'set of studies' directory!, not yet dealt with" << std::endl; + DealWithMultiStudyDirectory (fileNames); + break; + } + } +} + +// ---------------------------------------------------------------------------------------------------------- + +void Bruker2Dicom::DealWithMultiStudyDirectory (GDCM_NAME_SPACE::DirListType &dirNames) +{ + GDCM_NAME_SPACE::DirListType::iterator it; + + for (it = dirNames.begin(); + it != dirNames.end(); + ++it) + { + if ( boost::filesystem::is_directory(*it) ) + { + if (verbose) + std::cout << "[" << *it << "] is a directory" << std::endl; + + GDCM_NAME_SPACE::DirList dirList(*it, false, true); // DON'T get recursively the list of files + GDCM_NAME_SPACE::DirListType fileNames; + fileNames = dirList.GetFilenames(); + std::string path = GDCM_NAME_SPACE::Util::GetPath(*(fileNames.begin())); + std::string subject = path + + GDCM_NAME_SPACE::GDCM_FILESEPARATOR + + "subject"; + if (! boost::filesystem::is_regular(subject) ) + { + std::cout << "no [" << subject << "] file found" << std::endl; + continue; + } + + bool canOpen = br_subject.LoadFile(subject); + if (!canOpen) + { + std::cout << "Hopeless! 'subject' found / cannot be open" << std::endl; + throw ( BrukerHopelessException ("Hopeless! 'subject' found in root input directory / cannot be open")); + } + else + { + br_subject.FillMap(); + } + + BrukerFieldData b_name=br_subject.GetFieldData("SUBJECT_name_string"); + subject_name = b_name.GetStringValue()[0]; + strPatientName = subject_name; + cleanString(subject_name); + + DealWithSingleStudyDirectory(fileNames); + } + else + { + if (verbose) + std::cout << "[" << *it << "] is NOT a directory; skipped!" << std::endl; + } + } +} + +// ---------------------------------------------------------------------------------------------------------- + +void Bruker2Dicom::DealWithSingleStudyDirectory (GDCM_NAME_SPACE::DirListType &fileNames) +{ + bool res; // creation directory : 'nom du patient' std::string tempStringPatDir(OutputDirName); tempStringPatDir = tempStringPatDir + GDCM_NAME_SPACE::GDCM_FILESEPARATOR + subject_name; @@ -105,13 +190,8 @@ bool Bruker2Dicom::Execute() if (!res) { std::cout << "[" << tempStringPatDir << "] Directory creation failure " << std::endl; throw ( BrukerHopelessException ("Patient directory creation failure ")); - } + } - std::string subject_entry; - std::string subject_position; - std::string subject_date; - std::string subject_study_name; - if (subjectFound) { BrukerFieldData b_entry=br_subject.GetFieldData("SUBJECT_entry"); @@ -179,6 +259,9 @@ bool Bruker2Dicom::Execute() if (verbose) std::cout << "[" << *it << "] is a directory" << std::endl; + if((*it) == "AdjStatePerStudy") // avoid trouble with new version 'AdjStatePerStudy' directory + continue; + //BrukerDataSet br_acqp; std::string strAcqp; strAcqp = (*it) + @@ -221,7 +304,7 @@ bool Bruker2Dicom::Execute() + "." + acqp_scan_name + "." + acqp_method.c_str(); - sprintf(outputDirName, "%s%c%s", tempStringStudyDir.c_str(), //OutputDirName.c_str(), + sprintf(outputDirName, "%s%c%s", tempStringStudyDir.c_str(), //OutputDirName.c_str(), GDCM_NAME_SPACE::GDCM_FILESEPARATOR, strSerieDescr.c_str() ); @@ -229,11 +312,11 @@ bool Bruker2Dicom::Execute() << " === [" << GDCM_NAME_SPACE::Util::GetName(*it) << "] -> [" << strSerieDescr << "]\n" << " ================================================================================" << std::endl; - + std::string strOutputDirName(outputDirName); if (verbose) - printf ("outputDirName [%s]\n", outputDirName); + printf ("outputDirName [%s]\n", outputDirName); try { - DealWithNiveau1(*it, outputDirName); + DealWithNiveau1(*it, strOutputDirName); } catch (BrukerHopelessException &e) { @@ -246,7 +329,7 @@ bool Bruker2Dicom::Execute() // ===================================================================== -void Bruker2Dicom::DealWithNiveau1(std::string level1Directory, std::string currentOutputDirName) { +void Bruker2Dicom::DealWithNiveau1(std::string &level1Directory, std::string ¤tOutputDirName) { // // e.g. : at level 1, in B67d1.Bp1/6 // @@ -305,6 +388,7 @@ void Bruker2Dicom::DealWithNiveau1(std::string level1Directory, std::string curr sprintf(outputDirName, "%s%c%s", currentOutputDirName.c_str(), GDCM_NAME_SPACE::GDCM_FILESEPARATOR, GDCM_NAME_SPACE::Util::GetName(*it).c_str()); + std::string strOutputDirName(outputDirName); //br1.PrintSelf(); std::string strMethod; @@ -347,7 +431,7 @@ void Bruker2Dicom::DealWithNiveau1(std::string level1Directory, std::string curr 7 1 */ try { - DealWithNiveau2(*it, outputDirName); + DealWithNiveau2(*it, strOutputDirName); } catch (BrukerHopelessException &e) { @@ -360,7 +444,7 @@ void Bruker2Dicom::DealWithNiveau1(std::string level1Directory, std::string curr // ===================================================================== -void Bruker2Dicom::DealWithNiveau2(std::string level2Directory, std::string currentOutputDirName) { +void Bruker2Dicom::DealWithNiveau2(std::string &level2Directory, std::string ¤tOutputDirName) { // e.g. : at level 2 in B67d1.Bp1/6/pdata // @@ -444,8 +528,9 @@ void Bruker2Dicom::DealWithNiveau2(std::string level2Directory, std::string curr GDCM_NAME_SPACE::Util::GetName(*it).c_str(), str_isa_func_name.c_str()); } + std::string strOutputDirName(outputDirName); try { - DealWithNiveau3(*it, outputDirName); + DealWithNiveau3(*it, strOutputDirName); } catch (BrukerHopelessException &e) { @@ -467,7 +552,7 @@ void Bruker2Dicom::DealWithNiveau2(std::string level2Directory, std::string curr // ===================================================================== // -void Bruker2Dicom::DealWithNiveau3(std::string level3Directory, std::string currentOutputDirName){ +void Bruker2Dicom::DealWithNiveau3(std::string &level3Directory, std::string ¤tOutputDirName){ // // e.g. at level 3, in @@ -667,7 +752,9 @@ void Bruker2Dicom::DealWithNiveau3(std::string level3Directory, std::string curr { sprintf(currentOutputMhdDirName, "%s%c%s", currentOutputDirName.c_str(), GDCM_NAME_SPACE::GDCM_FILESEPARATOR, "MhdFiles"); - res = CreateDirectory( currentOutputMhdDirName ); + std::string strCurrentOutputMhdDirName(currentOutputMhdDirName); + + res = CreateDirectory( strCurrentOutputMhdDirName ); if (!res) { std::cout << "[" << currentOutputDirName << "] Directory creation failure " << std::endl; throw ( BrukerHopelessException ("Hopeless!FillMap failed on 'reco'")); @@ -871,6 +958,7 @@ void Bruker2Dicom::DealWithNiveau3(std::string level3Directory, std::string curr 1, fp); } fclose(fp); + // std::cout << "end writting[" << output2dseqSliceFileName << "]" << std::endl; } // end if mhd @@ -974,8 +1062,8 @@ void Bruker2Dicom::dealWithCarto(GDCM_NAME_SPACE::DirListType &fileNames, int NX // deal with MatLab-generated Carto file. // ----------------------------------------------------- - char *code[] = { "ADC", "adc", "TTP", "ttp", "PEAK", "peak", "" }; // add more carto file name identifiers if necessary; end with "" - char *separator[] = { "_", ".", "-", "" }; // add more, if necessary, to ckeck for 2dseq.ADC, 2dseq_ADC, 2dseq-ADC, etc; end with "" + const char *code[] = { "ADC", "adc", "TTP", "ttp", "PEAK", "peak", "" }; // add more carto file name identifiers if necessary; end with "" + const char *separator[] = { "_", ".", "-", "" }; // add more, if necessary, to ckeck for 2dseq.ADC, 2dseq_ADC, 2dseq-ADC, etc; end with "" int icode; int iseparator; GDCM_NAME_SPACE::DirListType::iterator it; @@ -1105,9 +1193,47 @@ void Bruker2Dicom::dealWithCarto(GDCM_NAME_SPACE::DirListType &fileNames, int NX } // end method +// ========================================================================================================== + +int Bruker2Dicom::CheckUserDirectory(std::string &userDirName) +{ + GDCM_NAME_SPACE::DirList dirList(userDirName, false, true); // DON'T get recursively the list of files + + GDCM_NAME_SPACE::DirListType fileNames; + fileNames = dirList.GetFilenames(); + + std::string path = GDCM_NAME_SPACE::Util::GetPath(*(fileNames.begin())); + + std::string subject = path + + GDCM_NAME_SPACE::GDCM_FILESEPARATOR + + "subject"; + + std::string acqp = path + + GDCM_NAME_SPACE::GDCM_FILESEPARATOR + + "acqp"; + + if ( boost::filesystem::is_regular(subject) ) + subjectFound = true; // user passed a 'study + else + subjectFound = false; // user didnt' pass a 'study + + if ( boost::filesystem::is_regular(acqp) ) + acqpFound= true; // user passes a 'serie', not a 'study' + else + acqpFound = false; // user passed a 'non study' directory; Hope it's a 'set of studies' directory! + + int type; + if (subjectFound ) type = 1; // user passed a 'study + else if (acqpFound) type = 2; // user passed a 'serie' + else type = 3; // user passed a 'non study' directory; Hope it's a 'set of studies' directory! + + return type; +} + + // ========================================================================================================== -bool Bruker2Dicom::CreateDirectory(std::string OutputDirName) +bool Bruker2Dicom::CreateDirectory(std::string &OutputDirName) { std::string systemCommand; @@ -1116,8 +1242,7 @@ bool Bruker2Dicom::CreateDirectory(std::string OutputDirName) <InsertEntryString(str.str(),0x0020,0x0013, "IS"); - - + // 1.2.840.10008.5.1.4.1.1.4.1 : Enhanced MR Image Storage // file->InsertEntryString("1.2.840.10008.5.1.4.1.1.4.1" , 0x0002, 0x0002, "UI"); // [Media Storage SOP Class UID] // file->InsertEntryString("1.2.840.10008.5.1.4.1.1.4.1" , 0x0008, 0x0016, "UI"); // [SOP Class UID] - // OK : MR is NOT multiframe, but I want just a quick an dirty solution // 1.2.840.10008.5.1.4.1.1.4 MR Image Storage @@ -1391,6 +1509,7 @@ void Bruker2Dicom::MakeDicomImage(unsigned char *tabPixels, // if (strlen(patientName) != 0) file->InsertEntryString(patientName.c_str(),0x0010,0x0010, "PN"); // Patient's Name + file->InsertEntryString(patientName.c_str(),0x0010,0x0020, "LO"); // Patient's ID file->InsertEntryString(studyUID, 0x0020, 0x000d, "UI"); file->InsertEntryString(serieUID, 0x0020, 0x000e, "UI"); @@ -1430,7 +1549,6 @@ std::cout << "charImageOrientation " << file->InsertEntryString(charImageOrientation,0x0020,0x0037, "DS"); - // 0020 0032 DS 3 Image Position (Patient) char charImagePosition[256]; @@ -1440,8 +1558,6 @@ std::cout << "charImageOrientation " << imageSet[imgNum].getTranslationVectorRPS2XYZ()[2]); file->InsertEntryString(charImagePosition,0x0020,0x0032, "DS"); //0020 0032 DS 3 Image Position (Patient) - - // 0020 0x1041 DS 1 Slice Location // sprintf(charImagePosition,"%f",float(imgNum)); @@ -1483,5 +1599,3 @@ std::cout << "charImageOrientation " << file->Delete(); fileH->Delete(); } - -