From c51c7f72e71690114716c973b32eb4952f76013a Mon Sep 17 00:00:00 2001 From: ephy Date: Sun, 25 Apr 2010 17:55:21 +0000 Subject: [PATCH] GCS/core: Add logging support to core. git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@545 ebee16cc-31ac-478f-84a7-5cbb03baadba --- ground/src/plugins/config/config.pro | 2 +- ground/src/plugins/coreplugin/coreplugin.pro | 1 + ground/src/plugins/coreplugin/coreplugin_dependencies.pri | 1 + ground/src/plugins/coreplugin/mainwindow.cpp | 7 +++++++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ground/src/plugins/config/config.pro b/ground/src/plugins/config/config.pro index a9aba6e14..c15fb1633 100644 --- a/ground/src/plugins/config/config.pro +++ b/ground/src/plugins/config/config.pro @@ -2,7 +2,7 @@ TEMPLATE = lib TARGET = Config include(../../openpilotgcsplugin.pri) include(../../plugins/coreplugin/coreplugin.pri) -OTHER_FILES += config.pluginspec +OTHER_FILES += Config.pluginspec HEADERS += configplugin.h \ configgadgetconfiguration.h \ configgadgetwidget.h \ diff --git a/ground/src/plugins/coreplugin/coreplugin.pro b/ground/src/plugins/coreplugin/coreplugin.pro index 1cbbee3ed..fc3b059f3 100644 --- a/ground/src/plugins/coreplugin/coreplugin.pro +++ b/ground/src/plugins/coreplugin/coreplugin.pro @@ -10,6 +10,7 @@ include(../../openpilotgcsplugin.pri) include(../../libs/utils/utils.pri) include(../../shared/scriptwrapper/scriptwrapper.pri) include(coreplugin_dependencies.pri) +include(../../libs/libqxt/libqxt.pri) INCLUDEPATH += dialogs \ uavgadgetmanager \ actionmanager diff --git a/ground/src/plugins/coreplugin/coreplugin_dependencies.pri b/ground/src/plugins/coreplugin/coreplugin_dependencies.pri index db9796287..6e4a2fb01 100644 --- a/ground/src/plugins/coreplugin/coreplugin_dependencies.pri +++ b/ground/src/plugins/coreplugin/coreplugin_dependencies.pri @@ -1,3 +1,4 @@ include(../../libs/extensionsystem/extensionsystem.pri) include(../../libs/utils/utils.pri) +include(../../libs/libqxt/libqxt.pri) include(../../libs/qextserialport/qextserialport.pri) diff --git a/ground/src/plugins/coreplugin/mainwindow.cpp b/ground/src/plugins/coreplugin/mainwindow.cpp index d185c5488..74b03d221 100644 --- a/ground/src/plugins/coreplugin/mainwindow.cpp +++ b/ground/src/plugins/coreplugin/mainwindow.cpp @@ -45,6 +45,8 @@ #include "uavgadgetmanager.h" #include "uavgadgetinstancemanager.h" #include "connectionmanager.h" +#include "qxtlogger.h" +#include "qxtbasicstdloggerengine.h" #include "settingsdialog.h" #include "variablemanager.h" @@ -184,6 +186,11 @@ MainWindow::MainWindow() : statusBar()->setProperty("p_styled", true); setAcceptDrops(true); + foreach (QString engine, qxtLog->allLoggerEngines()) + qxtLog->removeLoggerEngine(engine); + qxtLog->addLoggerEngine("std", new QxtBasicSTDLoggerEngine()); + qxtLog->installAsMessageHandler(); + qxtLog->enableAllLogLevels(); } MainWindow::~MainWindow()