From dd6cfbad206f1743fc7226c43b835b782c1f46ee Mon Sep 17 00:00:00 2001 From: fcervenansky Date: Thu, 22 Nov 2012 16:02:22 +0100 Subject: [PATCH] Bug 1805: modifications for boost filesystem --- CMakeLists.txt | 2 +- src/creaImageIODicomImageReader2.cpp | 4 ++-- src/creaImageIODicomScanner.cpp | 2 +- src/creaImageIOSimpleView.cpp | 4 ++-- src/creaImageIOTreeHandlerImageAdder.cpp | 26 ++++++++++++------------ src/creaImageIOUltrasonixImageReader.cpp | 2 +- src/creaImageIOVtkImageReader.cpp | 2 +- src/creaImageIOWxAnySimpleDlg.cpp | 4 ++-- src/creaImageIOWxGimmickView.cpp | 2 +- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d2c85ad..4b46d8d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,7 +64,7 @@ CREA_PREVENT_IN_SOURCE_BUILD() # For boost 1.46 troubles... // JPR. -add_definitions(-DBOOST_FILESYSTEM_VERSION=2) +add_definitions(-DBOOST_FILESYSTEM_VERSION=3) SET(USE_GDCM_VTK ON) diff --git a/src/creaImageIODicomImageReader2.cpp b/src/creaImageIODicomImageReader2.cpp index 5e8b570..aa67c76 100644 --- a/src/creaImageIODicomImageReader2.cpp +++ b/src/creaImageIODicomImageReader2.cpp @@ -172,7 +172,7 @@ namespace creaImageIO if ( i->first == "D0004_1500" ) { boost::filesystem::path full_path(filename); - std::string f = full_path.leaf(); + std::string f = full_path.leaf().string(); i->second = f; } else if ( i->first == "FullFileName" ) @@ -245,7 +245,7 @@ void DicomImageReader::ReadAttributes2(const std::string& filename, if ( i->first == "D0004_1500" ) { boost::filesystem::path full_path(filename); - std::string f = full_path.leaf(); + std::string f = full_path.leaf().string(); i->second = f; } else if ( i->first == "FullFileName" ) diff --git a/src/creaImageIODicomScanner.cpp b/src/creaImageIODicomScanner.cpp index 7b1b0b7..8e71e83 100644 --- a/src/creaImageIODicomScanner.cpp +++ b/src/creaImageIODicomScanner.cpp @@ -176,7 +176,7 @@ void DicomImageScanner::ReadAttributes(const std::string& filename, if ( attr.find("D0004_1500") != attr.end()) { boost::filesystem::path full_path(filename); - std::string f = full_path.leaf(); + std::string f = full_path.leaf().string(); attr["D0004_1500"] = f; } if ( attr.find("FullFileName")!= attr.end()) diff --git a/src/creaImageIOSimpleView.cpp b/src/creaImageIOSimpleView.cpp index 7d6a485..d44f941 100644 --- a/src/creaImageIOSimpleView.cpp +++ b/src/creaImageIOSimpleView.cpp @@ -67,9 +67,9 @@ namespace creaImageIO { if (!boost::filesystem::is_directory(itr->status())) { - if( mReader->CanRead(itr->string()) ) + if( mReader->CanRead(itr->path().string()) ) { - names.push_back(itr->string()); + names.push_back(itr->path().string()); } } } diff --git a/src/creaImageIOTreeHandlerImageAdder.cpp b/src/creaImageIOTreeHandlerImageAdder.cpp index 33f6dd8..ff4683d 100644 --- a/src/creaImageIOTreeHandlerImageAdder.cpp +++ b/src/creaImageIOTreeHandlerImageAdder.cpp @@ -239,20 +239,20 @@ namespace creaImageIO { if (recursive) { - AddDirectoryRecursorScanner( itr->string(), recursive, addKey, i_sc, true); + AddDirectoryRecursorScanner( itr->path().string(), recursive, addKey, i_sc, true); } } else { std::string parent_id; // tTest if directory (and only it) exists or not. - bool valid = mSynchronizer->isIndexed(itr->string());//true;//=mTimestampHandler->AddDirectory(dirpath, itr->string(), lastModif, time(0),mCurrentDB); + bool valid = mSynchronizer->isIndexed(itr->path().string());//true;//=mTimestampHandler->AddDirectory(dirpath, itr->string(), lastModif, time(0),mCurrentDB); if(valid) { - std::string path(itr->string()); + std::string path(itr->path().string()); mProgress.IncNumberScannedFiles(); boost::algorithm::replace_all( path,INVALID_FILE_SEPARATOR,VALID_FILE_SEPARATOR); - i_sc.ReadAttributes(itr->string(),attr); + i_sc.ReadAttributes(itr->path().string(),attr); // mTreeHandler->GetTopLevelNodeId("FullFileName",itr->string(),parent_id); mTreeHandler->AddBranch(attr); mProgress.IncNumberHandledFiles(); @@ -296,25 +296,25 @@ namespace creaImageIO { if (recursive) { - AddDirectoryRecursor( itr->string(), recursive, addKey); + AddDirectoryRecursor( itr->path().string(), recursive, addKey); } } else { std::string parent_id; // tTest if directory (and only it) exists or not. - bool valid = mSynchronizer->isIndexed(itr->string());//true;//=mTimestampHandler->AddDirectory(dirpath, itr->string(), lastModif, time(0),mCurrentDB); + bool valid = mSynchronizer->isIndexed(itr->path().string());//true;//=mTimestampHandler->AddDirectory(dirpath, itr->string(), lastModif, time(0),mCurrentDB); if(valid) { mProgress.IncNumberScannedFiles(); - if (IsHandledFile(itr->string())) + if (IsHandledFile(itr->path().string())) { mProgress.IncNumberHandledFiles(); - AddFile( itr->string() ); + AddFile( itr->path().string() ); //mTreeHandler->GetTopLevelNodeId("FullFileName",itr->string(),parent_id); std::stringstream removedOn; removedOn<InsertIgnoreFile(addKey, itr->string(),"0",removedOn.str(),mCurrentDB); + mSynchronizer->InsertIgnoreFile(addKey, itr->path().string(),"0",removedOn.str(),mCurrentDB); } mProgressSignal(mProgress); @@ -352,17 +352,17 @@ namespace creaImageIO { if (recursive) { - CheckSyncDirectory( itr->string(), recursive, repair, checkAttributes, i_ignorefiles, attsModified, newfiles); + CheckSyncDirectory( itr->path().string(), recursive, repair, checkAttributes, i_ignorefiles, attsModified, newfiles); } } else { - if (IsHandledFile(itr->string())) + if (IsHandledFile(itr->path().string())) { bool bfound = false; for(std::vector::iterator it_new = i_ignorefiles.begin(); it_new < i_ignorefiles.end(); ++it_new) { - if((*it_new) == itr->string()) + if((*it_new) == itr->path().string()) { bfound = true; //Additional checking of attributes @@ -376,7 +376,7 @@ namespace creaImageIO } if(!bfound && i_ignorefiles.size()>0 ) { - newfiles.push_back( itr->string() ); + newfiles.push_back( itr->path().string() ); } } } diff --git a/src/creaImageIOUltrasonixImageReader.cpp b/src/creaImageIOUltrasonixImageReader.cpp index d5f6c65..4116bb7 100644 --- a/src/creaImageIOUltrasonixImageReader.cpp +++ b/src/creaImageIOUltrasonixImageReader.cpp @@ -261,7 +261,7 @@ namespace creaImageIO if ( (i = attr.find("D0004_1500")) != attr.end()) { boost::filesystem::path full_path(filename); - std::string f = full_path.leaf(); + std::string f = full_path.leaf().string(); i->second = f; } if ( (i = attr.find("D0028_0010")) != attr.end()) diff --git a/src/creaImageIOVtkImageReader.cpp b/src/creaImageIOVtkImageReader.cpp index e2b7eb2..9cf160b 100644 --- a/src/creaImageIOVtkImageReader.cpp +++ b/src/creaImageIOVtkImageReader.cpp @@ -175,7 +175,7 @@ namespace creaImageIO{ if ( (i = attr.find("D0004_1500")) != attr.end()) { boost::filesystem::path full_path(filename); - std::string f = full_path.leaf(); + std::string f = full_path.leaf().string(); i->second = f; } if ( (i = attr.find("D0028_0010")) != attr.end()) diff --git a/src/creaImageIOWxAnySimpleDlg.cpp b/src/creaImageIOWxAnySimpleDlg.cpp index 7a1609d..926e118 100644 --- a/src/creaImageIOWxAnySimpleDlg.cpp +++ b/src/creaImageIOWxAnySimpleDlg.cpp @@ -141,7 +141,7 @@ namespace creaImageIO { bvalid = m_exts.size() == 0? true : false; std::vector::iterator it = m_exts.begin(); - std::string ext = itr->filename().substr(itr->filename().find_last_of(".")); + std::string ext = itr->path().filename().string().substr(itr->path().filename().string().find_last_of(".")); for(; it != m_exts.end(); it++) { if(ext == (*it) ) @@ -152,7 +152,7 @@ namespace creaImageIO } if (!boost::filesystem::is_directory(itr->status()) && bvalid) { - readImg(itr->string().c_str()); + readImg(itr->path().string().c_str()); } } } diff --git a/src/creaImageIOWxGimmickView.cpp b/src/creaImageIOWxGimmickView.cpp index 359223c..c1b7acb 100644 --- a/src/creaImageIOWxGimmickView.cpp +++ b/src/creaImageIOWxGimmickView.cpp @@ -619,7 +619,7 @@ namespace creaImageIO { if (recursive) { - nb += NumberFilesToAdd(itr->string(), recursive); + nb += NumberFilesToAdd(itr->path().string(), recursive); } } else -- 2.45.0