From c5f273172a4d4a2d3cb9a6454cfb54596c566620 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Tue, 28 Aug 2018 16:51:27 -0700 Subject: [PATCH] Support GuidedActionsController logging --- src/QGCLoggingCategory.cc | 15 ++++++++------- src/QGCLoggingCategory.h | 1 + src/api/QGCCorePlugin.cc | 6 ++++++ src/api/QGCCorePlugin.h | 2 ++ 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/QGCLoggingCategory.cc b/src/QGCLoggingCategory.cc index fc1670c34..c39126f02 100644 --- a/src/QGCLoggingCategory.cc +++ b/src/QGCLoggingCategory.cc @@ -16,13 +16,14 @@ #include // Add Global logging categories (not class specific) here using QGC_LOGGING_CATEGORY -QGC_LOGGING_CATEGORY(FirmwareUpgradeLog, "FirmwareUpgradeLog") -QGC_LOGGING_CATEGORY(FirmwareUpgradeVerboseLog, "FirmwareUpgradeVerboseLog") -QGC_LOGGING_CATEGORY(MissionCommandsLog, "MissionCommandsLog") -QGC_LOGGING_CATEGORY(MissionItemLog, "MissionItemLog") -QGC_LOGGING_CATEGORY(ParameterManagerLog, "ParameterManagerLog") -QGC_LOGGING_CATEGORY(GeotaggingLog, "GeotaggingLog") -QGC_LOGGING_CATEGORY(RTKGPSLog, "RTKGPSLog") +QGC_LOGGING_CATEGORY(FirmwareUpgradeLog, "FirmwareUpgradeLog") +QGC_LOGGING_CATEGORY(FirmwareUpgradeVerboseLog, "FirmwareUpgradeVerboseLog") +QGC_LOGGING_CATEGORY(MissionCommandsLog, "MissionCommandsLog") +QGC_LOGGING_CATEGORY(MissionItemLog, "MissionItemLog") +QGC_LOGGING_CATEGORY(ParameterManagerLog, "ParameterManagerLog") +QGC_LOGGING_CATEGORY(GeotaggingLog, "GeotaggingLog") +QGC_LOGGING_CATEGORY(RTKGPSLog, "RTKGPSLog") +QGC_LOGGING_CATEGORY(GuidedActionsControllerLog, "GuidedActionsControllerLog") QGCLoggingCategoryRegister* _instance = NULL; const char* QGCLoggingCategoryRegister::_filterRulesSettingsGroup = "LoggingFilters"; diff --git a/src/QGCLoggingCategory.h b/src/QGCLoggingCategory.h index 15ba4c6bc..15683c9a5 100644 --- a/src/QGCLoggingCategory.h +++ b/src/QGCLoggingCategory.h @@ -25,6 +25,7 @@ Q_DECLARE_LOGGING_CATEGORY(MissionItemLog) Q_DECLARE_LOGGING_CATEGORY(ParameterManagerLog) Q_DECLARE_LOGGING_CATEGORY(GeotaggingLog) Q_DECLARE_LOGGING_CATEGORY(RTKGPSLog) +Q_DECLARE_LOGGING_CATEGORY(GuidedActionsControllerLog) /// @def QGC_LOGGING_CATEGORY /// This is a QGC specific replacement for Q_LOGGING_CATEGORY. It will register the category name into a diff --git a/src/api/QGCCorePlugin.cc b/src/api/QGCCorePlugin.cc index 690a457d3..0338071ba 100644 --- a/src/api/QGCCorePlugin.cc +++ b/src/api/QGCCorePlugin.cc @@ -16,6 +16,7 @@ #include "AppMessages.h" #include "QmlObjectListModel.h" #include "VideoReceiver.h" +#include "QGCLoggingCategory.h" #include #include @@ -297,3 +298,8 @@ VideoReceiver* QGCCorePlugin::createVideoReceiver(QObject* parent) { return new VideoReceiver(parent); } + +bool QGCCorePlugin::guidedActionsControllerLogging(void) const +{ + return GuidedActionsControllerLog().isDebugEnabled(); +} diff --git a/src/api/QGCCorePlugin.h b/src/api/QGCCorePlugin.h index b68f32457..24ac418cf 100644 --- a/src/api/QGCCorePlugin.h +++ b/src/api/QGCCorePlugin.h @@ -51,6 +51,8 @@ public: Q_PROPERTY(QString brandImageOutdoor READ brandImageOutdoor CONSTANT) Q_PROPERTY(QmlObjectListModel* customMapItems READ customMapItems CONSTANT) + Q_INVOKABLE bool guidedActionsControllerLogging(void) const; + /// The list of settings under the Settings Menu /// @return A list of QGCSettings virtual QVariantList& settingsPages(void); -- 2.22.0