X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2Fsrc1%2Fbruker2dicom.cxx;h=e241166e05359b664b760a5c7a0d6b6ddb05c6a7;hb=df0ba3862bc3d12cbc7d4a7c5c6af079250eac29;hp=4f8cd20ff636cf088e0b024cadd5935845387a86;hpb=dd3ea68dd3fb6fe839441dca52f5301d36a18786;p=creaBruker.git diff --git a/lib/src1/bruker2dicom.cxx b/lib/src1/bruker2dicom.cxx index 4f8cd20..e241166 100644 --- a/lib/src1/bruker2dicom.cxx +++ b/lib/src1/bruker2dicom.cxx @@ -7,14 +7,12 @@ #define PATH_MAX 2048 #endif - - 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) ) { @@ -37,84 +35,161 @@ 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; + std::string path = GDCM_NAME_SPACE::Util::GetPath(*(fileNames.begin())); - // 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::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! + + 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) { - //std::cout << "Hopeless! no 'subject' found" << std::endl; - //throw ( BrukerHopelessException ("Hopeless! no 'subject' found in root input 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; + 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(); + + // 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; + } + + 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; + DealWithMultiStudyDirectory (fileNames); + break; + } } - //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"; - +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) ) + { + subjectFound = false; + if (verbose) + 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 + + "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(); + 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 + { + 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; - + res=CreateDirectory(tempStringPatDir); 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"); @@ -147,18 +222,18 @@ bool Bruker2Dicom::Execute() } // subject_name is already in 'Patient Name' 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(); @@ -170,7 +245,8 @@ bool Bruker2Dicom::Execute() // (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; for (it = fileNames.begin(); @@ -182,6 +258,10 @@ bool Bruker2Dicom::Execute() if (verbose) std::cout << "[" << *it << "] is a directory" << std::endl; + //if((*it) == "AdjResult") // avoid trouble with new version 'AdjResult' directory + if(GDCM_NAME_SPACE::Util::GetName(*it) == "AdjResult") + continue; + //BrukerDataSet br_acqp; std::string strAcqp; strAcqp = (*it) + @@ -210,13 +290,13 @@ bool Bruker2Dicom::Execute() 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) @@ -224,20 +304,19 @@ 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() ); - + std::cout << " ================================================================================\n" << " === [" << 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) { @@ -250,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 // @@ -309,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; @@ -349,9 +429,9 @@ void Bruker2Dicom::DealWithNiveau1(std::string level1Directory, std::string curr ##$PVM_NSPacks=2 ##$PVM_SPackArrNSlices=( 2 ) 7 1 - */ + */ try { - DealWithNiveau2(*it, outputDirName); + DealWithNiveau2(*it, strOutputDirName); } catch (BrukerHopelessException &e) { @@ -364,8 +444,8 @@ 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 // // acqp fid imnd pdata pulseprogram spnam0 spnam1 @@ -378,7 +458,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,9 +481,8 @@ void Bruker2Dicom::DealWithNiveau2(std::string level2Directory, std::string curr { std::cout << "--- --- [" << *it << "] is a file.." << std::endl; } - } - + for (it = fileNames.begin(); it != fileNames.end(); ++it) @@ -413,7 +492,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,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) { @@ -468,12 +548,11 @@ 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 @@ -545,8 +624,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 +636,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,6 +644,9 @@ 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(); @@ -571,8 +654,12 @@ void Bruker2Dicom::DealWithNiveau3(std::string level3Directory, std::string curr { 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; @@ -623,38 +710,51 @@ 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; - BrukerFieldData bsliceDistance = br_method.GetFieldData("PVM_SPackArrSliceDistance"); - - double sliceDistance = bsliceDistance.GetDoubleValue()[0]; + */ +/* ------ */ // 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 size = br_reco.GetFieldData("RECO_size"); + double sizeX = size.GetDoubleValue()[0]; + double sizeY = size.GetDoubleValue()[1]; - BrukerFieldData spatResol = br_reco.GetFieldData("RECO_SpatResol"); - double spatResolX = spatResol.GetDoubleValue()[0]; - double spatResolY = spatResol.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("RECO_SPackArrSliceDistance"); + + BrukerFieldData bsliceDistance = br_method.GetFieldData("PVM_SPackArrSliceDistance"); double sliceDistance = bsliceDistance.GetDoubleValue()[0]; + if (verbose) + std::cout << "SPackArrSliceDistance (ds method) " << sliceDistance << std::endl; + // ---------------------------------------------------------------------------------------- if (mhd) { 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'")); @@ -672,7 +772,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 @@ -744,7 +844,7 @@ void Bruker2Dicom::DealWithNiveau3(std::string level3Directory, std::string curr fprintf(fp, "DimSize = %d %d %d\n", NX, NY, nbSlices ); fprintf(fp, "HeaderSize = %d\n", 0); //fprintf(fp, "ElementSpacing = %lf %lf %lf\n",fovX/NY, fovY/NY, sliceDistance ); - fprintf(fp, "ElementSpacing = %lf %lf %lf\n", spatResolX, spatResolY, sliceDistance ); + fprintf(fp, "ElementSpacing = %lf %lf %lf\n", spatResolX, spatResolY, sliceDistance ); fprintf(fp, "Position = 0 0 %d\n", 0 ); fprintf(fp, "Offset = 0 0 0\n" ); fprintf(fp, "CenterOfRotation = 0 0 0\n" ); @@ -858,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 @@ -882,7 +983,7 @@ void Bruker2Dicom::DealWithNiveau3(std::string level3Directory, std::string curr 1, fp); } fclose(fp); - + fp=fopen(output2dseqSliceFileName, "rb"); if (!fp) { @@ -897,7 +998,7 @@ void Bruker2Dicom::DealWithNiveau3(std::string level3Directory, std::string curr */ /* ----------- Write Dicom Image ---------------*/ - + int frameSize = NX*NY*pixelSize; for (instantNb=0; instantNb Bruker2Dicom::CreateImageSet ( ) 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()") ); @@ -1249,22 +1378,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(); @@ -1302,7 +1431,7 @@ 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; @@ -1363,13 +1492,11 @@ void Bruker2Dicom::MakeDicomImage(unsigned char *tabPixels, 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" , 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 @@ -1378,6 +1505,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"); @@ -1417,7 +1545,6 @@ std::cout << "charImageOrientation " << file->InsertEntryString(charImageOrientation,0x0020,0x0037, "DS"); - // 0020 0032 DS 3 Image Position (Patient) char charImagePosition[256]; @@ -1427,8 +1554,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)); @@ -1470,5 +1595,3 @@ std::cout << "charImageOrientation " << file->Delete(); fileH->Delete(); } - -