Skip to content

Q
qgroundcontrol
Commit dc158d8f authored by Valentin Platzgummer's avatar Valentin Platzgummer
Browse files
Options

merge with remote/master

parent 86426f23
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 25 deletions
src/FlightDisplay/FlightDisplayView.qml
View file @ dc158d8f
...@@ -483,6 +483,20 @@ QGCView { ...@@ -483,6 +483,20 @@ QGCView {
} }
} }
// Item {
// id: theItem
// anchors.right: parent.right
// anchors.bottom: parent.top
// z: 1000
// visible: true
// Text {
// id: theText
// text: qsTr("Hello World!")
// font.pointSize: 40
// }
// }
Row { Row {
id: singleMultiSelector id: singleMultiSelector
anchors.topMargin: ScreenTools.toolbarHeight + _margins anchors.topMargin: ScreenTools.toolbarHeight + _margins
...@@ -510,25 +524,27 @@ QGCView { ...@@ -510,25 +524,27 @@ QGCView {
} }
} }
// FlightDisplayViewWidgets { FlightDisplayViewWidgets {
// id: flightDisplayViewWidgets id: flightDisplayViewWidgets
// z: _panel.z + 4 z: _panel.z + 4
// height: ScreenTools.availableHeight - (singleMultiSelector.visible ? singleMultiSelector.height + _margins : 0) height: ScreenTools.availableHeight - (singleMultiSelector.visible ? singleMultiSelector.height + _margins : 0) - wimaMenu.height
// anchors.left: parent.left anchors.left: parent.left
// anchors.right: altitudeSlider.visible ? altitudeSlider.left : parent.right anchors.right: altitudeSlider.visible ? altitudeSlider.left : parent.right
// anchors.bottom: parent.bottom anchors.top: singleMultiSelector.bottom
// qgcView: root qgcView: root
// useLightColors: isBackgroundDark useLightColors: isBackgroundDark
// missionController: _missionController missionController: _missionController
// visible: singleVehicleView.checked && !QGroundControl.videoManager.fullScreen visible: singleVehicleView.checked && !QGroundControl.videoManager.fullScreen
// } }
FlightDisplayWimaMenu { FlightDisplayWimaMenu {
id: wimaMenu id: wimaMenu
z: _panel.z + 4 z: 1000 //_panel.z + 4
anchors.left: parent.left
anchors.right: altitudeSlider.visible ? altitudeSlider.left : parent.right anchors.right: altitudeSlider.visible ? altitudeSlider.left : parent.right
anchors.bottom: parent.bottom anchors.top: flightDisplayViewWidgets.bottom
visible: true
height: 300
width: 200
} }
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
......
src/FlightDisplay/FlightDisplayWimaMenu.qml
View file @ dc158d8f
...@@ -18,15 +18,9 @@ import QGroundControl.Airmap 1.0 ...@@ -18,15 +18,9 @@ import QGroundControl.Airmap 1.0
Item { Item {
id: _root id: _root
Rectangle { Text {
anchors.top: parent.top id: enableWima
color: "white" text: qsTr("WiMA")
height: 100 font.pointSize: 40
width: 200
QGCCheckBox {
id: enableWima
text: qsTr("WiMA")
}
} }
} }
src/main.cc
View file @ dc158d8f
...@@ -276,6 +276,7 @@ int main(int argc, char *argv[]) ...@@ -276,6 +276,7 @@ int main(int argc, char *argv[])
if (!app->_initForNormalAppBoot()) { if (!app->_initForNormalAppBoot()) {
return -1; return -1;
} }
exitCode = app->exec(); exitCode = app->exec();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment