From bf0552a575bfa83d91872f766363872f53e984ee Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Thu, 22 Apr 2010 09:20:50 +0000 Subject: [PATCH] avoid trouble with new version 'AdjStatePerStudy' directory --- lib/src1/bruker2dicom.cxx | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/lib/src1/bruker2dicom.cxx b/lib/src1/bruker2dicom.cxx index 13c7947..bfdb802 100644 --- a/lib/src1/bruker2dicom.cxx +++ b/lib/src1/bruker2dicom.cxx @@ -95,7 +95,7 @@ bool Bruker2Dicom::Execute() cleanString(subject_name); } else - subject_name ="defaultPatName"; + subject_name ="defaultPatName"; // creation directory : 'nom du patient' std::string tempStringPatDir(OutputDirName); @@ -179,6 +179,9 @@ bool Bruker2Dicom::Execute() 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) + @@ -1376,13 +1379,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 @@ -1431,7 +1432,6 @@ std::cout << "charImageOrientation " << file->InsertEntryString(charImageOrientation,0x0020,0x0037, "DS"); - // 0020 0032 DS 3 Image Position (Patient) char charImagePosition[256]; @@ -1441,8 +1441,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)); @@ -1484,5 +1482,3 @@ std::cout << "charImageOrientation " << file->Delete(); fileH->Delete(); } - - -- 2.47.1