Merge pull request #2167 from DonLakeFlyer/Missions

View tweaks

src/FlightDisplay/FlightDisplayView.qml

@@ -84,11 +84,6 @@ Item {
 
     FlightDisplayViewController { id: _controller }
 
-    MissionController {
-        id: _missionController
-        Component.onCompleted: start(false /* editMode */)
-    }
-
     function reloadContents() {
         if(_flightVideo) {
             _flightVideo.visible = false

src/FlightDisplay/FlightDisplayViewMap.qml

@@ -54,6 +54,11 @@ FlightMap {
         }
     }
 
+    MissionController {
+        id: _missionController
+        Component.onCompleted: start(false /* editMode */)
+    }
+
     // Home position
     MissionItemIndicator {
         label:          "H"

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);

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