X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2Fsrc1%2Fbruker2dicom.cxx;h=9cc2301872833ef373a9da3bbff32c25e1550a51;hb=187ad4a7a894141158d849a8d164badf76417d2d;hp=34a5ea098417e34cc633ab4088edff4a4026fc0b;hpb=7a849fb72c9e8d006fa69c74b24a3e12778c269f;p=creaBruker.git diff --git a/lib/src1/bruker2dicom.cxx b/lib/src1/bruker2dicom.cxx index 34a5ea0..9cc2301 100644 --- a/lib/src1/bruker2dicom.cxx +++ b/lib/src1/bruker2dicom.cxx @@ -7,8 +7,6 @@ #define PATH_MAX 2048 #endif - - bool Bruker2Dicom::Execute() { // ----- Check input directory name ----- @@ -62,7 +60,6 @@ bool Bruker2Dicom::Execute() bool canOpen; std::string outputFileName; - // BrukerDataSet br_subject; std::string subject; subject = GDCM_NAME_SPACE::Util::GetPath(*(fileNames.begin()))+ @@ -233,7 +230,6 @@ bool Bruker2Dicom::Execute() << " ================================================================================" << std::endl; - if (verbose) printf ("outputDirName [%s]\n", outputDirName); try { @@ -365,7 +361,7 @@ void Bruker2Dicom::DealWithNiveau1(std::string level1Directory, std::string curr // ===================================================================== void Bruker2Dicom::DealWithNiveau2(std::string level2Directory, std::string currentOutputDirName) { - + // e.g. : at level 2 in B67d1.Bp1/6/pdata // // acqp fid imnd pdata pulseprogram spnam0 spnam1 @@ -378,7 +374,7 @@ void Bruker2Dicom::DealWithNiveau2(std::string level2Directory, std::string curr throw ( BrukerHopelessException ("Hopeless! Level2 output directory creation failure")); //exit (0); } - + GDCM_NAME_SPACE::DirList dirList(level2Directory, false, true); // DON'T get recursively the list of files GDCM_NAME_SPACE::DirListType fileNames; @@ -401,7 +397,6 @@ void Bruker2Dicom::DealWithNiveau2(std::string level2Directory, std::string curr { std::cout << "--- --- [" << *it << "] is a file.." << std::endl; } - } for (it = fileNames.begin(); @@ -413,7 +408,7 @@ void Bruker2Dicom::DealWithNiveau2(std::string level2Directory, std::string curr if (verbose) std::cout << "--- --- [" << *it << "] is a directory" << std::endl; - + // sprintf(outputDirName, "%s%c%s", currentOutputDirName.c_str(), // GDCM_NAME_SPACE::GDCM_FILESEPARATOR, // GDCM_NAME_SPACE::Util::GetName(*it).c_str() ); @@ -449,7 +444,7 @@ void Bruker2Dicom::DealWithNiveau2(std::string level2Directory, std::string curr GDCM_NAME_SPACE::Util::GetName(*it).c_str(), str_isa_func_name.c_str()); } - try { + try { DealWithNiveau3(*it, outputDirName); } catch (BrukerHopelessException &e) @@ -463,12 +458,11 @@ void Bruker2Dicom::DealWithNiveau2(std::string level2Directory, std::string curr std::cout << "And Init Exception was thrown in DealWithNiveau3 (" << e.what() << "); " << " We skip [" << level2Directory << "]" << std::endl; continue; - } + } } } } - // // ===================================================================== // @@ -487,7 +481,7 @@ void Bruker2Dicom::DealWithNiveau3(std::string level3Directory, std::string curr if (!res) { std::cout << "[" << currentOutputDirName << "] Directory creation failure " << std::endl; - throw ( BrukerHopelessException ("Hopeless! Level3 output directory creation failure")); + throw ( BrukerHopelessException ("Hopeless! Level3 output directory creation failure")); //exit (0); } @@ -507,12 +501,12 @@ void Bruker2Dicom::DealWithNiveau3(std::string level3Directory, std::string curr char copyFile[PATH_MAX + PATH_MAX + 5]; // Should be enough! bool canOpen; - + //-------------- try d3proc; char char_d3proc[(unsigned int) PATH_MAX+2]; sprintf(char_d3proc,"%s%c%s", level3Directory.c_str(), GDCM_NAME_SPACE::GDCM_FILESEPARATOR,"d3proc" ); - + if (verbose) std::cout << "d3proc: --- => [" << char_d3proc << "]" << std::endl; std::string str_d3proc(char_d3proc); @@ -532,10 +526,10 @@ void Bruker2Dicom::DealWithNiveau3(std::string level3Directory, std::string curr throw ( BrukerHopelessException ("Hopeless! FillMap failed on 'd3proc'")); //exit(0); /// \TODO throw an exception ! } - + //-------------- end try d3proc; - - + + // -------------------try reco char char_reco[(unsigned int) PATH_MAX+2]; @@ -545,8 +539,9 @@ void Bruker2Dicom::DealWithNiveau3(std::string level3Directory, std::string curr // GDCM_NAME_SPACE::GDCM_FILESEPARATOR + // "d3proc"; if (verbose) - std::cout << "reco --- => [" << char_reco << "]" << std::endl; - std::string str_reco(char_reco); + std::cout << "reco: --- => [" << char_reco << "]" << std::endl; + + std::string str_reco(char_reco); canOpen = br_reco.LoadFile(str_reco); if (!canOpen) // we try in directory ../1 @@ -556,7 +551,7 @@ void Bruker2Dicom::DealWithNiveau3(std::string level3Directory, std::string curr std::string lastDirName = GDCM_NAME_SPACE::Util::GetPath(level3Directory); //lastDirName = GDCM_NAME_SPACE::Util::GetPath(lastDirName); sprintf(char_reco,"%s%c1%c%s", lastDirName.c_str(), GDCM_NAME_SPACE::GDCM_FILESEPARATOR,GDCM_NAME_SPACE::GDCM_FILESEPARATOR,"reco" ); - str_reco=char_reco; + //str_reco=char_reco; canOpen = br_reco.LoadFile(str_reco); if (!canOpen) { @@ -564,15 +559,22 @@ void Bruker2Dicom::DealWithNiveau3(std::string level3Directory, std::string curr throw ( BrukerHopelessException ("Hopeless! cannot find 'reco'")); //exit(0); /// \TODO throw an exception ! } + } else { + if (verbose) + std::cout << "[" << str_reco << "] successfully Loaded " << std::endl; } - + canOpen = br_reco.FillMap(); if (!canOpen) { std::cout << "Hopeless! FillMap failed on [" << str_reco << "]" << std::endl; throw ( BrukerHopelessException ("Hopeless! FillMap failed on 'reco'")); - //exit(0); /// \TODO throw an exception ! - } + //exit(0); /// \TODO throw an exception ! + } else { + if (verbose) + std::cout << "[" << str_reco << "] successfully Mapped" << std::endl; + } + //std::cout << "------------------------------------------------------------------------------------------------" << std::cout; // br_reco.PrintSelf(); // std::cout << "------------------------------------------------------------------------------------------------" << std::cout; @@ -590,16 +592,16 @@ void Bruker2Dicom::DealWithNiveau3(std::string level3Directory, std::string curr if (verbose) std::cout << "IM_SIY " << NY << std::endl; /// \todo : check if there are actually 3 dimensions or only 2 - + BrukerFieldData bZ= br_d3proc.GetFieldData("IM_SIZ"); int nbFrames = bZ.GetIntValue()[0]; if (verbose) std::cout << "IM_SIZ " << nbFrames << std::endl; // WARNING DATTYPE is, either in {ip_short, ip_int, ip_char, ...}, or in {1, 2, 3, ...} - + BrukerFieldData bDPT = br_d3proc.GetFieldData("DATTYPE"); - + std::string mhdDataPixelType; int pixelSize; getImhDataType(bDPT, mhdDataPixelType, pixelSize); @@ -623,27 +625,43 @@ void Bruker2Dicom::DealWithNiveau3(std::string level3Directory, std::string curr double spatResolY = spatResol.GetDoubleValue()[1]; if (verbose) std::cout << "SpatResol (ds method) " << spatResolX << " " << spatResolY << std::endl; + */ - +/* ------ */ // Better we use 'get' accessors from BrukerImage class, as Denis wrote them - BrukerFieldData fov = br_reco.GetFieldData("RECO_Fov"); + BrukerFieldData fov = br_reco.GetFieldData("RECO_fov"); double fovX = fov.GetDoubleValue()[0]; double fovY = fov.GetDoubleValue()[1]; if (verbose) - std::cout << "FOV (ds method) " << fovX << " " << fovY << std::endl; + std::cout << "FOV (ds reco) " << fovX << " " << fovY << std::endl; - BrukerFieldData spatResol = br_reco.GetFieldData("PVM_SpatResol"); - double spatResolX = spatResol.GetDoubleValue()[0]; - double spatResolY = spatResol.GetDoubleValue()[1]; + BrukerFieldData size = br_reco.GetFieldData("RECO_size"); + double sizeX = size.GetDoubleValue()[0]; + double sizeY = size.GetDoubleValue()[1]; + if (verbose) - std::cout << "SpatResol (ds method) " << spatResolX << " " << spatResolY << std::endl; + std::cout << "SIZE (ds reco) " << sizeX << " " << sizeY << std::endl; + + double spatResolX = fovX / sizeX; + double spatResolY = fovY / sizeY; + + if (verbose) + std::cout << "spatResol (ds reco : fov/size) " << spatResolX << " " << spatResolY << std::endl; + +/* ------ */ /// \TODO probabely a more sophisticated accessor will be necessary : /// (cf : non contiguous slices, overlapping, slice thickness, space between slices, etc) + BrukerFieldData bsliceDistance = br_method.GetFieldData("PVM_SPackArrSliceDistance"); double sliceDistance = bsliceDistance.GetDoubleValue()[0]; + + if (verbose) + std::cout << "SPackArrSliceDistance (ds method) " << sliceDistance << std::endl; + +// ---------------------------------------------------------------------------------------- if (mhd) { @@ -667,7 +685,7 @@ void Bruker2Dicom::DealWithNiveau3(std::string level3Directory, std::string curr int k; int nbInstants = nbFrames/nbSlices; if (verbose) - std::cout << "nbInstants (deduced )" << nbInstants << std::endl; + std::cout << "nbInstants (deduced)" << nbInstants << std::endl; int instantNb; int sliceNb; FILE *fp; // for MHD files