X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fsrc1%2Fbruker2dicom.cxx;h=02419461abdf7ba848809af178db1d87b7e0b56f;hb=40ddbaaf47ea11957bb59444f4a8d6aa57d75c2b;hp=961c8e7e9a2891622fe588db9b4780919e2816e8;hpb=bcce50eae2804247af45026ca20665a22ff073a3;p=creaBruker.git diff --git a/lib/src1/bruker2dicom.cxx b/lib/src1/bruker2dicom.cxx index 961c8e7..0241946 100644 --- a/lib/src1/bruker2dicom.cxx +++ b/lib/src1/bruker2dicom.cxx @@ -12,7 +12,7 @@ bool Bruker2Dicom::Execute() // ----- Check input directory name ----- bool bigEndian = GDCM_NAME_SPACE::Util::IsCurrentProcessorBigEndian(); - + //if ( ! GDCM_NAME_SPACE::DirList::IsDirectory(InputDirName) ) if ( ! boost::filesystem::is_directory(InputDirName) ) { @@ -42,10 +42,10 @@ bool Bruker2Dicom::Execute() // 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(); @@ -75,16 +75,15 @@ bool Bruker2Dicom::Execute() 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: { + case 1: { bool canOpen = br_subject.LoadFile(subject); if (!canOpen) { @@ -94,28 +93,26 @@ bool Bruker2Dicom::Execute() else { br_subject.FillMap(); - } - //br_subject.PrintSelf(); - // get info for 'Study Description' - - BrukerFieldData b_name=br_subject.GetFieldData("SUBJECT_name_string"); - subject_name = b_name.GetStringValue()[0]; - strPatientName = subject_name; - cleanString(subject_name); - DealWithSingleStudyDirectory (fileNames); + // get info for 'Study Description' + 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; + subject_name = "defaultPatName"; + strPatientName = subject_name; + DealWithSingleStudyDirectory (fileNames); + break; } case 3: { - std::cout << " user passed a 'non study' directory; Hope it's a *non recursive* 'set of studies' directory! (recursive not yet dealt with)" << std::endl; + std::cout << " User passed a 'non study' directory; Hope it's a *non recursive* 'set of studies' directory! (recursive not yet dealt with)" << std::endl; DealWithMultiStudyDirectory (fileNames); break; } @@ -134,13 +131,14 @@ void Bruker2Dicom::DealWithMultiStudyDirectory (GDCM_NAME_SPACE::DirListType &di { if ( boost::filesystem::is_directory(*it) ) { + subjectFound = false; if (verbose) - std::cout << "[" << *it << "] is a directory" << std::endl; + std::cout << "in 'DealWithMultiStudyDirectory' [" << *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 + @@ -150,7 +148,7 @@ void Bruker2Dicom::DealWithMultiStudyDirectory (GDCM_NAME_SPACE::DirListType &di std::cout << "no [" << subject << "] file found" << std::endl; continue; } - + bool canOpen = br_subject.LoadFile(subject); if (!canOpen) { @@ -160,14 +158,14 @@ void Bruker2Dicom::DealWithMultiStudyDirectory (GDCM_NAME_SPACE::DirListType &di 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); + subjectFound = true; // Hope so! (full checking needed!) + + BrukerFieldData b_name=br_subject.GetFieldData("SUBJECT_name_string"); + subject_name = b_name.GetStringValue()[0]; + strPatientName = subject_name; + cleanString(subject_name); + DealWithSingleStudyDirectory(fileNames); + } } else { @@ -185,7 +183,7 @@ void Bruker2Dicom::DealWithSingleStudyDirectory (GDCM_NAME_SPACE::DirListType &f // creation directory : 'nom du patient' std::string tempStringPatDir(OutputDirName); tempStringPatDir = tempStringPatDir + GDCM_NAME_SPACE::GDCM_FILESEPARATOR + subject_name; - + res=CreateDirectory(tempStringPatDir); if (!res) { std::cout << "[" << tempStringPatDir << "] Directory creation failure " << std::endl; @@ -194,8 +192,6 @@ void Bruker2Dicom::DealWithSingleStudyDirectory (GDCM_NAME_SPACE::DirListType &f if (subjectFound) { - - std::cout << "===================================--===========nom dir [" << tempStringPatDir << "] subjectFound, studyName : " << subject_study_name<< std::endl; BrukerFieldData b_entry=br_subject.GetFieldData("SUBJECT_entry"); subject_entry = b_entry.GetStringValue()[0]; //cleanString(subject_entry); @@ -218,8 +214,6 @@ void Bruker2Dicom::DealWithSingleStudyDirectory (GDCM_NAME_SPACE::DirListType &f } else // Desperate trick when file 'subject' is missing { - - std::cout << "==============================================nom dir [" << tempStringPatDir << "] subjectFound" << std::endl; subject_entry = "HeadFirst"; // Why not? subject_position = "Supine"; // Why not? strStudyTimeDate = "06_06_06_6_June_1666"; // Why not? @@ -227,19 +221,22 @@ void Bruker2Dicom::DealWithSingleStudyDirectory (GDCM_NAME_SPACE::DirListType &f subject_study_name = "defStudyName"; // Why not? } // subject_name is already in 'Patient Name' - strStudyDescr = /*subject_name + "." + */ subject_study_name + "." + subject_entry + "." + subject_position + "." + subject_date; - + if (0) // We don't realy need so much information for 'Study' + strStudyDescr = /*subject_name + "." + */ subject_study_name + "." + subject_entry + "." + subject_position + "." + subject_date; + else + strStudyDescr = /*subject_name + "." + */ subject_study_name /*+ "." + subject_entry + "." + subject_position + "." + subject_date*/; + // creation directory : 'nom de la Study' - + std::string tempStringStudyDir(OutputDirName); tempStringStudyDir = tempStringPatDir + GDCM_NAME_SPACE::GDCM_FILESEPARATOR + strStudyDescr; - + res=CreateDirectory(tempStringStudyDir); if (!res) { std::cout << "[" << tempStringStudyDir << "] Directory creation failure " << std::endl; throw ( BrukerHopelessException ("Study directory creation failure ")); } - + char outputDirName[(unsigned int) PATH_MAX+2]; strStudyUID = GDCM_NAME_SPACE::Util::CreateUniqueUID(); @@ -251,7 +248,7 @@ void Bruker2Dicom::DealWithSingleStudyDirectory (GDCM_NAME_SPACE::DirListType &f // (this is level ZERO) // each Directory (name : 1, 2, 3, ...) will be a Dicom Serie // ----------------------------------------------------- - + /// \TODO better use directory iterator, from boost! // JPR GDCM_NAME_SPACE::DirListType::iterator it; @@ -296,13 +293,13 @@ void Bruker2Dicom::DealWithSingleStudyDirectory (GDCM_NAME_SPACE::DirListType &f BrukerFieldData b_method=br_acqp.GetFieldData("ACQ_method"); b_method.PrintSelf(); acqp_method = b_method.GetStringValue()[0]; - + cleanString(acqp_method); //std::cout << "out of br_acqp.FillMap 3" << std::endl; BrukerFieldData b_list_size = br_acqp.GetFieldData("ACQ_O1_list_size"); //std::cout << "out of br_acqp.FillMap 4" << std::endl; //b_list_size.PrintSelf(); //JP - + nbSlices = b_list_size.GetIntValue()[0]; //std::cout << "out of br_acqp.FillMap 5" << std::endl; strSerieDescr = GDCM_NAME_SPACE::Util::GetName(*it) @@ -313,7 +310,7 @@ void Bruker2Dicom::DealWithSingleStudyDirectory (GDCM_NAME_SPACE::DirListType &f sprintf(outputDirName, "%s%c%s", tempStringStudyDir.c_str(), //OutputDirName.c_str(), GDCM_NAME_SPACE::GDCM_FILESEPARATOR, strSerieDescr.c_str() ); - + std::cout << " ================================================================================\n" << " === [" << GDCM_NAME_SPACE::Util::GetName(*it) << "] -> [" << strSerieDescr << "]\n" << " ================================================================================" @@ -435,7 +432,7 @@ void Bruker2Dicom::DealWithNiveau1(std::string &level1Directory, std::string &cu ##$PVM_NSPacks=2 ##$PVM_SPackArrNSlices=( 2 ) 7 1 - */ + */ try { DealWithNiveau2(*it, strOutputDirName); } @@ -488,38 +485,38 @@ void Bruker2Dicom::DealWithNiveau2(std::string &level2Directory, std::string &cu std::cout << "--- --- [" << *it << "] is a file.." << std::endl; } } - + for (it = fileNames.begin(); it != fileNames.end(); ++it) { if ( boost::filesystem::is_directory(*it) ) - { - + { + if (verbose) std::cout << "--- --- [" << *it << "] is a directory" << std::endl; - // sprintf(outputDirName, "%s%c%s", currentOutputDirName.c_str(), + // sprintf(outputDirName, "%s%c%s", currentOutputDirName.c_str(), // GDCM_NAME_SPACE::GDCM_FILESEPARATOR, // GDCM_NAME_SPACE::Util::GetName(*it).c_str() ); // MUST be 'pdata'! // // (interest of previous method : -// If unaware user changed the pdata name, it goes on working +// If unaware user changed the pdata name, it goes on working // std::string str_isa; str_isa = (*it) + GDCM_NAME_SPACE::GDCM_FILESEPARATOR + "isa"; - std::string str_isa_func_name; + std::string str_isa_func_name; canOpen = br_isa.LoadFile(str_isa); if (!canOpen) { sprintf(outputDirName, "%s%c%s", currentOutputDirName.c_str(), GDCM_NAME_SPACE::GDCM_FILESEPARATOR, - GDCM_NAME_SPACE::Util::GetName(*it).c_str() ); + GDCM_NAME_SPACE::Util::GetName(*it).c_str() ); } else { @@ -549,7 +546,7 @@ void Bruker2Dicom::DealWithNiveau2(std::string &level2Directory, std::string &cu std::cout << "And Init Exception was thrown in DealWithNiveau3 (" << e.what() << "); " << " We skip [" << level2Directory << "]" << std::endl; continue; - } + } } } } @@ -600,7 +597,7 @@ void Bruker2Dicom::DealWithNiveau3(std::string &level3Directory, std::string &cu if (verbose) std::cout << "d3proc: --- => [" << char_d3proc << "]" << std::endl; - std::string str_d3proc(char_d3proc); + std::string str_d3proc(char_d3proc); canOpen = br_d3proc.LoadFile(str_d3proc); if (!canOpen) @@ -615,7 +612,7 @@ void Bruker2Dicom::DealWithNiveau3(std::string &level3Directory, std::string &cu { std::cout << "Hopeless! FillMap failed on 'd3proc'" << std::endl; throw ( BrukerHopelessException ("Hopeless! FillMap failed on 'd3proc'")); - //exit(0); /// \TODO throw an exception ! + //exit(0); /// \TODO throw an exception ! } //-------------- end try d3proc; @@ -631,7 +628,7 @@ void Bruker2Dicom::DealWithNiveau3(std::string &level3Directory, std::string &cu // "d3proc"; if (verbose) std::cout << "reco: --- => [" << char_reco << "]" << std::endl; - + std::string str_reco(char_reco); canOpen = br_reco.LoadFile(str_reco); @@ -654,7 +651,7 @@ void Bruker2Dicom::DealWithNiveau3(std::string &level3Directory, std::string &cu if (verbose) std::cout << "[" << str_reco << "] successfully Loaded " << std::endl; } - + canOpen = br_reco.FillMap(); if (!canOpen) { @@ -664,8 +661,8 @@ void Bruker2Dicom::DealWithNiveau3(std::string &level3Directory, std::string &cu } else { if (verbose) std::cout << "[" << str_reco << "] successfully Mapped" << std::endl; - } - + } + //std::cout << "------------------------------------------------------------------------------------------------" << std::cout; // br_reco.PrintSelf(); // std::cout << "------------------------------------------------------------------------------------------------" << std::cout; @@ -716,7 +713,7 @@ void Bruker2Dicom::DealWithNiveau3(std::string &level3Directory, std::string &cu double spatResolY = spatResol.GetDoubleValue()[1]; if (verbose) std::cout << "SpatResol (ds method) " << spatResolX << " " << spatResolY << std::endl; - + */ /* ------ */ @@ -731,13 +728,13 @@ void Bruker2Dicom::DealWithNiveau3(std::string &level3Directory, std::string &cu BrukerFieldData size = br_reco.GetFieldData("RECO_size"); double sizeX = size.GetDoubleValue()[0]; double sizeY = size.GetDoubleValue()[1]; - + if (verbose) 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; @@ -745,10 +742,10 @@ void Bruker2Dicom::DealWithNiveau3(std::string &level3Directory, std::string &cu /// \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; @@ -964,7 +961,7 @@ void Bruker2Dicom::DealWithNiveau3(std::string &level3Directory, std::string &cu 1, fp); } fclose(fp); - + // std::cout << "end writting[" << output2dseqSliceFileName << "]" << std::endl; } // end if mhd @@ -989,7 +986,7 @@ void Bruker2Dicom::DealWithNiveau3(std::string &level3Directory, std::string &cu 1, fp); } fclose(fp); - + fp=fopen(output2dseqSliceFileName, "rb"); if (!fp) { @@ -1004,7 +1001,7 @@ void Bruker2Dicom::DealWithNiveau3(std::string &level3Directory, std::string &cu */ /* ----------- Write Dicom Image ---------------*/ - + int frameSize = NX*NY*pixelSize; for (instantNb=0; instantNb Bruker2Dicom::CreateImageSet ( ) br_acqp.SetLoopStructure(); std::vector tempVect = br_acqp.GetLoopStructure() ; std::map map = br_acqp.GetBrukerHeaderMap(); - + bool result = br_acqp.ObjectVaryingProperties.init(map,tempVect); - + if (result == false) { - throw ( BrukerInitException ("ObjectVaryingProperties.init() failure in Bruker2Dicom::CreateImageSet()") ); + throw ( BrukerInitException ("ObjectVaryingProperties.init() failure in Bruker2Dicom::CreateImageSet()") ); } br_acqp.SetImageLoopStructure(); @@ -1388,22 +1381,22 @@ std::vector Bruker2Dicom::CreateImageSet ( ) BrukerImage image(br_acqp,br_reco); image.Init(br_acqp,br_reco,1); - + for(int i=0;i > imageOrientation; std::vector imagePosition; for(int i=0;i Bruker2Dicom::CreateImageSet ( ) std::cout << "\t Orientation " ; for(int i1=0; i1<3;i1++)for(int i2=0; i2<3;i2++) std::cout << imageOrientation[i1][i2] << " ";CreateImageSet - + //std::cout << "\t Abs Time " << imageSet[i].getAbsoluteTimePosition(); std::cout << "\t Relat Time " << imageSet[i].getRelativeTimePosition(); @@ -1441,14 +1434,14 @@ void Bruker2Dicom::MakeDicomImage(unsigned char *tabPixels, std::string &serieDescr, std::string &strStudyTimeDate, int imgNum, - GDCM_NAME_SPACE::ImageContentType contentType + GDCM_NAME_SPACE::ImageContentType contentType ) { std::ostringstream str; GDCM_NAME_SPACE::File *file; - file = GDCM_NAME_SPACE::File::New(); - + file = GDCM_NAME_SPACE::File::New(); + // Set the image size str.str(""); str << X; @@ -1467,7 +1460,9 @@ void Bruker2Dicom::MakeDicomImage(unsigned char *tabPixels, // Set the pixel type // //8, 16, 32, 64 (for double ?) str.str(""); - str << pixelSize*8; + str << pixelSize*8; + + // Bits Allocated file->InsertEntryString(str.str(),0x0028,0x0100,"US"); // Bits Allocated file->InsertEntryString(str.str(),0x0028,0x0101,"US"); // Bits Stored @@ -1478,7 +1473,7 @@ void Bruker2Dicom::MakeDicomImage(unsigned char *tabPixels, // Set the pixel representation // 0/1 , 0=unsigned file->InsertEntryString("1",0x0028,0x0103, "US"); // Pixel Representation - + // Set the samples per pixel // 1:Grey level, 3:RGB file->InsertEntryString("1",0x0028,0x0002, "US"); // Samples per Pixel @@ -1486,25 +1481,25 @@ void Bruker2Dicom::MakeDicomImage(unsigned char *tabPixels, str.str(""); str << spacingX << "\\" << spacingY; file->InsertEntryString(str.str(),0x0028,0x0030, "DS"); // Pixel Spacing - + // 0018 0050 DS 1 Slice Thickness str.str(""); str << sliceDistance; file->InsertEntryString(str.str(),0x0018,0x0050, "DS"); - + // 0020 0011 IS 1 Series Number str.str(""); str << serieNumber; file->InsertEntryString(str.str(),0x0020,0x0011, "IS"); - + // 0020|0013 [IS] [Instance Number] instanceNumber++; str.str(""); str << instanceNumber; file->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" , 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 @@ -1519,7 +1514,7 @@ void Bruker2Dicom::MakeDicomImage(unsigned char *tabPixels, file->InsertEntryString(studyUID, 0x0020, 0x000d, "UI"); file->InsertEntryString(serieUID, 0x0020, 0x000e, "UI"); - + // 0008 0020 DA 1 Study Date // 0008 0030 TM 1 Study Time @@ -1552,7 +1547,7 @@ std::cout << "charImageOrientation " << imageSet[imgNum].getRotationMatrixRPS2XYZ()[1][0], imageSet[imgNum].getRotationMatrixRPS2XYZ()[1][1], imageSet[imgNum].getRotationMatrixRPS2XYZ()[1][2] ) ; - + file->InsertEntryString(charImageOrientation,0x0020,0x0037, "DS"); // 0020 0032 DS 3 Image Position (Patient) @@ -1562,9 +1557,95 @@ std::cout << "charImageOrientation " << imageSet[imgNum].getTranslationVectorRPS2XYZ()[0], imageSet[imgNum].getTranslationVectorRPS2XYZ()[1], imageSet[imgNum].getTranslationVectorRPS2XYZ()[2]); - + file->InsertEntryString(charImagePosition,0x0020,0x0032, "DS"); //0020 0032 DS 3 Image Position (Patient) + // Private creator + /* + +0029|0010 [LO] [Private Creator] [CREATIS HEADER ] +0029|0011 [LO] [Private Creator] [CREATIS for BRUKER to DICOM] +0029|1031 [LO] [] [4.0.7571167 ] +0029|1032 [UL] [] [1440000] =0x(15f900) + +> $$ Thu Jul 30 17:29:46 2009 CEST (UT+2h) mwiart +> $$ /opt/PV4.0/data/mwiart/nmr/dha80.Uw1/4/method +> ##$Method=DtiEpi +> ##$PVM_DwNDiffDir=3 % 3 directions +> ##$PVM_DwNDiffExpEach=2 % 2 valeurs de b par direction +> ##$PVM_DwAoImages=1 % 1 image pour b=0 +> ##$PVM_DwBvalEach=( 2 ) % Valeurs de b +> 1500.000000 3000.000000 +> +> $$ Wed Dec 2 09:56:01 2009 UTC (UT+0h) mwiart +> $$ /opt/Pv5.0/data/mwiart/nmr/ECI7.Wx1/4/method +> ##$Method=DtiEpi +> ##$PVM_DwNDiffDir=3 % 3 directions +> ##$PVM_DwNDiffExpEach=2 % 2 valeurs de b par direction +> ##$PVM_DwAoImages=1 % 1 image pour b=0 +> ##$PVM_DwBvalEach=( 2 ) % Valeurs de b +> 1500 3000 +> +> $$ Wed Dec 2 10:14:27 2009 UTC (UT+0h) mwiart +> $$ /opt/Pv5.0/data/mwiart/nmr/ECI7.Wx1/5/method +> ##$Method=DtiStandard +> ##$PVM_DwNDiffDir=1 % 1 direction +> ##$PVM_DwNDiffExpEach=2 % 2 valeurs de b +> ##$PVM_DwAoImages=0 % 0 image pour b=0 +> ##$PVM_DwBvalEach=( 2 ) % Valeurs de b +> 138 1600 +> + */ + + file->InsertEntryString("CREATIS HEADER", 0x0029,0x0010, "LO"); + file->InsertEntryString("CREATIS FOR BRUKER-TO-DICOM", 0x0029,0x0011, "LO"); + + BrukerFieldData brf_method = br_method.GetFieldData("Method"); + const std::vector method = brf_method.GetStringValue(); + + // std::string method = br_method.GetFieldData("Method").GetStringValue(); + file->InsertEntryString(method[0], 0x0029,0x0100, "LO"); + + std::cout << " method[" << method[0] << "]" << std::endl; + if (method[0] == "DtiEpi" || method[0] == "DtiStandard") + { + // const std::vector NDiffDir = br_method.GetFieldData("PVM_DwNDiffDir").GetIntValue(); + BrukerFieldData brf_NDiffDir = br_method.GetFieldData("PVM_DwNDiffDir"); + const std::vector NDiffDir = brf_NDiffDir.GetIntValue(); + + //const std::vector NDiffExpEach = br_method.GetFieldData("PVM_DwNDiffExpEach").GetIntValue(); + BrukerFieldData brf_NDiffExpEach = br_method.GetFieldData("PVM_DwNDiffExpEach"); + const std::vector NDiffExpEach =brf_NDiffExpEach.GetIntValue(); + +// const std::vector AoImages = br_method.GetFieldData("PVM_DwAoImages").GetIntValue(); + BrukerFieldData brf_AoImages = br_method.GetFieldData("PVM_DwAoImages"); + const std::vector AoImages = brf_AoImages.GetIntValue(); + + BrukerFieldData brf_DwBvalEach = br_method.GetFieldData("PVM_DwBvalEach"); + const std::vector DwBvalEach = brf_DwBvalEach.GetDoubleValue(); + + std::cout << "nb directions : " << NDiffDir[0] << " nb valeurs de b par direction : " << NDiffExpEach[0] + << " nb images for b=0 : " << AoImages[0] << std::endl; + + str.str(""); + str << NDiffDir[0]; + file->InsertEntryString(str.str(),0x0029,0x0101,"US"); // nb de directions + str.str(""); + str << NDiffExpEach[0]; + file->InsertEntryString(str.str(),0x0029,0x0102,"US"); // nb valeurs de b par direction + str.str(""); + str << AoImages[0]; + file->InsertEntryString(str.str(),0x0029,0x0103,"US"); // nb images pour b=0 + + str.str(""); + for (unsigned int i=0; iInsertEntryString(str.str(),0x0029,0x0104,"DS"); // Valeurs de b + } + // 0020 0x1041 DS 1 Slice Location // sprintf(charImagePosition,"%f",float(imgNum)); // file->InsertEntryString(charImagePosition,0x0020,0x1041, "DS"); @@ -1582,8 +1663,8 @@ std::cout << "charImageOrientation " << GDCM_NAME_SPACE::FileHelper *fileH; fileH = GDCM_NAME_SPACE::FileHelper::New(file); - fileH->SetContentType(contentType); - + fileH->SetContentType(contentType); + // cast is just to avoid warnings (*no* conversion is performed) //fileH->SetImageData((uint8_t *)img,int(maxX*maxY)*sizeof(uint16_t)); // troubles when maxX, mayY are *actually* float!