Merge pull request #2018 from mguludag/v1.x
Added common class for all qt objects
This commit is contained in:
		@@ -4,8 +4,8 @@
 | 
			
		||||
#pragma once
 | 
			
		||||
 | 
			
		||||
//
 | 
			
		||||
// Custom sink for QPlainTextEdit or QTextEdit and its childs(QTextBrowser... etc)
 | 
			
		||||
// Building and using requires Qt library.
 | 
			
		||||
// Custom sink for QPlainTextEdit or QTextEdit and its childs(QTextBrowser...
 | 
			
		||||
// etc) Building and using requires Qt library.
 | 
			
		||||
//
 | 
			
		||||
 | 
			
		||||
#include "spdlog/common.h"
 | 
			
		||||
@@ -17,75 +17,39 @@
 | 
			
		||||
#include <QPlainTextEdit>
 | 
			
		||||
 | 
			
		||||
//
 | 
			
		||||
// qtextedit_sink class
 | 
			
		||||
// qt_sink class
 | 
			
		||||
//
 | 
			
		||||
namespace spdlog {
 | 
			
		||||
namespace sinks {
 | 
			
		||||
template <typename Mutex>
 | 
			
		||||
class qtextedit_sink : public base_sink<Mutex> {
 | 
			
		||||
template <typename Mutex> class qt_sink : public base_sink<Mutex> {
 | 
			
		||||
public:
 | 
			
		||||
  qtextedit_sink(QTextEdit *textedit = nullptr) {
 | 
			
		||||
    if (textedit != nullptr) {
 | 
			
		||||
        qtextedit_ = textedit;
 | 
			
		||||
    } else {
 | 
			
		||||
      throw spdlog_ex("Error opening QTextEdit");
 | 
			
		||||
    }
 | 
			
		||||
  qt_sink(QObject *qt_object = nullptr, const std::string &meta_method = "") {
 | 
			
		||||
      qt_object_ = qt_object;
 | 
			
		||||
      meta_method_ = meta_method;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  ~qtextedit_sink() { flush_(); }
 | 
			
		||||
  ~qt_sink() { flush_(); }
 | 
			
		||||
 | 
			
		||||
protected:
 | 
			
		||||
  void sink_it_(const details::log_msg &msg) override {
 | 
			
		||||
    memory_buf_t formatted;
 | 
			
		||||
    base_sink<Mutex>::formatter_->format(msg, formatted);
 | 
			
		||||
    string_view_t str = string_view_t(formatted.data(), formatted.size());
 | 
			
		||||
    QMetaObject::invokeMethod(qtextedit_,"append", Qt::AutoConnection, Q_ARG(QString, QString::fromUtf8(str.data(), static_cast<int>(str.size())).trimmed()));
 | 
			
		||||
    QMetaObject::invokeMethod(qt_object_, meta_method_.c_str(), Qt::AutoConnection,
 | 
			
		||||
     Q_ARG(QString, QString::fromUtf8(str.data(), static_cast<int>(str.size())).trimmed()));
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  void flush_() override {}
 | 
			
		||||
 | 
			
		||||
private:
 | 
			
		||||
    QTextEdit* qtextedit_ = nullptr;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
//
 | 
			
		||||
// qplaintextedit_sink class
 | 
			
		||||
//
 | 
			
		||||
template <typename Mutex>
 | 
			
		||||
class qplaintextedit_sink : public base_sink<Mutex> {
 | 
			
		||||
public:
 | 
			
		||||
    qplaintextedit_sink(QPlainTextEdit *textedit = nullptr) {
 | 
			
		||||
        if (textedit != nullptr) {
 | 
			
		||||
            qplaintextedit_ = textedit;
 | 
			
		||||
        } else {
 | 
			
		||||
            throw spdlog_ex("Error opening QPlainTextEdit");
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    ~qplaintextedit_sink() { flush_(); }
 | 
			
		||||
 | 
			
		||||
protected:
 | 
			
		||||
    void sink_it_(const details::log_msg &msg) override {
 | 
			
		||||
        memory_buf_t formatted;
 | 
			
		||||
        base_sink<Mutex>::formatter_->format(msg, formatted);
 | 
			
		||||
        string_view_t str = string_view_t(formatted.data(), formatted.size());
 | 
			
		||||
        QMetaObject::invokeMethod(qplaintextedit_, "appendPlainText", Qt::AutoConnection, Q_ARG(QString, QString::fromUtf8(str.data(), static_cast<int>(str.size())).trimmed()));
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    void flush_() override {}
 | 
			
		||||
 | 
			
		||||
private:
 | 
			
		||||
    QPlainTextEdit* qplaintextedit_ = nullptr;
 | 
			
		||||
  QObject *qt_object_ = nullptr;
 | 
			
		||||
  std::string meta_method_;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
#include "spdlog/details/null_mutex.h"
 | 
			
		||||
#include <mutex>
 | 
			
		||||
using qtextedit_sink_mt = qtextedit_sink<std::mutex>;
 | 
			
		||||
using qtextedit_sink_st = qtextedit_sink<spdlog::details::null_mutex>;
 | 
			
		||||
 | 
			
		||||
using qplaintextedit_sink_mt = qplaintextedit_sink<std::mutex>;
 | 
			
		||||
using qplaintextedit_sink_st = qplaintextedit_sink<spdlog::details::null_mutex>;
 | 
			
		||||
 | 
			
		||||
using qt_sink_mt = qt_sink<std::mutex>;
 | 
			
		||||
using qt_sink_st = qt_sink<spdlog::details::null_mutex>;
 | 
			
		||||
} // namespace sinks
 | 
			
		||||
 | 
			
		||||
//
 | 
			
		||||
@@ -93,33 +57,37 @@ using qplaintextedit_sink_st = qplaintextedit_sink<spdlog::details::null_mutex>;
 | 
			
		||||
//
 | 
			
		||||
template <typename Factory = spdlog::synchronous_factory>
 | 
			
		||||
inline std::shared_ptr<logger>
 | 
			
		||||
qtextedit_logger_mt(const std::string &logger_name,
 | 
			
		||||
                    QTextEdit *qtextedit = nullptr) {
 | 
			
		||||
  return Factory::template create<sinks::qtextedit_sink_mt>(logger_name,
 | 
			
		||||
                                                            qtextedit);
 | 
			
		||||
qt_logger_mt(const std::string &logger_name, QTextEdit* qt_object, const std::string &meta_method = "append") {
 | 
			
		||||
  return Factory::template create<sinks::qt_sink_mt>(logger_name, qt_object, meta_method);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
template <typename Factory = spdlog::synchronous_factory>
 | 
			
		||||
inline std::shared_ptr<logger>
 | 
			
		||||
qtextedit_logger_st(const std::string &logger_name,
 | 
			
		||||
                    QTextEdit *qtextedit = nullptr) {
 | 
			
		||||
  return Factory::template create<sinks::qtextedit_sink_st>(logger_name,
 | 
			
		||||
                                                            qtextedit);
 | 
			
		||||
qt_logger_st(const std::string &logger_name, QTextEdit* qt_object, const std::string &meta_method = "append") {
 | 
			
		||||
  return Factory::template create<sinks::qt_sink_st>(logger_name, qt_object, meta_method);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
template <typename Factory = spdlog::synchronous_factory>
 | 
			
		||||
inline std::shared_ptr<logger>
 | 
			
		||||
qplaintextedit_logger_mt(const std::string &logger_name,
 | 
			
		||||
                    QPlainTextEdit *qplaintextedit = nullptr) {
 | 
			
		||||
    return Factory::template create<sinks::qplaintextedit_sink_mt>(logger_name,
 | 
			
		||||
                                                              qplaintextedit);
 | 
			
		||||
qt_logger_mt(const std::string &logger_name, QPlainTextEdit* qt_object , const std::string &meta_method = "appendPlainText") {
 | 
			
		||||
    return Factory::template create<sinks::qt_sink_mt>(logger_name, qt_object, meta_method);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
template <typename Factory = spdlog::synchronous_factory>
 | 
			
		||||
inline std::shared_ptr<logger>
 | 
			
		||||
qplaintextedit_logger_st(const std::string &logger_name,
 | 
			
		||||
                    QPlainTextEdit *qplaintextedit = nullptr) {
 | 
			
		||||
    return Factory::template create<sinks::qplaintextedit_sink_st>(logger_name,
 | 
			
		||||
                                                              qplaintextedit);
 | 
			
		||||
qt_logger_st(const std::string &logger_name, QPlainTextEdit* qt_object, const std::string &meta_method = "appendPlainText") {
 | 
			
		||||
    return Factory::template create<sinks::qt_sink_st>(logger_name, qt_object, meta_method);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
template <typename Factory = spdlog::synchronous_factory>
 | 
			
		||||
inline std::shared_ptr<logger>
 | 
			
		||||
qt_logger_mt(const std::string &logger_name, QObject* qt_object, const std::string &meta_method) {
 | 
			
		||||
    return Factory::template create<sinks::qt_sink_mt>(logger_name, qt_object, meta_method);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
template <typename Factory = spdlog::synchronous_factory>
 | 
			
		||||
inline std::shared_ptr<logger>
 | 
			
		||||
qt_logger_st(const std::string &logger_name, QObject* qt_object, const std::string &meta_method) {
 | 
			
		||||
    return Factory::template create<sinks::qt_sink_st>(logger_name, qt_object, meta_method);
 | 
			
		||||
}
 | 
			
		||||
} // namespace spdlog
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user