From aa5fda796c3871968581d68fb26a13723370d5fc Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Tue, 13 Oct 2009 12:32:14 +0000 Subject: [PATCH 1/1] use 'clean' Patient Name --- lib/src1/bruker2dicom.cxx | 10 ++++------ lib/src1/bruker2dicom.h | 2 ++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/src1/bruker2dicom.cxx b/lib/src1/bruker2dicom.cxx index 9f61f7a..813fdc5 100644 --- a/lib/src1/bruker2dicom.cxx +++ b/lib/src1/bruker2dicom.cxx @@ -87,7 +87,7 @@ bool Bruker2Dicom::Execute() // get info for 'Study Description' BrukerFieldData b_name=br_subject.GetFieldData("SUBJECT_name_string"); - std::string subject_name = b_name.GetStringValue()[0]; + subject_name = b_name.GetStringValue()[0]; strPatientName = subject_name; cleanString(subject_name); @@ -545,7 +545,6 @@ void Bruker2Dicom::DealWithNiveau3(std::string level3Directory, std::string curr //std::cout << "------------------------------------------------------------------------------------------------" << std::cout; // br_reco.PrintSelf(); // std::cout << "------------------------------------------------------------------------------------------------" << std::cout; - // -------------------end try reco @@ -725,7 +724,7 @@ void Bruker2Dicom::DealWithNiveau3(std::string level3Directory, std::string curr //fovX/NY, fovY/NY, sliceDistance, spatResolX, spatResolY, sliceDistance, output2dseqSliceFileName, - strPatientName, + subject_name, day, strStudyUID, strSerieUID, @@ -742,7 +741,6 @@ void Bruker2Dicom::DealWithNiveau3(std::string level3Directory, std::string curr { // Interleaved ! // it's (slice1,slide2, ...)t1 ; (slice1,slide2, ...)t2 ; ... - unsigned char *pixelsForCurrentSlice = new unsigned char[NX*NY*pixelSize*nbInstants]; k = 0; @@ -860,7 +858,7 @@ void Bruker2Dicom::DealWithNiveau3(std::string level3Directory, std::string curr spatResolX, spatResolY, sliceDistance, //fovX/NY, fovY/NY, sliceDistance, output2dseqSliceFileName, - strPatientName, + subject_name, day, strStudyUID, strSerieUID, @@ -1008,7 +1006,7 @@ void Bruker2Dicom::dealWithCarto(GDCM_NAME_SPACE::DirListType &fileNames, int NX //fovX/NY, fovY/NY, sliceDistance, spatResolX, spatResolY, sliceDistance, output2dseqCartoName, - strPatientName, + subject_name, day, strStudyUID, strSerieUID, diff --git a/lib/src1/bruker2dicom.h b/lib/src1/bruker2dicom.h index 7e54ce3..61cbbf8 100644 --- a/lib/src1/bruker2dicom.h +++ b/lib/src1/bruker2dicom.h @@ -117,6 +117,8 @@ private : std::string strSerieDescr; std::string strStudyTimeDate; std::string strPatientName; + std::string subject_name; // cleaned strPatientName + int serieNumber; int instanceNumber; -- 2.45.1