-
Notifications
You must be signed in to change notification settings - Fork 91
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' into sigurdp/vizfwk-qopenglwidget
- Loading branch information
Showing
47 changed files
with
1,744 additions
and
304 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,152 @@ | ||
| ///////////////////////////////////////////////////////////////////////////////// | ||
| // | ||
| // Copyright (C) 2024 Equinor ASA | ||
| // | ||
| // ResInsight is free software: you can redistribute it and/or modify | ||
| // it under the terms of the GNU General Public License as published by | ||
| // the Free Software Foundation, either version 3 of the License, or | ||
| // (at your option) any later version. | ||
| // | ||
| // ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY | ||
| // WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| // FITNESS FOR A PARTICULAR PURPOSE. | ||
| // | ||
| // See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> | ||
| // for more details. | ||
| // | ||
| ///////////////////////////////////////////////////////////////////////////////// | ||
|
|
||
| #include "RiaFileLogger.h" | ||
| #include "RiaPreferences.h" | ||
|
|
||
| #include "spdlog/logger.h" | ||
| #include "spdlog/sinks/basic_file_sink.h" | ||
| #include "spdlog/spdlog.h" | ||
|
|
||
| class RiaFileLogger::Impl | ||
| { | ||
| public: | ||
| //-------------------------------------------------------------------------------------------------- | ||
| /// | ||
| //-------------------------------------------------------------------------------------------------- | ||
| Impl( const std::string& fileName ) | ||
| { | ||
| try | ||
| { | ||
| m_spdlogger = spdlog::basic_logger_mt( "basic_logger", fileName ); | ||
|
|
||
| auto flushInterval = RiaPreferences::current()->loggerFlushInterval(); | ||
| spdlog::flush_every( std::chrono::milliseconds( flushInterval ) ); | ||
| } | ||
| catch ( ... ) | ||
| { | ||
| } | ||
| } | ||
|
|
||
| //-------------------------------------------------------------------------------------------------- | ||
| /// | ||
| //-------------------------------------------------------------------------------------------------- | ||
| void log( const std::string& message ) | ||
| { | ||
| if ( m_spdlogger ) m_spdlogger->info( message ); | ||
| } | ||
|
|
||
| //-------------------------------------------------------------------------------------------------- | ||
| /// | ||
| //-------------------------------------------------------------------------------------------------- | ||
| void info( const std::string& message ) | ||
| { | ||
| if ( m_spdlogger ) m_spdlogger->info( message ); | ||
| } | ||
|
|
||
| //-------------------------------------------------------------------------------------------------- | ||
| /// | ||
| //-------------------------------------------------------------------------------------------------- | ||
| void debug( const std::string& message ) | ||
| { | ||
| if ( m_spdlogger ) m_spdlogger->debug( message ); | ||
| } | ||
|
|
||
| //-------------------------------------------------------------------------------------------------- | ||
| /// | ||
| //-------------------------------------------------------------------------------------------------- | ||
| void error( const std::string& message ) | ||
| { | ||
| if ( m_spdlogger ) m_spdlogger->error( message ); | ||
| } | ||
|
|
||
| //-------------------------------------------------------------------------------------------------- | ||
| /// | ||
| //-------------------------------------------------------------------------------------------------- | ||
| void warning( const std::string& message ) | ||
| { | ||
| if ( m_spdlogger ) m_spdlogger->warn( message ); | ||
| } | ||
|
|
||
| private: | ||
| std::shared_ptr<spdlog::logger> m_spdlogger; | ||
| }; | ||
|
|
||
| //-------------------------------------------------------------------------------------------------- | ||
| /// | ||
| //-------------------------------------------------------------------------------------------------- | ||
| RiaFileLogger::RiaFileLogger( const std::string& filename ) | ||
| : m_impl( new Impl( filename ) ) | ||
| , m_logLevel( int( RILogLevel::RI_LL_DEBUG ) ) | ||
|
|
||
| { | ||
| } | ||
|
|
||
| //-------------------------------------------------------------------------------------------------- | ||
| /// The destructor must be located in the cpp file after the definition of RiaFileLogger::Impl to make sure the Impl class is defined when | ||
| /// the destructor of std::unique_ptr<Impl> is called | ||
| //-------------------------------------------------------------------------------------------------- | ||
| RiaFileLogger::~RiaFileLogger() = default; | ||
|
|
||
| //-------------------------------------------------------------------------------------------------- | ||
| /// | ||
| //-------------------------------------------------------------------------------------------------- | ||
| int RiaFileLogger::level() const | ||
| { | ||
| return m_logLevel; | ||
| } | ||
|
|
||
| //-------------------------------------------------------------------------------------------------- | ||
| /// | ||
| //-------------------------------------------------------------------------------------------------- | ||
| void RiaFileLogger::setLevel( int logLevel ) | ||
| { | ||
| m_logLevel = logLevel; | ||
| } | ||
|
|
||
| //-------------------------------------------------------------------------------------------------- | ||
| /// | ||
| //-------------------------------------------------------------------------------------------------- | ||
| void RiaFileLogger::error( const char* message ) | ||
| { | ||
| m_impl->error( message ); | ||
| } | ||
|
|
||
| //-------------------------------------------------------------------------------------------------- | ||
| /// | ||
| //-------------------------------------------------------------------------------------------------- | ||
| void RiaFileLogger::warning( const char* message ) | ||
| { | ||
| m_impl->warning( message ); | ||
| } | ||
|
|
||
| //-------------------------------------------------------------------------------------------------- | ||
| /// | ||
| //-------------------------------------------------------------------------------------------------- | ||
| void RiaFileLogger::info( const char* message ) | ||
| { | ||
| m_impl->info( message ); | ||
| } | ||
|
|
||
| //-------------------------------------------------------------------------------------------------- | ||
| /// | ||
| //-------------------------------------------------------------------------------------------------- | ||
| void RiaFileLogger::debug( const char* message ) | ||
| { | ||
| m_impl->debug( message ); | ||
| } |
Oops, something went wrong.