DRY image formats

This commit is contained in:
Manuel Dewald
2021-03-11 09:03:13 +01:00
parent 128796c9e8
commit 98344061c1
2 changed files with 11 additions and 4 deletions

View File

@@ -13,6 +13,14 @@ PathTraverser::PathTraverser(const std::string path):
PathTraverser::~PathTraverser() {}
QStringList PathTraverser::getImageFormats() const {
QStringList imageFormats;
imageFormats << "*.jpg" << "*.JPG" << "*.jpeg" << "*.JPEG";
imageFormats << "*.PNG" << "*.png";
imageFormats << "*.tiff" << "*.TIFF" << "*.tif" << "*.TIF";
return imageFormats;
}
RecursivePathTraverser::RecursivePathTraverser(const std::string path):
PathTraverser(path)
{}
@@ -22,8 +30,7 @@ RecursivePathTraverser::~RecursivePathTraverser() {}
QStringList RecursivePathTraverser::getImages() const
{
QDirIterator it(QString(path.c_str()),
QStringList() << "*.jpg" << "*.JPG" << "*.jpeg" << "*.JPEG" << "*.PNG" << "*.png" << "*.tiff" << "*.TIFF" << "*.tif" << "*.TIF",
QDirIterator it(QString(path.c_str()), getImageFormats(),
QDir::Files, QDirIterator::Subdirectories);
QStringList files;
while (it.hasNext())
@@ -48,8 +55,7 @@ DefaultPathTraverser::~DefaultPathTraverser() {}
QStringList DefaultPathTraverser::getImages() const
{
return directory.entryList(QStringList() << "*.jpg" << "*.JPG" << "*.jpeg" << "*.JPEG" << "*.PNG" << "*.png"<< "*.tiff" << "*.TIFF"<< "*.tif" << "*.TIF",
QDir::Files);
return directory.entryList(getImageFormats(), QDir::Files);
}
const std::string DefaultPathTraverser::getImagePath(const std::string image) const

View File

@@ -16,6 +16,7 @@ class PathTraverser
protected:
const std::string path;
QStringList getImageFormats() const;
};
class RecursivePathTraverser : public PathTraverser