sunwen/DCMV
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add file support to DICOMDirectoryHelper

Browse Source
This commit is contained in:
Krad
2022-02-14 09:23:37 +08:00
parent 4fc5485161
commit 5e9b49d3d1
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/src/base/DICOMDirectoryHelper.cpp
View File

@@ -127,8 +127,12 @@ void DICOMDirectoryHelper::getFileProperty(const std::string &path, DICOMFileMap
void DICOMDirectoryHelper::Update() { void DICOMDirectoryHelper::Update() {
std::unordered_map<std::string, std::unordered_map<std::string,DICOMFileRefValue>> series; std::unordered_map<std::string, std::unordered_map<std::string,DICOMFileRefValue>> series;
if (!this->dirName.empty()){
getDirectoryProperties(this->dirName.c_str(), series); getDirectoryProperties(this->dirName.c_str(), series);
}
else{
getFileProperty(this->fileName.c_str(), series);
}
//sort files //sort files
for (auto &pair : series) { for (auto &pair : series) {
auto iterator = std::find_if(seriesProperties.begin(),seriesProperties.end(), auto iterator = std::find_if(seriesProperties.begin(),seriesProperties.end(),
@@ -143,7 +147,6 @@ void DICOMDirectoryHelper::Update() {
// printf("%s\r\n",f.second.FilePath.c_str()); // printf("%s\r\n",f.second.FilePath.c_str());
vector.emplace_back(std::move(f.second)); vector.emplace_back(std::move(f.second));
} }
std::sort(vector.begin(), vector.end(), [](const DICOMFileRefValue &v1, const DICOMFileRefValue &v2) { std::sort(vector.begin(), vector.end(), [](const DICOMFileRefValue &v1, const DICOMFileRefValue &v2) {
return v1.SeriesNumber != v2.SeriesNumber ? (v1.SeriesNumber < v2.SeriesNumber) : return v1.SeriesNumber != v2.SeriesNumber ? (v1.SeriesNumber < v2.SeriesNumber) :
@@ -154,6 +157,7 @@ void DICOMDirectoryHelper::Update() {
// printf("%s\r\n",v.FilePath.c_str()); // printf("%s\r\n",v.FilePath.c_str());
files->emplace_back(std::move(v.FilePath)); files->emplace_back(std::move(v.FilePath));
}); });
} }
} }
SeriesCount = seriesProperties.size(); SeriesCount = seriesProperties.size();