gitMirror/spdlog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2016 from mguludag/v1.x

Browse Source 
Simplified Qt sinks
This commit is contained in:
Gabi Melman 2021-07-28 02:08:10 +03:00 committed by GitHub
commit dbbec6cdb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 55 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

173
include/spdlog/sinks/qt_sinks.h
View File

@ -4,8 +4,8 @@
#pragma once #pragma once
// //
// Custom sink for QPlainTextEdit or QTextEdit and its children(QTextBrowser... // Custom sink for QPlainTextEdit or QTextEdit and its childs(QTextBrowser... etc)
// etc) Building and using requires Qt library. // Building and using requires Qt library.
// //
#include "spdlog/common.h" #include "spdlog/common.h"
@ -13,152 +13,69 @@
#include "spdlog/details/synchronous_factory.h" #include "spdlog/details/synchronous_factory.h"
#include "spdlog/sinks/base_sink.h" #include "spdlog/sinks/base_sink.h"
#include <QObject>
#include <QPlainTextEdit>
#include <QTextEdit> #include <QTextEdit>
#include <QPlainTextEdit>
namespace _spdlog_p {
namespace _sinks_p {
//
// Private class for QTextEdit and its derivatives
//
class qtextedit_sink_p : public QObject
{
Q_OBJECT
public:
qtextedit_sink_p(QTextEdit *textedit = nullptr)
{
if (textedit != nullptr)
{
textedit_ = textedit;
connect(this, &qtextedit_sink_p::append_text, textedit_, &QTextEdit::append);
}
}
~qtextedit_sink_p() {}
void append(const spdlog::string_view_t &str)
{
emit append_text( QString::fromUtf8(str.data(), static_cast<int>(str.size())).trimmed() );
}
signals:
void append_text(const QString &);
private:
QTextEdit *textedit_ = nullptr;
};
//
// Private class for QPlainTextEdit
//
class qplaintextedit_sink_p : public QObject
{
Q_OBJECT
public:
qplaintextedit_sink_p(QPlainTextEdit *textedit = nullptr)
{
if (textedit != nullptr)
{
textedit_ = textedit;
connect(this, &qplaintextedit_sink_p::append_text, textedit_, &QPlainTextEdit::appendPlainText);
}
}
~qplaintextedit_sink_p() {}
void append(const spdlog::string_view_t &str)
{
emit append_text( QString::fromUtf8(str.data(), static_cast<int>(str.size())).trimmed() );
}
signals:
void append_text(const QString &);
private:
QPlainTextEdit *textedit_ = nullptr;
};
} // namespace _sinks_p
} // namespace _spdlog_p
// //
// qtextedit_sink class // qtextedit_sink class
// //
namespace spdlog { namespace spdlog {
namespace sinks { namespace sinks {
template<typename Mutex> template <typename Mutex>
class qtextedit_sink : public base_sink<Mutex> class qtextedit_sink : public base_sink<Mutex> {
{
public: public:
qtextedit_sink(QTextEdit *textedit = nullptr) qtextedit_sink(QTextEdit *textedit = nullptr) {
{ if (textedit != nullptr) {
if (textedit != nullptr) qtextedit_ = textedit;
{ } else {
textedit_p = std::make_shared<_spdlog_p::_sinks_p::qtextedit_sink_p>(textedit);
}
else
{
throw spdlog_ex("Error opening QTextEdit"); throw spdlog_ex("Error opening QTextEdit");
} }
} }
~qtextedit_sink() ~qtextedit_sink() { flush_(); }
{
flush_();
}
protected: protected:
void sink_it_(const details::log_msg &msg) override void sink_it_(const details::log_msg &msg) override {
{
memory_buf_t formatted; memory_buf_t formatted;
base_sink<Mutex>::formatter_->format(msg, formatted); base_sink<Mutex>::formatter_->format(msg, formatted);
string_view_t str_v = string_view_t(formatted.data(), formatted.size()); string_view_t str = string_view_t(formatted.data(), formatted.size());
textedit_p->append(str_v); QMetaObject::invokeMethod(qtextedit_,"append", Qt::AutoConnection, Q_ARG(QString, QString::fromUtf8(str.data(), static_cast<int>(str.size())).trimmed()));
} }
void flush_() override {} void flush_() override {}
private: private:
std::shared_ptr<_spdlog_p::_sinks_p::qtextedit_sink_p> textedit_p = nullptr; QTextEdit* qtextedit_ = nullptr;
}; };
// //
// qplaintextedit_sink class // qplaintextedit_sink class
// //
template<typename Mutex> template <typename Mutex>
class qplaintextedit_sink : public base_sink<Mutex> class qplaintextedit_sink : public base_sink<Mutex> {
{
public: public:
qplaintextedit_sink(QPlainTextEdit *textedit = nullptr) qplaintextedit_sink(QPlainTextEdit *textedit = nullptr) {
{ if (textedit != nullptr) {
if (textedit != nullptr) qplaintextedit_ = textedit;
{ } else {
textedit_p = std::make_shared<_spdlog_p::_sinks_p::qplaintextedit_sink_p>(textedit);
}
else
{
throw spdlog_ex("Error opening QPlainTextEdit"); throw spdlog_ex("Error opening QPlainTextEdit");
} }
} }
~qplaintextedit_sink() ~qplaintextedit_sink() { flush_(); }
{
flush_();
}
protected: protected:
void sink_it_(const details::log_msg &msg) override void sink_it_(const details::log_msg &msg) override {
{
memory_buf_t formatted; memory_buf_t formatted;
base_sink<Mutex>::formatter_->format(msg, formatted); base_sink<Mutex>::formatter_->format(msg, formatted);
string_view_t str_v = string_view_t(formatted.data(), formatted.size()); string_view_t str = string_view_t(formatted.data(), formatted.size());
textedit_p->append(str_v); QMetaObject::invokeMethod(qplaintextedit_, "appendPlainText", Qt::AutoConnection, Q_ARG(QString, QString::fromUtf8(str.data(), static_cast<int>(str.size())).trimmed()));
} }
void flush_() override {} void flush_() override {}
private: private:
std::shared_ptr<_spdlog_p::_sinks_p::qplaintextedit_sink_p> textedit_p = nullptr; QPlainTextEdit* qplaintextedit_ = nullptr;
}; };
#include "spdlog/details/null_mutex.h" #include "spdlog/details/null_mutex.h"
@ -174,27 +91,35 @@ using qplaintextedit_sink_st = qplaintextedit_sink<spdlog::details::null_mutex>;
// //
// Factory functions // Factory functions
// //
template<typename Factory = spdlog::synchronous_factory> template <typename Factory = spdlog::synchronous_factory>
inline std::shared_ptr<logger> qtextedit_logger_mt(const std::string &logger_name, QTextEdit *qtextedit = nullptr) inline std::shared_ptr<logger>
{ qtextedit_logger_mt(const std::string &logger_name,
return Factory::template create<sinks::qtextedit_sink_mt>(logger_name, qtextedit); QTextEdit *qtextedit = nullptr) {
return Factory::template create<sinks::qtextedit_sink_mt>(logger_name,
qtextedit);
} }
template<typename Factory = spdlog::synchronous_factory> template <typename Factory = spdlog::synchronous_factory>
inline std::shared_ptr<logger> qtextedit_logger_st(const std::string &logger_name, QTextEdit *qtextedit = nullptr) inline std::shared_ptr<logger>
{ qtextedit_logger_st(const std::string &logger_name,
return Factory::template create<sinks::qtextedit_sink_st>(logger_name, qtextedit); QTextEdit *qtextedit = nullptr) {
return Factory::template create<sinks::qtextedit_sink_st>(logger_name,
qtextedit);
} }
template<typename Factory = spdlog::synchronous_factory> template <typename Factory = spdlog::synchronous_factory>
inline std::shared_ptr<logger> qplaintextedit_logger_mt(const std::string &logger_name, QPlainTextEdit *qplaintextedit = nullptr) inline std::shared_ptr<logger>
{ qplaintextedit_logger_mt(const std::string &logger_name,
return Factory::template create<sinks::qplaintextedit_sink_mt>(logger_name, qplaintextedit); QPlainTextEdit *qplaintextedit = nullptr) {
return Factory::template create<sinks::qplaintextedit_sink_mt>(logger_name,
qplaintextedit);
} }
template<typename Factory = spdlog::synchronous_factory> template <typename Factory = spdlog::synchronous_factory>
inline std::shared_ptr<logger> qplaintextedit_logger_st(const std::string &logger_name, QPlainTextEdit *qplaintextedit = nullptr) inline std::shared_ptr<logger>
{ qplaintextedit_logger_st(const std::string &logger_name,
return Factory::template create<sinks::qplaintextedit_sink_st>(logger_name, qplaintextedit); QPlainTextEdit *qplaintextedit = nullptr) {
return Factory::template create<sinks::qplaintextedit_sink_st>(logger_name,
qplaintextedit);
} }
} // namespace spdlog } // namespace spdlog