mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-01 01:01:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Feature/filesystem cleanup (#1587)

Browse Source 
* Adapting to the changes in Ghoul
* First step of moving filesystem functions to std
* Remove persistence flag from cachemanager
This commit is contained in:
Alexander Bock
2021-05-16 20:26:49 +02:00
committed by GitHub
parent 2ca7101b6c
commit ccdc5a5dc3
87 changed files with 648 additions and 711 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/rendering/transferfunction.cpp
View File

@@ -32,27 +32,14 @@
#include <ghoul/logging/logmanager.h>
#include <ghoul/opengl/texture.h>
#include <iterator>
#include <filesystem>
#include <fstream>
#include <string>
namespace {
constexpr const char* _loggerCat = "TransferFunction";
// @TODO Replace with Filesystem::File extension
bool hasExtension(const std::string& filepath, const std::string& extension) {
std::string ending = "." + extension;
if (filepath.length() > ending.length()) {
return (0 == filepath.compare(
filepath.length() - ending.length(),
ending.length(), ending));
}
else {
return false;
}
}
} // namespace
namespace openspace {
TransferFunction::TransferFunction(const std::string& filepath,
@@ -70,20 +57,15 @@ void TransferFunction::setPath(const std::string& filepath) {
_file = nullptr;
}
std::string f = absPath(filepath);
if (!FileSys.fileExists(f)) {
if (!std::filesystem::is_regular_file(f)) {
LERROR("Could not find transfer function file.");
_file = nullptr;
return;
}
_filepath = f;
_file = std::make_unique<ghoul::filesystem::File>(
_filepath,
ghoul::filesystem::File::RawPath::Yes
);
_file = std::make_unique<ghoul::filesystem::File>(_filepath);
_needsUpdate = true;
_file->setCallback([this](const ghoul::filesystem::File&) {
_needsUpdate = true;
});
_file->setCallback([this]() { _needsUpdate = true; });
}
ghoul::opengl::Texture& TransferFunction::texture() {
@@ -94,7 +76,7 @@ ghoul::opengl::Texture& TransferFunction::texture() {
void TransferFunction::update() {
if (_needsUpdate) {
if (hasExtension(_filepath, "txt")) {
if (std::filesystem::path(_filepath).extension() == ".txt") {
setTextureFromTxt();
}
else {
@@ -114,7 +96,7 @@ void TransferFunction::setCallback(TfChangedCallback callback) {
void TransferFunction::setTextureFromTxt() {
std::ifstream in;
in.open(_filepath.c_str());
in.open(_filepath);
if (!in.is_open()) {
throw ghoul::FileNotFoundError(_filepath);