zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Pull multiVehicleManager from QGroundControl

QGC4.4
Don Gagne 9 years ago
parent
dcd55081b4
commit
f3f54cd574
18 changed files with 51 additions and 51 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/FlightDisplay/FlightDisplayView.qml
  2. 4
      src/FlightDisplay/FlightDisplayViewMap.qml
  3. 2
      src/FlightDisplay/FlightDisplayViewVideo.qml
  4. 4
      src/FlightDisplay/FlightDisplayViewWidgets.qml
  5. 2
      src/FlightMap/Widgets/QGCInstrumentWidget.qml
  6. 8
      src/MissionEditor/MissionEditor.qml
  7. 1
      src/QGCApplication.cc
  8. 1
      src/QGCQuickWidget.cc
  9. 2
      src/QmlControls/ParameterEditor.qml
  10. 2
      src/VehicleSetup/FirmwareUpgrade.qml
  11. 3
      src/VehicleSetup/JoystickConfig.qml
  12. 24
      src/VehicleSetup/PX4FlowSensor.qml
  13. 18
      src/VehicleSetup/SetupView.qml
  14. 5
      src/VehicleSetup/VehicleSummary.qml
  15. 4
      src/ui/MainWindowInner.qml
  16. 4
      src/ui/preferences/MavlinkSettings.qml
  17. 2
      src/ui/toolbar/MainToolBar.qml
  18. 12
      src/ui/toolbar/MainToolBarIndicators.qml

4
src/FlightDisplay/FlightDisplayView.qml
Unescape View File

@ -47,7 +47,7 @@ QGCView {
QGCPalette { id: qgcPal; colorGroupEnabled: enabled } QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
property real availableHeight: parent.height property real availableHeight: parent.height
property var _activeVehicle: multiVehicleManager.activeVehicle property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
property bool _mainIsMap: QGroundControl.loadBoolGlobalSetting(_mainIsMapKey, true) property bool _mainIsMap: QGroundControl.loadBoolGlobalSetting(_mainIsMapKey, true)
@ -121,7 +121,7 @@ QGCView {
} }
Connections { Connections {
target: multiVehicleManager target: QGroundControl.multiVehicleManager
onActiveVehicleChanged: px4JoystickCheck() onActiveVehicleChanged: px4JoystickCheck()
} }

4
src/FlightDisplay/FlightDisplayViewMap.qml
Unescape View File

