]> Creatis software - creaBruker.git/commitdiff
use 'clean' Patient Name
authorjean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Tue, 13 Oct 2009 12:32:14 +0000 (12:32 +0000)
committerjean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Tue, 13 Oct 2009 12:32:14 +0000 (12:32 +0000)
lib/src1/bruker2dicom.cxx
lib/src1/bruker2dicom.h

index 9f61f7a358f9667ba7f835b4b81eb9cda91f7af8..813fdc5f8850cfc829aac495ebd64d25c5d1c686 100644 (file)
@@ -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,
index 7e54ce36565e20acd0be0786a06016ce4017beb7..61cbbf8abeb4c56cddbdb2093c283659f034e512 100644 (file)
@@ -117,6 +117,8 @@ private :
    std::string strSerieDescr;
    std::string strStudyTimeDate;
    std::string strPatientName;
+   std::string subject_name; // cleaned strPatientName
+   
    
    int serieNumber;
    int instanceNumber;