-
Notifications
You must be signed in to change notification settings - Fork 3.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
43504cb
commit d32d5f4
Showing
20 changed files
with
660 additions
and
199 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,252 @@ | ||
| /**************************************************************************** | ||
| * | ||
| * (c) 2009-2020 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> | ||
| * | ||
| * QGroundControl is licensed according to the terms in the file | ||
| * COPYING.md in the root of the source code directory. | ||
| * | ||
| ****************************************************************************/ | ||
|
|
||
| import QtQuick | ||
| import QtQuick.Layouts | ||
|
|
||
| import QGroundControl | ||
| import QGroundControl.FactSystem | ||
| import QGroundControl.FactControls | ||
| import QGroundControl.Controls | ||
| import QGroundControl.FlightDisplay | ||
| import QGroundControl.FlightMap | ||
| import QGroundControl.Palette | ||
| import QGroundControl.ScreenTools | ||
|
|
||
|
|
||
| Rectangle { | ||
| id: topRightPanel | ||
| width: contentWidth | ||
| height: Math.max(contentHeight, minimumHeight) | ||
| color: qgcPal.toolbarBackground | ||
| radius: ScreenTools.defaultFontPixelHeight / 2 | ||
| visible: !QGroundControl.videoManager.fullScreen && _multipleVehicles && _settingEnableMVPanel | ||
| clip: true | ||
|
|
||
| property bool _settingEnableMVPanel: QGroundControl.settingsManager.appSettings.enableMultiVehiclePanel.value | ||
| property bool _multipleVehicles: QGroundControl.multiVehicleManager.vehicles.count > 1 | ||
| property var vehicles: QGroundControl.multiVehicleManager.vehicles | ||
| property var selectedVehicles: QGroundControl.multiVehicleManager.selectedVehicles | ||
| property real contentWidth: Math.max( | ||
| multiVehicleList.implicitWidth, | ||
| swipeViewContainer.implicitWidth | ||
| ) + ScreenTools.defaultFontPixelHeight | ||
| property real contentHeight: Math.min( | ||
| maximumHeight, | ||
| topRightPanelColumnLayout.implicitHeight + topRightPanelColumnLayout.spacing * ( topRightPanelColumnLayout.children.length - 1) | ||
| ) | ||
| property real minimumHeight: selectedVehiclesLabel.height + swipeViewContainer.height | ||
| property real maximumHeight | ||
|
|
||
| QGCPalette { id: qgcPal } | ||
|
|
||
| ColumnLayout { | ||
| id: topRightPanelColumnLayout | ||
| anchors.fill: parent | ||
| anchors.margins: ScreenTools.defaultFontPixelHeight / 2 | ||
| spacing: ScreenTools.defaultFontPixelHeight / 2 | ||
|
|
||
| QGCLabel { | ||
| id: selectedVehiclesLabel | ||
| text: { | ||
| let ids = Array.from({length: selectedVehicles.count}, (_, i) => | ||
| selectedVehicles.get(i).id | ||
| ).sort((a, b) => a - b) | ||
| .join(", ") | ||
| return qsTr("Selected: ") + ids | ||
| } | ||
| } | ||
|
|
||
| MultiVehicleList { | ||
| id: multiVehicleList | ||
| Layout.fillWidth: true | ||
| Layout.fillHeight: true | ||
| implicitHeight: multiVehicleList.innerColumnHeight * vehicles.count - _margins * 3 | ||
|
|
||
| Rectangle { | ||
| anchors.fill: parent | ||
| visible: topRightPanel.height === maximumHeight | ||
|
|
||
| Rectangle { | ||
| anchors.left: parent.left | ||
| anchors.right: parent.right | ||
| anchors.top: parent.top | ||
| anchors.margins: 0 | ||
| height: 1 | ||
| color: QGroundControl.globalPalette.groupBorder | ||
| } | ||
|
|
||
| gradient: Gradient { | ||
| orientation: Gradient.Vertical | ||
| GradientStop { position: 0.00; color: topRightPanel.color } | ||
| GradientStop { position: 0.05; color: "transparent" } | ||
|
|
||
| GradientStop { position: 0.95; color: "transparent" } | ||
| GradientStop { position: 1.00; color: topRightPanel.color } | ||
| } | ||
|
|
||
| Rectangle { | ||
| anchors.left: parent.left | ||
| anchors.right: parent.right | ||
| anchors.bottom: parent.bottom | ||
| anchors.margins: 0 | ||
| height: 1 | ||
| color: QGroundControl.globalPalette.groupBorder | ||
| } | ||
| } | ||
|
|
||
| } | ||
|
|
||
| Rectangle { | ||
| id: swipeViewContainer | ||
| Layout.fillWidth: true | ||
| implicitHeight: swipePages.implicitHeight | ||
| implicitWidth: swipePages.implicitWidth | ||
| color: "transparent" | ||
|
|
||
| QGCSwipeView { | ||
| id: swipePages | ||
| anchors.fill: parent | ||
| spacing: ScreenTools.defaultFontPixelHeight | ||
| implicitHeight: Math.max(buttonsPage.implicitHeight, photoVideoPage.implicitHeight) | ||
| implicitWidth: Math.max(buttonsPage.implicitWidth, photoVideoPage.implicitWidth) | ||
|
|
||
| MvPanelPage { | ||
| id: buttonsPage | ||
| implicitHeight: buttonsColumnLayout.implicitHeight + ScreenTools.defaultFontPixelHeight * 2 | ||
| implicitWidth: buttonsColumnLayout.implicitWidth + ScreenTools.defaultFontPixelHeight * 2 | ||
|
|
||
| ColumnLayout { | ||
| id: buttonsColumnLayout | ||
| anchors.right: parent.right | ||
| anchors.left: parent.left | ||
| anchors.verticalCenter: parent.verticalCenter | ||
| spacing: ScreenTools.defaultFontPixelHeight / 2 | ||
| implicitHeight: Math.max(selectionRowLayout.height, actionRowLayout.height) + ScreenTools.defaultFontPixelHeight * 2 | ||
| implicitWidth: Math.max(selectionRowLayout.width, actionRowLayout.width) + ScreenTools.defaultFontPixelHeight * 4 | ||
|
|
||
| QGCLabel { | ||
| text: qsTr("Multi Vehicle Selection") | ||
| Layout.alignment: Qt.AlignHCenter | ||
| } | ||
|
|
||
| RowLayout { | ||
| id: selectionRowLayout | ||
| Layout.alignment: Qt.AlignHCenter | ||
|
|
||
| QGCButton { | ||
| text: qsTr("Select All") | ||
| enabled: multiVehicleList.selectedVehicles && multiVehicleList.selectedVehicles.count !== QGroundControl.multiVehicleManager.vehicles.count | ||
| onClicked: multiVehicleList.selectAll() | ||
| } | ||
|
|
||
| QGCButton { | ||
| text: qsTr("Deselect All") | ||
| enabled: multiVehicleList.selectedVehicles && multiVehicleList.selectedVehicles.count > 0 | ||
| onClicked: multiVehicleList.deselectAll() | ||
| } | ||
|
|
||
| } | ||
|
|
||
|
|
||
| QGCLabel { | ||
| text: qsTr("Multi Vehicle Actions") | ||
| Layout.alignment: Qt.AlignHCenter | ||
| } | ||
|
|
||
| RowLayout { | ||
| id: actionRowLayout | ||
| Layout.alignment: Qt.AlignHCenter | ||
|
|
||
| QGCButton { | ||
| text: qsTr("Arm") | ||
| enabled: multiVehicleList.armAvailable() | ||
| onClicked: _guidedController.confirmAction(_guidedController.actionMVArm) | ||
| Layout.preferredWidth: ScreenTools.defaultFontPixelHeight * 2.75 | ||
| leftPadding: 0 | ||
| rightPadding: 0 | ||
| } | ||
|
|
||
| QGCButton { | ||
| text: qsTr("Disarm") | ||
| enabled: multiVehicleList.disarmAvailable() | ||
| onClicked: _guidedController.confirmAction(_guidedController.actionMVDisarm) | ||
| Layout.preferredWidth: ScreenTools.defaultFontPixelHeight * 2.75 | ||
| leftPadding: 0 | ||
| rightPadding: 0 | ||
| } | ||
|
|
||
| QGCButton { | ||
| text: qsTr("Start") | ||
| enabled: multiVehicleList.startAvailable() | ||
| onClicked: _guidedController.confirmAction(_guidedController.actionMVStartMission) | ||
| Layout.preferredWidth: ScreenTools.defaultFontPixelHeight * 2.75 | ||
| leftPadding: 0 | ||
| rightPadding: 0 | ||
| } | ||
|
|
||
| QGCButton { | ||
| text: qsTr("Pause") | ||
| enabled: multiVehicleList.pauseAvailable() | ||
| onClicked: _guidedController.confirmAction(_guidedController.actionMVPause) | ||
| Layout.preferredWidth: ScreenTools.defaultFontPixelHeight * 2.75 | ||
| leftPadding: 0 | ||
| rightPadding: 0 | ||
| } | ||
| } | ||
| } | ||
| } // Page 1 | ||
|
|
||
| MvPanelPage { | ||
|
|
||
| id: photoVideoPage | ||
| implicitHeight: photoVideoControlLoader.implicitHeight + ScreenTools.defaultFontPixelHeight * 2 | ||
| implicitWidth: photoVideoControlLoader.implicitWidth + ScreenTools.defaultFontPixelHeight * 2 | ||
|
|
||
| // We use a Loader to load the photoVideoControlComponent only when the active vehicle is not null | ||
| // This make it easier to implement PhotoVideoControl without having to check for the mavlink camera | ||
| // to be null all over the place | ||
|
|
||
| Loader { | ||
| id: photoVideoControlLoader | ||
| anchors.horizontalCenter: parent.horizontalCenter | ||
| sourceComponent: globals.activeVehicle ? photoVideoControlComponent : undefined | ||
|
|
||
| property real rightEdgeCenterInset: visible ? parent.width - x : 0 | ||
|
|
||
| Component { | ||
| id: photoVideoControlComponent | ||
|
|
||
| PhotoVideoControl { | ||
| } | ||
| } | ||
| } | ||
| } // Page 2 | ||
| } // QGCSwipeView | ||
|
|
||
| QGCPageIndicator { | ||
| id: pageIndicator | ||
| count: swipePages.count | ||
| currentIndex: swipePages.currentIndex | ||
| anchors.bottom: parent.bottom | ||
| anchors.horizontalCenter: parent.horizontalCenter | ||
| anchors.margins: ScreenTools.defaultFontPixelHeight / 4 | ||
|
|
||
| delegate: Rectangle { | ||
| height: ScreenTools.defaultFontPixelHeight / 2 | ||
| width: height | ||
| radius: width / 2 | ||
| color: model.index === pageIndicator.currentIndex ? qgcPal.text : qgcPal.button | ||
| opacity: model.index === pageIndicator.currentIndex ? 0.9 : 0.3 | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.