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

Place _loggercat in empty namespace of .cpp instead of storing it as a member variable

Browse Source
This commit is contained in:
Oskar Carlbaum
2017-09-20 06:58:57 +02:00
parent 2e4108093b
commit 4f51dafae3
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,8 @@
using std::string;
namespace {
std::string _loggerCat = "RenderableFieldlinesSequence";
// ----- KEYS POSSIBLE IN MODFILE. EXPECTED DATA TYPE OF VALUE IN [BRACKETS] ----- //
// ---------------------------- MANDATORY MODFILE KEYS ---------------------------- //
const char* KEY_INPUT_FILE_TYPE = "InputFileType"; // [STRING]
@@ -49,41 +51,39 @@ RenderableFieldlinesSequence::RenderableFieldlinesSequence(const ghoul::Dictiona
string name;
dictionary.getValue(SceneGraphNode::KeyName, name);
_loggerCat += " [" + name + "]";
name += ": ";
// ------------------- EXTRACT MANDATORY VALUES FROM DICTIONARY ------------------- //
string inputFileType;
if(!dictionary.getValue(KEY_INPUT_FILE_TYPE, inputFileType)) {
LERRORC("FieldlinesSequence",
"The field " + string(KEY_INPUT_FILE_TYPE) + " is missing!");
string inputFileTypeValue;
if(!dictionary.getValue(KEY_INPUT_FILE_TYPE, inputFileTypeValue)) {
LERROR(name << "The field " << string(KEY_INPUT_FILE_TYPE) << " is missing!");
return;
}
string sourceFolderPath;
if(!dictionary.getValue(KEY_SOURCE_FOLDER, sourceFolderPath)) {
LERRORC("FieldlinesSequence",
"The field " + string(KEY_SOURCE_FOLDER) + " is missing!");
LERROR(name << "The field " << string(KEY_SOURCE_FOLDER) << " is missing!");
return;
}
// Ensure that the source folder exists and then extract
// the files with the same extension as <inputFileType>
// the files with the same extension as <inputFileTypeValue>
ghoul::filesystem::Directory sourceFolder(sourceFolderPath);
if (FileSys.directoryExists(sourceFolder)) {
// Extract all file paths from the provided folder (Non-recursively! Sorted!)
_sourceFiles = sourceFolder.readFiles(ghoul::Boolean::No, ghoul::Boolean::Yes);
// Remove all files that don't have <inputFileType> as extension
// Remove all files that don't have <inputFileTypeValue> as extension
_sourceFiles.erase(std::remove_if(_sourceFiles.begin(), _sourceFiles.end(),
[inputFileType] (string str) {
const size_t EXT_LENGTH = inputFileType.length();
[inputFileTypeValue] (string str) {
const size_t EXT_LENGTH = inputFileTypeValue.length();
string sub = str.substr(str.length() - EXT_LENGTH, EXT_LENGTH);
std::transform(sub.begin(), sub.end(), sub.begin(), ::tolower);
return sub != inputFileType;
return sub != inputFileTypeValue;
}), _sourceFiles.end());
} else {
LERRORC("FieldlinesSequence", sourceFolderPath + " is not a valid directory!");
LERROR(name << "FieldlinesSequence" << sourceFolderPath
<< " is not a valid directory!");
return;
}
}

1
modules/fieldlinessequence/rendering/renderablefieldlinessequence.h
View File

@@ -44,7 +44,6 @@ public:
void render(const RenderData& data, RendererTasks& rendererTask) override;
void update(const UpdateData& data) override;
private:
std::string _loggerCat = "RenderableFieldlinesSequence";
std::vector<FieldlinesState> _states;
std::vector<std::string> _sourceFiles;