cleanString(subject_name);
}
else
- subject_name ="defaultPatName";
+ subject_name ="defaultPatName";
// creation directory : 'nom du patient'
std::string tempStringPatDir(OutputDirName);
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) +
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
// 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;
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
// 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");
file->InsertEntryString(charImageOrientation,0x0020,0x0037, "DS");
-
// 0020 0032 DS 3 Image Position (Patient)
char charImagePosition[256];
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));
file->Delete();
fileH->Delete();
}
-
-