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

Adapt to changes in Ghoul that made absPath return a std::filesystem::path instead of a std::string

Browse Source
This commit is contained in:
Alexander Bock
2021-05-17 00:23:15 +02:00
parent ccdc5a5dc3
commit 92432caed2
102 changed files with 431 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
View File

@@ -295,7 +295,9 @@ void RenderableFieldlinesSequence::initializeGL() {
// Set a default color table, just in case the (optional) user defined paths are
// corrupt or not provided!
_colorTablePaths.push_back(FieldlinesSequenceModule::DefaultTransferFunctionFile);
_transferFunction = std::make_unique<TransferFunction>(absPath(_colorTablePaths[0]));
_transferFunction = std::make_unique<TransferFunction>(
absPath(_colorTablePaths[0]).string()
);
// EXTRACT OPTIONAL INFORMATION FROM DICTIONARY
std::string outputFolderPath;
@@ -476,7 +478,7 @@ void RenderableFieldlinesSequence::extractOptionalInfoFromDictionary(
if (_dictionary->hasValue<std::string>(KeyOutputFolder)) {
outputFolderPath = _dictionary->value<std::string>(KeyOutputFolder);
if (std::filesystem::is_directory(outputFolderPath)) {
outputFolderPath = absPath(outputFolderPath);
outputFolderPath = absPath(outputFolderPath).string();
}
else {
LERROR(fmt::format(
@@ -921,7 +923,7 @@ bool RenderableFieldlinesSequence::extractCdfInfoFromDictionary(std::string& see
if (_dictionary->hasValue<std::string>(KeyCdfSeedPointFile)) {
seedFilePath = _dictionary->value<std::string>(KeyCdfSeedPointFile);
if (std::filesystem::is_regular_file(seedFilePath)) {
seedFilePath = absPath(seedFilePath);
seedFilePath = absPath(seedFilePath).string();
}
else {
LERROR(fmt::format(