]> Creatis software - creaBruker.git/commitdiff
Clean code
authoreduardo.davila@creatis.insa-lyon.fr <eduardo.davila@creatis.insa-lyon.fr>
Sat, 23 May 2026 13:55:40 +0000 (15:55 +0200)
committereduardo.davila@creatis.insa-lyon.fr <eduardo.davila@creatis.insa-lyon.fr>
Sat, 23 May 2026 13:55:40 +0000 (15:55 +0200)
lib/src1/bruker2dicom2.cxx

index bd983cac96b3556e31c5ac4cffa77dcd6550076a..ad2bcd193d8142c84cb939162ef5b0259dcc7cc1 100644 (file)
@@ -283,7 +283,8 @@ void Bruker2Dicom::DealWithSingleStudyDirectory  (const std::string dirname, con
             {
 //EED 2026-05-19         
 //             std::string fname = (*it).filename() ;
-             std::string fname = (*it).path().filename().c_str() ;
+//             std::string fname = (*it).path().filename().c_str();
+             std::string fname = (*it).path().filename().string();
               //if (fname == "AdjResult")                  continue; what's the point?
              boost::filesystem::directory_iterator it_level((*it));
             bool bAcqp = false;
@@ -299,8 +300,8 @@ void Bruker2Dicom::DealWithSingleStudyDirectory  (const std::string dirname, con
 //EED 2026-05-19         
 //                    strAcqp =  (*it_level).string();
 //                    nameAcqp = (*it_level).filename();
-                    strAcqp =  (*it_level).path().string().c_str();
-                    nameAcqp = (*it_level).path().filename().c_str();
+                    strAcqp =  (*it_level).path().string();
+                    nameAcqp = (*it_level).path().filename().string();
                     boost::algorithm::replace_all( strAcqp, INVALID_FILE_SEPARATOR, VALID_FILE_SEPARATOR);
                     bAcqp = true;
                }
@@ -445,7 +446,7 @@ void Bruker2Dicom::DealWithNiveau1(std::string level1Directory, std::string curr
            {
 //EED 2026-05-19         
 //               std::string output = createDirectory( (*itDir).leaf() , currentOutputDirName);
-               std::string output = createDirectory( (*itDir).path().filename().c_str() , currentOutputDirName);
+               std::string output = createDirectory( (*itDir).path().filename().string() , currentOutputDirName);
                  // will be always "pdata" ...
                boost::filesystem::directory_iterator itDirInside(*itDir), it_inside_end;
                for(; itDirInside != it_end; ++it)