@ -72,7 +72,7 @@ FlightMap {
// Add trajectory points to the map // Add trajectory points to the map
MapItemView { MapItemView {
model: _mainIsMap ? multiVehicleManager.activeVehicle ? multiVehicleManager.activeVehicle.trajectoryPoints : 0 : 0 model: _mainIsMap ? _activeVehicle ? _activeVehicle.trajectoryPoints : 0 : 0
delegate: delegate:
MapPolyline { MapPolyline {
line.width: 3 line.width: 3
@ -87,7 +87,7 @@ FlightMap {
// Add the vehicles to the map // Add the vehicles to the map
MapItemView { MapItemView {
model: multiVehicleManager.vehicles model: QGroundControl.multiVehicleManager.vehicles
delegate: delegate:
VehicleMapItem { VehicleMapItem {
vehicle: object vehicle: object

2
src/FlightDisplay/FlightDisplayViewVideo.qml
Unescape View File

@ -63,7 +63,7 @@ Item {
pitchAngle: _pitch pitchAngle: _pitch
width: ScreenTools.defaultFontPixelSize * (30) width: ScreenTools.defaultFontPixelSize * (30)
height: ScreenTools.defaultFontPixelSize * (30) height: ScreenTools.defaultFontPixelSize * (30)
active: multiVehicleManager.activeVehicleAvailable active: QGroundControl.multiVehicleManager.activeVehicleAvailable
z: QGroundControl.zOrderWidgets z: QGroundControl.zOrderWidgets
} }
*/ */

4
src/FlightDisplay/FlightDisplayViewWidgets.qml
Unescape View File

@ -68,7 +68,7 @@ Item {
width: parent.width width: parent.width
Repeater { Repeater {
model: multiVehicleManager.vehicles model: QGroundControl.multiVehicleManager.vehicles
delegate: delegate:
QGCLabel { QGCLabel {
@ -180,7 +180,7 @@ Item {
text: "Center map on Vehicle" text: "Center map on Vehicle"
enabled: _activeVehicle && !followVehicleCheckBox.checked enabled: _activeVehicle && !followVehicleCheckBox.checked
property var activeVehicle: multiVehicleManager.activeVehicle property var activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
onClicked: { onClicked: {
_dropButtonsExclusiveGroup.current = null _dropButtonsExclusiveGroup.current = null

2
src/FlightMap/Widgets/QGCInstrumentWidget.qml
Unescape View File

@ -104,7 +104,7 @@ Item {
opacity: 0.5 opacity: 0.5
width: attitudeWidget.width * 0.15 width: attitudeWidget.width * 0.15
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
visible: QGroundControl.multiVehicleManager.activeVehicle visible: _activeVehicle
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent

8
src/MissionEditor/MissionEditor.qml
Unescape View File

@ -51,7 +51,7 @@ QGCView {
readonly property int _decimalPlaces: 8 readonly property int _decimalPlaces: 8
readonly property real _horizontalMargin: ScreenTools.defaultFontPixelWidth / 2 readonly property real _horizontalMargin: ScreenTools.defaultFontPixelWidth / 2
readonly property real _margin: ScreenTools.defaultFontPixelHeight / 2 readonly property real _margin: ScreenTools.defaultFontPixelHeight / 2
readonly property var _activeVehicle: multiVehicleManager.activeVehicle readonly property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
readonly property real _editFieldWidth: ScreenTools.defaultFontPixelWidth * 16 readonly property real _editFieldWidth: ScreenTools.defaultFontPixelWidth * 16
readonly property real _rightPanelWidth: Math.min(parent.width / 3, ScreenTools.defaultFontPixelWidth * 30) readonly property real _rightPanelWidth: Math.min(parent.width / 3, ScreenTools.defaultFontPixelWidth * 30)
readonly property real _rightPanelOpacity: 0.8 readonly property real _rightPanelOpacity: 0.8
@ -68,7 +68,7 @@ QGCView {
onActiveVehiclePositionChanged: updateMapToVehiclePosition() onActiveVehiclePositionChanged: updateMapToVehiclePosition()
Connections { Connections {
target: multiVehicleManager target: QGroundControl.multiVehicleManager
onActiveVehicleChanged: { onActiveVehicleChanged: {
// When the active vehicle changes we need to allow the first vehicle position to move the map again // When the active vehicle changes we need to allow the first vehicle position to move the map again
@ -443,7 +443,7 @@ QGCView {
// Add the vehicles to the map // Add the vehicles to the map
MapItemView { MapItemView {
model: multiVehicleManager.vehicles model: QGroundControl.multiVehicleManager.vehicles
delegate: delegate:
VehicleMapItem { VehicleMapItem {
vehicle: object vehicle: object
@ -596,7 +596,7 @@ QGCView {
text: "Vehicle" text: "Vehicle"
enabled: activeVehicle && activeVehicle.latitude != 0 && activeVehicle.longitude != 0 enabled: activeVehicle && activeVehicle.latitude != 0 && activeVehicle.longitude != 0
property var activeVehicle: multiVehicleManager.activeVehicle property var activeVehicle: _activeVehicle
onClicked: { onClicked: {
centerMapButton.hideDropDown() centerMapButton.hideDropDown()

1
src/QGCApplication.cc
Unescape View File

@ -483,7 +483,6 @@ bool QGCApplication::_initForNormalAppBoot(void)
#ifdef __mobile__ #ifdef __mobile__
_qmlAppEngine = new QQmlApplicationEngine(this); _qmlAppEngine = new QQmlApplicationEngine(this);
_qmlAppEngine->addImportPath("qrc:/qml"); _qmlAppEngine->addImportPath("qrc:/qml");
_qmlAppEngine->rootContext()->setContextProperty("multiVehicleManager", toolbox()->multiVehicleManager());
_qmlAppEngine->rootContext()->setContextProperty("joystickManager", toolbox()->joystickManager()); _qmlAppEngine->rootContext()->setContextProperty("joystickManager", toolbox()->joystickManager());
_qmlAppEngine->load(QUrl(QStringLiteral("qrc:/qml/MainWindowNative.qml"))); _qmlAppEngine->load(QUrl(QStringLiteral("qrc:/qml/MainWindowNative.qml")));
#else #else

1
src/QGCQuickWidget.cc
Unescape View File

@ -41,7 +41,6 @@ QGCQuickWidget::QGCQuickWidget(QWidget* parent) :
{ {
setAttribute(Qt::WA_AcceptTouchEvents); setAttribute(Qt::WA_AcceptTouchEvents);
rootContext()->engine()->addImportPath("qrc:/qml"); rootContext()->engine()->addImportPath("qrc:/qml");
rootContext()->setContextProperty("multiVehicleManager", qgcApp()->toolbox()->multiVehicleManager());
rootContext()->setContextProperty("joystickManager", qgcApp()->toolbox()->joystickManager()); rootContext()->setContextProperty("joystickManager", qgcApp()->toolbox()->joystickManager());
} }

2
src/QmlControls/ParameterEditor.qml
Unescape View File

@ -48,7 +48,7 @@ QGCView {
property bool _searchFilter: false ///< true: showing results of search property bool _searchFilter: false ///< true: showing results of search
property var _searchResults ///< List of parameter names from search results property var _searchResults ///< List of parameter names from search results
property string _currentGroup: "" property string _currentGroup: ""
property bool _showRCToParam: !ScreenTools.isMobile && multiVehicleManager.activeVehicle.px4Firmware property bool _showRCToParam: !ScreenTools.isMobile && QGroundControl.multiVehicleManager.activeVehicle.px4Firmware
ParameterEditorController { ParameterEditorController {
id: controller; id: controller;

2
src/VehicleSetup/FirmwareUpgrade.qml
Unescape View File

@ -102,7 +102,7 @@ QGCView {
// Board was found right away, so something is already plugged in before we've started upgrade // Board was found right away, so something is already plugged in before we've started upgrade
statusTextArea.append(qgcUnplugText1) statusTextArea.append(qgcUnplugText1)
statusTextArea.append(qgcUnplugText2) statusTextArea.append(qgcUnplugText2)
multiVehicleManager.activeVehicle.autoDisconnect = true QGroundControl.multiVehicleManager.activeVehicle.autoDisconnect = true
} else { } else {
// We end up here when we detect a board plugged in after we've started upgrade // We end up here when we detect a board plugged in after we've started upgrade
statusTextArea.append(highlightPrefix + "Found device" + highlightSuffix + ": " + controller.boardType) statusTextArea.append(highlightPrefix + "Found device" + highlightSuffix + ": " + controller.boardType)

3
src/VehicleSetup/JoystickConfig.qml
Unescape View File

@ -25,6 +25,7 @@ import QtQuick 2.2
import QtQuick.Controls 1.2 import QtQuick.Controls 1.2
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.2
import QGroundControl 1.0
import QGroundControl.Palette 1.0 import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0 import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0 import QGroundControl.ScreenTools 1.0
@ -43,7 +44,7 @@ QGCView {
property bool controllerCompleted: false property bool controllerCompleted: false
property bool controllerAndViewReady: false property bool controllerAndViewReady: false
property var _activeVehicle: multiVehicleManager.activeVehicle property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
property var _activeJoystick: joystickManager.activeJoystick property var _activeJoystick: joystickManager.activeJoystick
JoystickConfigController { JoystickConfigController {

24
src/VehicleSetup/PX4FlowSensor.qml
Unescape View File

@ -21,24 +21,24 @@
======================================================================*/ ======================================================================*/
import QtQuick 2.3 import QtQuick 2.3
import QtQuick.Controls 1.2 import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.2 import QtQuick.Controls.Styles 1.2
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.2
import QGroundControl.Controls 1.0 import QGroundControl 1.0
import QGroundControl.FactSystem 1.0 import QGroundControl.Controls 1.0
import QGroundControl.FactControls 1.0 import QGroundControl.FactSystem 1.0
import QGroundControl.Palette 1.0 import QGroundControl.FactControls 1.0
import QGroundControl.Controllers 1.0 import QGroundControl.Palette 1.0
import QGroundControl.ScreenTools 1.0 import QGroundControl.Controllers 1.0
import QGroundControl.MultiVehicleManager 1.0 import QGroundControl.ScreenTools 1.0
QGCView { QGCView {
id: qgcView id: qgcView
viewPanel: panel viewPanel: panel
property var _activeVehicle: multiVehicleManager.activeVehicle property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
QGCPalette { id: qgcPal; colorGroupEnabled: panel.enabled } QGCPalette { id: qgcPal; colorGroupEnabled: panel.enabled }

18
src/VehicleSetup/SetupView.qml
Unescape View File

@ -50,17 +50,17 @@ Rectangle {
readonly property string _armedVehicleText: "This operation cannot be performed while vehicle is armed." readonly property string _armedVehicleText: "This operation cannot be performed while vehicle is armed."
property string _messagePanelText: "missing message panel text" property string _messagePanelText: "missing message panel text"
property bool _fullParameterVehicleAvailable: multiVehicleManager.parameterReadyVehicleAvailable && !multiVehicleManager.activeVehicle.missingParameters property bool _fullParameterVehicleAvailable: QGroundControl.multiVehicleManager.parameterReadyVehicleAvailable && !QGroundControl.multiVehicleManager.activeVehicle.missingParameters
function showSummaryPanel() function showSummaryPanel()
{ {
if (_fullParameterVehicleAvailable) { if (_fullParameterVehicleAvailable) {
if (multiVehicleManager.activeVehicle.autopilot.vehicleComponents.length == 0) { if (QGroundControl.multiVehicleManager.activeVehicle.autopilot.vehicleComponents.length == 0) {
panelLoader.sourceComponent = noComponentsVehicleSummaryComponent panelLoader.sourceComponent = noComponentsVehicleSummaryComponent
} else { } else {
panelLoader.source = "VehicleSummary.qml"; panelLoader.source = "VehicleSummary.qml";
} }
} else if (multiVehicleManager.parameterReadyVehicleAvailable) { } else if (QGroundControl.multiVehicleManager.parameterReadyVehicleAvailable) {
panelLoader.sourceComponent = missingParametersVehicleSummaryComponent panelLoader.sourceComponent = missingParametersVehicleSummaryComponent
} else { } else {
panelLoader.sourceComponent = disconnectedVehicleSummaryComponent panelLoader.sourceComponent = disconnectedVehicleSummaryComponent
@ -70,7 +70,7 @@ Rectangle {
function showFirmwarePanel() function showFirmwarePanel()
{ {
if (!ScreenTools.isMobile) { if (!ScreenTools.isMobile) {
if (multiVehicleManager.activeVehicleAvailable && multiVehicleManager.activeVehicle.armed) { if (QGroundControl.multiVehicleManager.activeVehicleAvailable && QGroundControl.multiVehicleManager.activeVehicle.armed) {
_messagePanelText = _armedVehicleText _messagePanelText = _armedVehicleText
panelLoader.sourceComponent = messagePanelComponent panelLoader.sourceComponent = messagePanelComponent
} else { } else {
@ -81,7 +81,7 @@ Rectangle {
function showJoystickPanel() function showJoystickPanel()
{ {
if (multiVehicleManager.activeVehicleAvailable && multiVehicleManager.activeVehicle.armed) { if (QGroundControl.multiVehicleManager.activeVehicleAvailable && QGroundControl.multiVehicleManager.activeVehicle.armed) {
_messagePanelText = _armedVehicleText _messagePanelText = _armedVehicleText
panelLoader.sourceComponent = messagePanelComponent panelLoader.sourceComponent = messagePanelComponent
} else { } else {
@ -101,7 +101,7 @@ Rectangle {
function showVehicleComponentPanel(vehicleComponent) function showVehicleComponentPanel(vehicleComponent)
{ {
if (multiVehicleManager.activeVehicle.armed && !vehicleComponent.allowSetupWhileArmed) { if (QGroundControl.multiVehicleManager.activeVehicle.armed && !vehicleComponent.allowSetupWhileArmed) {
_messagePanelText = _armedVehicleText _messagePanelText = _armedVehicleText
panelLoader.sourceComponent = messagePanelComponent panelLoader.sourceComponent = messagePanelComponent
} else { } else {
@ -117,7 +117,7 @@ Rectangle {
Component.onCompleted: showSummaryPanel() Component.onCompleted: showSummaryPanel()
Connections { Connections {
target: multiVehicleManager target: QGroundControl.multiVehicleManager
onParameterReadyVehicleAvailableChanged: { onParameterReadyVehicleAvailableChanged: {
if (parameterReadyVehicleAvailable || summaryButton.checked || setupButtonGroup.current != firmwareButton) { if (parameterReadyVehicleAvailable || summaryButton.checked || setupButtonGroup.current != firmwareButton) {
@ -295,7 +295,7 @@ Rectangle {
Repeater { Repeater {
id: componentRepeater id: componentRepeater
model: _fullParameterVehicleAvailable ? multiVehicleManager.activeVehicle.autopilot.vehicleComponents : 0 model: _fullParameterVehicleAvailable ? QGroundControl.multiVehicleManager.activeVehicle.autopilot.vehicleComponents : 0
SubMenuButton { SubMenuButton {
imageResource: modelData.iconResource imageResource: modelData.iconResource
@ -313,7 +313,7 @@ Rectangle {
SubMenuButton { SubMenuButton {
setupIndicator: false setupIndicator: false
exclusiveGroup: setupButtonGroup exclusiveGroup: setupButtonGroup
visible: multiVehicleManager.parameterReadyVehicleAvailable visible: QGroundControl.multiVehicleManager.parameterReadyVehicleAvailable
text: "Parameters" text: "Parameters"
onClicked: showParametersPanel() onClicked: showParametersPanel()

5
src/VehicleSetup/VehicleSummary.qml
Unescape View File

@ -25,6 +25,7 @@ import QtQuick 2.2
import QtQuick.Controls 1.2 import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.2 import QtQuick.Controls.Styles 1.2
import QGroundControl 1.0
import QGroundControl.FactSystem 1.0 import QGroundControl.FactSystem 1.0
import QGroundControl.Controls 1.0 import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0 import QGroundControl.ScreenTools 1.0
@ -95,7 +96,7 @@ Rectangle {
text: setupComplete ? text: setupComplete ?
"Below you will find a summary of the settings for your vehicle. To the left are the setup menus for each component." : "Below you will find a summary of the settings for your vehicle. To the left are the setup menus for each component." :
"WARNING: Your vehicle requires setup prior to flight. Please resolve the items marked in red using the menu on the left." "WARNING: Your vehicle requires setup prior to flight. Please resolve the items marked in red using the menu on the left."
property bool setupComplete: multiVehicleManager.activeVehicle ? multiVehicleManager.activeVehicle.autopilot.setupComplete : false property bool setupComplete: QGroundControl.multiVehicleManager.activeVehicle ? QGroundControl.multiVehicleManager.activeVehicle.autopilot.setupComplete : false
} }
Flow { Flow {
@ -104,7 +105,7 @@ Rectangle {
spacing: _summaryBoxSpace spacing: _summaryBoxSpace
Repeater { Repeater {
model: multiVehicleManager.activeVehicle ? multiVehicleManager.activeVehicle.autopilot.vehicleComponents : undefined model: QGroundControl.multiVehicleManager.activeVehicle ? QGroundControl.multiVehicleManager.activeVehicle.autopilot.vehicleComponents : undefined
// Outer summary item rectangle // Outer summary item rectangle
Rectangle { Rectangle {

4
src/ui/MainWindowInner.qml
Unescape View File

@ -53,7 +53,7 @@ Item {
property var gcsPosition: QtPositioning.coordinate() // Starts as invalid coordinate property var gcsPosition: QtPositioning.coordinate() // Starts as invalid coordinate
property var currentPopUp: null property var currentPopUp: null
property real currentCenterX: 0 property real currentCenterX: 0
property var activeVehicle: multiVehicleManager.activeVehicle property var activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
property string formatedMessage: activeVehicle ? activeVehicle.formatedMessage : "" property string formatedMessage: activeVehicle ? activeVehicle.formatedMessage : ""
function showFlyView() { function showFlyView() {
@ -232,7 +232,7 @@ Item {
if(currentPopUp) { if(currentPopUp) {
currentPopUp.close() currentPopUp.close()
} }
if(multiVehicleManager.activeVehicleAvailable) { if(QGroundControl.multiVehicleManager.activeVehicleAvailable) {
messageText.text = activeVehicle.formatedMessages messageText.text = activeVehicle.formatedMessages
//-- Hack to scroll to last message //-- Hack to scroll to last message
for (var i = 0; i < activeVehicle.messageCount; i++) for (var i = 0; i < activeVehicle.messageCount; i++)

4
src/ui/preferences/MavlinkSettings.qml
Unescape View File

@ -88,9 +88,9 @@ Rectangle {
//-- Mavlink Heartbeats //-- Mavlink Heartbeats
QGCCheckBox { QGCCheckBox {
text: "Emit heartbeat" text: "Emit heartbeat"
checked: multiVehicleManager.gcsHeartBeatEnabled checked: QGroundControl.multiVehicleManager.gcsHeartBeatEnabled
onClicked: { onClicked: {
multiVehicleManager.gcsHeartBeatEnabled = checked QGroundControl.multiVehicleManager.gcsHeartBeatEnabled = checked
} }
} }
//----------------------------------------------------------------- //-----------------------------------------------------------------

2
src/ui/toolbar/MainToolBar.qml
Unescape View File

@ -45,7 +45,7 @@ Rectangle {
QGCPalette { id: qgcPal; colorGroupEnabled: true } QGCPalette { id: qgcPal; colorGroupEnabled: true }
property var activeVehicle: multiVehicleManager.activeVehicle property var activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
property var mainWindow: null property var mainWindow: null
property bool isMessageImportant: activeVehicle ? !activeVehicle.messageTypeNormal && !activeVehicle.messageTypeNone : false property bool isMessageImportant: activeVehicle ? !activeVehicle.messageTypeNormal && !activeVehicle.messageTypeNone : false
property bool isBackgroundDark: true property bool isBackgroundDark: true

12
src/ui/toolbar/MainToolBarIndicators.qml
Unescape View File

@ -322,10 +322,10 @@ Row {
MenuItem { MenuItem {
checkable: true checkable: true
onTriggered: multiVehicleManager.activeVehicle = vehicle onTriggered: QGroundControl.multiVehicleManager.activeVehicle = vehicle
property int vehicleId: Number(text.split(" ")[1]) property int vehicleId: Number(text.split(" ")[1])
property var vehicle: multiVehicleManager.getVehicleById(vehicleId) property var vehicle: QGroundControl.multiVehicleManager.getVehicleById(vehicleId)
} }
} }
@ -339,8 +339,8 @@ Row {
vehicleMenuItems.length = 0 vehicleMenuItems.length = 0
// Add new items // Add new items
for (var i=0; i<multiVehicleManager.vehicles.count; i++) { for (var i=0; i<QGroundControl.multiVehicleManager.vehicles.count; i++) {
var vehicle = multiVehicleManager.vehicles.get(i) var vehicle = QGroundControl.multiVehicleManager.vehicles.get(i)
var menuItem = vehicleMenuItemComponent.createObject(null, { "text": "Vehicle " + vehicle.id }) var menuItem = vehicleMenuItemComponent.createObject(null, { "text": "Vehicle " + vehicle.id })
vehicleMenuItems.push(menuItem) vehicleMenuItems.push(menuItem)
vehicleMenu.insertItem(i, menuItem) vehicleMenu.insertItem(i, menuItem)
@ -350,7 +350,7 @@ Row {
Component.onCompleted: updateVehicleMenu() Component.onCompleted: updateVehicleMenu()
Connections { Connections {
target: multiVehicleManager.vehicles target: QGroundControl.multiVehicleManager.vehicles
onCountChanged: vehicleSelectorButton.updateVehicleMenu() onCountChanged: vehicleSelectorButton.updateVehicleMenu()
} }
} }
@ -422,7 +422,7 @@ Row {
Component.onCompleted: updateFlightModesMenu() Component.onCompleted: updateFlightModesMenu()
Connections { Connections {
target: multiVehicleManager target: QGroundControl.multiVehicleManager
onActiveVehicleChanged: flightModeSelector.updateFlightModesMenu onActiveVehicleChanged: flightModeSelector.updateFlightModesMenu
} }

Write Preview
Loading…
Cancel
Save