X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2Fsrc1%2Fbruker2dicom.h;h=76290d66c3d9732ba8c86b207cbf275446ba6927;hb=bc44fc75154847637a0bd24efea6338db738e4da;hp=61cbbf8abeb4c56cddbdb2093c283659f034e512;hpb=bf0552a575bfa83d91872f766363872f53e984ee;p=creaBruker.git

diff --git a/lib/src1/bruker2dicom.h b/lib/src1/bruker2dicom.h
index 61cbbf8..76290d6 100644
--- a/lib/src1/bruker2dicom.h
+++ b/lib/src1/bruker2dicom.h
@@ -73,11 +73,14 @@ void getImhDataType(BrukerFieldData &bDPT,
 		    
 void cleanString(std::string &s);
 
-bool CreateDirectory(std::string dirNameout);
+bool CreateDirectory(std::string &dirNameout);
 
-void DealWithNiveau1(std::string level1Directory, std::string currentOutputDirName);
-void DealWithNiveau2(std::string level2Directory, std::string currentOutputDirName);
-void DealWithNiveau3(std::string level3Directory, std::string currentOutputDirName);
+int CheckUserDirectory(std::string &userDirName);
+
+void DealWithSingleStudyDirectory(GDCM_NAME_SPACE::DirListType &fileNames);
+void DealWithNiveau1(std::string &level1Directory, std::string &currentOutputDirName);
+void DealWithNiveau2(std::string &level2Directory, std::string &currentOutputDirName);
+void DealWithNiveau3(std::string &level3Directory, std::string &currentOutputDirName);
 		    
 void dealWithCarto(GDCM_NAME_SPACE::DirListType &fileNames, int NX, int NY, int nbSlices, 
                    double fovX, double fovY, double sliceDistance,
@@ -95,6 +98,14 @@ public:
 private :
    std::string InputDirName;
    std::string OutputDirName;
+
+   bool subjectFound;
+   bool acqpFound;
+   
+   std::string subject_entry;
+   std::string subject_position;
+   std::string subject_date;
+   std::string subject_study_name;
  
    int mhd;
    int dicom;
@@ -118,11 +129,9 @@ private :
    std::string strStudyTimeDate;
    std::string strPatientName;
    std::string subject_name; // cleaned strPatientName
-   
-   
+ 
    int serieNumber;
    int instanceNumber;      
 };
 
-
 #endif