X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2Fsrc1%2Fbruker2dicom2.h;fp=lib%2Fsrc1%2Fbruker2dicom2.h;h=285fe8bd53bf1ef1eb8441692924deec6ee2b234;hb=cc4fb89e6ab8668e7e8830a2e65dc53dc1773de5;hp=d0478650e5ab2c264c0a77b5524b52c3664539a8;hpb=98b3f017715cfc0207bda87f08afe0c565607baa;p=creaBruker.git diff --git a/lib/src1/bruker2dicom2.h b/lib/src1/bruker2dicom2.h index d047865..285fe8b 100644 --- a/lib/src1/bruker2dicom2.h +++ b/lib/src1/bruker2dicom2.h @@ -42,7 +42,8 @@ #define VALID_FILE_SEPARATOR "/" #endif -class __declspec( dllexport ) Bruker2Dicom { +//class __declspec( dllexport ) Bruker2Dicom { +class creaBruker_EXPORT Bruker2Dicom { public: /*! \brief Constructor @@ -97,11 +98,11 @@ void cleanString(std::string &s); bool CreateDirectory(const std::string &dirNameout); int CheckUserDirectory(std::string &userDirName); -void DealWithMultiStudyDirectory(gdcm::Directory::FilenamesType &fileNames,const std::string ¤tOutputDirName); -void DealWithSingleStudyDirectory (const std::string &dirname,const std::string ¤tOutputDirName) ; +void DealWithMultiStudyDirectory(gdcm::Directory::FilenamesType &fileNames, const std::string ¤tOutputDirName); +void DealWithSingleStudyDirectory (const std::string dirname, const std::string currentOutputDirName) ; -void DealWithNiveau1(std::string &level1Directory, std::string ¤tOutputDirName); -void DealWithNiveau2(std::string &level2Directory, std::string ¤tOutputDirName); +void DealWithNiveau1(std::string level1Directory, std::string currentOutputDirName); +void DealWithNiveau2(std::string level2Directory, std::string currentOutputDirName); void DealWithNiveau3(std::string &level3Directory, std::string ¤tOutputDirName); void dealWithCarto(gdcm::Directory::FilenamesType &fileNames, int NX, int NY, int nbSlices, @@ -110,7 +111,7 @@ void dealWithCarto(gdcm::Directory::FilenamesType &fileNames, int NX, int NY, in char *outputMhdFileName, char *output2dseqCartoName); const std::string createDirectory(const std::string &i_name,const std::string &i_dir); - std::string findFile(const std::string &i_dir, const std::string i_name); + std::string findFile(const std::string &i_dir, const std::string i_name); public: // these ones are for debugging only