From 08186e6559d86e317190df95f069b43af00eb4c5 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 26 Feb 2020 20:46:00 +0100 Subject: [PATCH] Ref T773, log.categories for XSwiftBusProxy --- .../simulator/xplane/xswiftbustrafficproxy.cpp | 12 ++++++++++++ src/plugins/simulator/xplane/xswiftbustrafficproxy.h | 4 ++++ 2 files changed, 16 insertions(+) diff --git a/src/plugins/simulator/xplane/xswiftbustrafficproxy.cpp b/src/plugins/simulator/xplane/xswiftbustrafficproxy.cpp index 2c3e0f815..6e6d8cdc4 100644 --- a/src/plugins/simulator/xplane/xswiftbustrafficproxy.cpp +++ b/src/plugins/simulator/xplane/xswiftbustrafficproxy.cpp @@ -7,12 +7,15 @@ */ #include "xswiftbustrafficproxy.h" +#include "blackmisc/logmessage.h" + #include #include #include #define XSWIFTBUS_SERVICENAME "org.swift-project.xswiftbus" +using namespace BlackMisc; using namespace BlackMisc::Aviation; using namespace BlackMisc::Geo; using namespace BlackMisc::PhysicalQuantities; @@ -21,6 +24,12 @@ namespace BlackSimPlugin { namespace XPlane { + const CLogCategoryList &CXSwiftBusTrafficProxy::getLogCategories() + { + static const CLogCategoryList cats { CLogCategory::driver(), CLogCategory::dbus() }; + return cats; + } + CXSwiftBusTrafficProxy::CXSwiftBusTrafficProxy(QDBusConnection &connection, QObject *parent, bool dummy) : QObject(parent) { m_dbusInterface = new BlackMisc::CGenericDBusInterface(XSWIFTBUS_SERVICENAME, ObjectPath(), InterfaceName(), connection, this); @@ -178,10 +187,13 @@ namespace BlackSimPlugin CLongitude(longitudeDegrees, CAngleUnit::deg()), elevationAlt, CElevationPlane::singlePointRadius()); setter(elevation, cs); + // CLogMessage(this).debug(u"XPlane elv. response: '%1' %2 %3 %4") << cs.asString() << latitudeDeg << longitudeDeg << elevationMeters; } watcher->deleteLater(); }; + m_dbusInterface->callDBusAsync(QLatin1String("getElevationAtPosition"), callback, callsign.asString(), latitudeDeg, longitudeDeg, altitudeMeters); + // CLogMessage(this).debug(u"XPlane elv. request: '%1' %2 %3 %4") << callsign.asString() << latitudeDeg << longitudeDeg << altitudeMeters; } void CXSwiftBusTrafficProxy::setFollowedAircraft(const QString &callsign) diff --git a/src/plugins/simulator/xplane/xswiftbustrafficproxy.h b/src/plugins/simulator/xplane/xswiftbustrafficproxy.h index 9f554d433..0a27a39c7 100644 --- a/src/plugins/simulator/xplane/xswiftbustrafficproxy.h +++ b/src/plugins/simulator/xplane/xswiftbustrafficproxy.h @@ -16,6 +16,7 @@ #include "blackmisc/aviation/aircraftparts.h" #include "blackmisc/aviation/callsign.h" #include "blackmisc/geo/elevationplane.h" +#include "blackmisc/logcategorylist.h" #include #include @@ -173,6 +174,9 @@ namespace BlackSimPlugin return s; } + //! Log. categories + static const BlackMisc::CLogCategoryList &getLogCategories(); + //! Constructor CXSwiftBusTrafficProxy(QDBusConnection &connection, QObject *parent = nullptr, bool dummy = false);