Boost a un pb quand on essai de tester un match d'une expression reguliere un peu...

[creaBruker.git] / lib / src1 / bruker2dicom.h

diff --git a/lib/src1/bruker2dicom.h b/lib/src1/bruker2dicom.h
index 85e821252476af894436ae6b1f2d79990ba55f57..61cbbf8abeb4c56cddbdb2093c283659f034e512 100644 (file)
--- a/lib/src1/bruker2dicom.h
+++ b/lib/src1/bruker2dicom.h
@@ -30,10 +30,10 @@ public:
 */
   ~Bruker2Dicom (){};
 
-  void SetInputDirectory (const std::string &i) { InputDirName  = i;  }
-  void SetOutputDirectory(const std::string &o) { OutputDirName = o;  }
-  void SetConvertModeToDicom()                  { dicom = 1; mhd  = 0;}
-  void SetConvertModeToMhd()                    { dicom = 0; mhd  = 1;}  
+  void SetInputDirectory (const std::string &i) { InputDirName   = i;}
+  void SetOutputDirectory(const std::string &o) { OutputDirName  = o;}
+  void SetConvertModeToDicom()                  { dicom = 1; mhd = 0;}
+  void SetConvertModeToMhd()                    { dicom = 0; mhd = 1;}  
   bool Execute();
   
   /* 
@@ -117,8 +117,11 @@ private :
    std::string strSerieDescr;
    std::string strStudyTimeDate;
    std::string strPatientName;
+   std::string subject_name; // cleaned strPatientName
    
-   int serieNumber;      
+   
+   int serieNumber;
+   int instanceNumber;      
 };