diff --git a/src/Vehicle/MultiVehicleManager.cc b/src/Vehicle/MultiVehicleManager.cc index bdfb8ca3a3fbf42841b9c3d0808c3f6ea447c3a6..6ba5ac765c6e99955207cb901ca5c23d8a668f6c 100644 --- a/src/Vehicle/MultiVehicleManager.cc +++ b/src/Vehicle/MultiVehicleManager.cc @@ -30,6 +30,8 @@ #include "UAS.h" #include "QGCApplication.h" +QGC_LOGGING_CATEGORY(MultiVehicleManagerLog, "MultiVehicleManagerLog") + MultiVehicleManager::MultiVehicleManager(QGCApplication* app) : QGCTool(app) , _activeVehicleAvailable(false) @@ -97,6 +99,8 @@ bool MultiVehicleManager::notifyHeartbeatInfo(LinkInterface* link, int vehicleId /// and all other right things happen when the Vehicle goes away. void MultiVehicleManager::_deleteVehiclePhase1(Vehicle* vehicle) { + qCDebug(MultiVehicleManagerLog) << "_deleteVehiclePhase1"; + _vehicleBeingDeleted = vehicle; // Remove from map @@ -133,6 +137,8 @@ void MultiVehicleManager::_deleteVehiclePhase1(Vehicle* vehicle) void MultiVehicleManager::_deleteVehiclePhase2 (void) { + qCDebug(MultiVehicleManagerLog) << "_deleteVehiclePhase2"; + /// Qml has been notified of vehicle about to go away and should be disconnected from it by now. /// This means we can now clear the active vehicle property and delete the Vehicle for real. @@ -157,6 +163,8 @@ void MultiVehicleManager::_deleteVehiclePhase2 (void) void MultiVehicleManager::setActiveVehicle(Vehicle* vehicle) { + qCDebug(MultiVehicleManagerLog) << "setActiveVehicle" << vehicle; + if (vehicle != _activeVehicle) { if (_activeVehicle) { _activeVehicle->setActive(false); @@ -180,6 +188,8 @@ void MultiVehicleManager::setActiveVehicle(Vehicle* vehicle) void MultiVehicleManager::_setActiveVehiclePhase2(void) { + qCDebug(MultiVehicleManagerLog) << "_setActiveVehiclePhase2"; + // Now we signal the new active vehicle _activeVehicle = _vehicleBeingSetActive; emit activeVehicleChanged(_activeVehicle); diff --git a/src/Vehicle/MultiVehicleManager.h b/src/Vehicle/MultiVehicleManager.h index b24cd0c28d21e1495cc8e79cfb39f902e85c8f9c..b12c200248f1f312a258dcd91f37cadbee84e606 100644 --- a/src/Vehicle/MultiVehicleManager.h +++ b/src/Vehicle/MultiVehicleManager.h @@ -31,6 +31,7 @@ #include "QGCMAVLink.h" #include "QmlObjectListModel.h" #include "QGCToolbox.h" +#include "QGCLoggingCategory.h" class FirmwarePluginManager; class AutoPilotPluginManager; @@ -38,6 +39,8 @@ class JoystickManager; class QGCApplication; class MAVLinkProtocol; +Q_DECLARE_LOGGING_CATEGORY(MultiVehicleManagerLog) + class MultiVehicleManager : public QGCTool { Q_OBJECT