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

Adapt to Ghoul changes of moving LogLevel out of LogManager

Browse Source
This commit is contained in:
Alexander Bock
2016-12-14 22:59:22 +01:00
parent c390f6be30
commit aa2ac511ff
7 changed files with 88 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/openspace/util/screenlog.h
View File

@@ -42,14 +42,14 @@ namespace openspace {
class ScreenLog : public ghoul::logging::Log {
public:
/// Just a shortcut for the LogLevel access
using LogLevel = ghoul::logging::LogManager::LogLevel;
using LogLevel = ghoul::logging::LogLevel;
/**
* This struct stores the incoming log entries with their #level, #timeString,
* #category, #message, and the generated #timeStamp used for the expiry calculation.
*/
struct LogEntry {
/// The ghoul::logging::LogManager::LogLevel of the log message
/// The ghoul::logging::LogLevel of the log message
LogLevel level;
/// The timepoint when the log message arrived at the ScreenLog
@@ -68,10 +68,10 @@ public:
/**
* Constructor that creates a ScreenLog with the provided \p timeToLive, and the
* minimum \p logLevel that is stored. Log message with a lower
* ghoul::logging::LogManager::LogLevel are automatically discarded.
* ghoul::logging::LogLevel are automatically discarded.
* \param timeToLive The time-to-live for the messages in this ScreenLog. Expired
* messages are removed whenever the #removeExpiredEntries method is called
* \param logLevel The minimum ghoul::logging::LogManager::LogLevel that messages must
* \param logLevel The minimum ghoul::logging::LogLevel that messages must
* have in order to be stored in the ScreenLog
*/
ScreenLog(std::chrono::seconds timeToLive, LogLevel logLevel = LogLevel::Info);
@@ -79,11 +79,11 @@ public:
/**
* Overwritten ghoul::loggling::Log method that is called whenever a new log message
* shall be stored.
* \param level The ghoul::logging::LogManager::LogLevel of the incoming log message
* \param level The ghoul::logging::LogLevel of the incoming log message
* \param category The category of the log message
* \param message The actual log message that was transmitted
*/
void log(ghoul::logging::LogManager::LogLevel level, const std::string& category,
void log(ghoul::logging::LogLevel level, const std::string& category,
const std::string& message) override;
/**