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

Rearrange and rename constants in ConfigurationManager

Browse Source 
Make use of constants in ConfigurationManager documentation
This commit is contained in:
Alexander Bock
2016-09-15 15:35:23 +02:00
parent a354f13ef3
commit 408280a533
8 changed files with 179 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/scripting/scriptengine.cpp
View File

@@ -597,18 +597,23 @@ void ScriptEngine::writeDocumentation(const std::string& filename, const std::st
}
bool ScriptEngine::writeLog(const std::string& script) {
const std::string KeyScriptLogType =
ConfigurationManager::KeyScriptLog + '.' + ConfigurationManager::PartType;
const std::string KeyScriptLogFile =
ConfigurationManager::KeyScriptLog + '.' + ConfigurationManager::PartFile;
// Check that logging is enabled and initialize if necessary
if (!_logFileExists) {
// If a ScriptLogFile was specified, generate it now
const bool hasType = OsEng.configurationManager()
.hasKey(ConfigurationManager::KeyScriptLogType);
.hasKey(KeyScriptLogType);
const bool hasFile = OsEng.configurationManager()
.hasKey(ConfigurationManager::KeyScriptLogFile);
.hasKey(KeyScriptLogFile);
if (hasType && hasFile) {
OsEng.configurationManager()
.getValue(ConfigurationManager::KeyScriptLogType, _logType);
.getValue(KeyScriptLogType, _logType);
OsEng.configurationManager()
.getValue(ConfigurationManager::KeyScriptLogFile, _logFilename);
.getValue(KeyScriptLogFile, _logFilename);
_logFilename = absPath(_logFilename);
_logFileExists = true;
@@ -627,8 +632,8 @@ bool ScriptEngine::writeLog(const std::string& script) {
}
} else {
LDEBUG("No script log specified in 'openspace.cfg.' To log, set '"
<< ConfigurationManager::KeyScriptLogType << " and "
<< ConfigurationManager::KeyScriptLogFile
<< KeyScriptLogType << " and "
<< KeyScriptLogFile
<< " in configuration table.");
_logScripts = false;
return false;