diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml index 0c5f001a1718abde4cd2be8d1c12bca2b73f4dd2..bffb3730f09a0d92fea277459232c2c2f16f7ea2 100644 --- a/src/FlightDisplay/FlightDisplayView.qml +++ b/src/FlightDisplay/FlightDisplayView.qml @@ -551,8 +551,8 @@ QGCView { z: _panel.z + 4 anchors.left: parent.left anchors.bottom: parent.bottom - anchors.leftMargin: ScreenTools.defaultFontPixelHeight * 0.25 - anchors.bottomMargin: ScreenTools.defaultFontPixelHeight * 0.25 + anchors.leftMargin: ScreenTools.defaultFontPixelWidth + anchors.bottomMargin: ScreenTools.defaultFontPixelWidth wimaController: wimaController diff --git a/src/FlightDisplay/FlightDisplayWimaMenu.qml b/src/FlightDisplay/FlightDisplayWimaMenu.qml index 57811710d4f1c546f27038f5968c3201a81d76a1..4963c44c124abf3520fac45bfe04773a651faeb3 100644 --- a/src/FlightDisplay/FlightDisplayWimaMenu.qml +++ b/src/FlightDisplay/FlightDisplayWimaMenu.qml @@ -1,9 +1,9 @@ import QtQuick 2.3 -import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 import QtLocation 5.3 import QtPositioning 5.3 +import QtQuick.Controls 2.4 import QtQuick.Layouts 1.2 import QGroundControl 1.0 @@ -19,7 +19,7 @@ import QGroundControl.FactControls 1.0 Item { id: _root - height: 700 + height: 600 width: 300 property var wimaController // must be provided by the user @@ -50,8 +50,12 @@ Item { return Qt.formatTime(t, 'hh:mm:ss') } + + QGCPalette { id: qgcPal } + // box containing all items - Rectangle { + Rectangle { // maybe replace with column and remove anchors => dynamic height: + id: mainFrame anchors.left: parent.left anchors.bottom: parent.bottom height: enableWima.enableWimaBoolean ? parent.height : enableWima.height @@ -83,201 +87,201 @@ Item { } } - Column { - id: mainColumn - anchors.top: enableWima.bottom - anchors.left: parent.left - anchors.right: parent.right - anchors.bottom: parent.bottom - anchors.margins: ScreenTools.defaultFontPixelHeight * 0.4 - spacing: ScreenTools.defaultFontPixelHeight * 0.25 - - - SectionHeader { - id: settingsHeader - text: qsTr("Settings") - } - GridLayout { - columns: 2 - rowSpacing: ScreenTools.defaultFontPixelHeight * 0.5 - columnSpacing: ScreenTools.defaultFontPixelHeight * 0.5 - anchors.topMargin: ScreenTools.defaultFontPixelHeight * 0.5 - anchors.left: parent.left - anchors.right: parent.right - visible: settingsHeader.checked - - // Settings - QGCLabel { text: qsTr("Next Waypoint") } - FactTextField { - fact: wimaController.startWaypointIndex - Layout.fillWidth: true - } - - QGCLabel { text: qsTr("Max Waypoints") } - FactTextField { - fact: wimaController.maxWaypointsPerPhase - Layout.fillWidth: true - } - - QGCLabel { text: qsTr("Overlap") } - FactTextField { - fact: wimaController.overlapWaypoints - Layout.fillWidth: true - } - - FactCheckBox { - text: qsTr("Show All") - fact: wimaController.showAllMissionItems - } - - FactCheckBox { - text: qsTr("Show Current") - fact: wimaController.showCurrentMissionItems - } - - } - - SectionHeader{ - id: missionHeader - text: qsTr("Mission") - } - GridLayout { - columns: 2 - rowSpacing: ScreenTools.defaultFontPixelHeight * 0.5 - columnSpacing: ScreenTools.defaultFontPixelHeight * 0.5 - anchors.topMargin: ScreenTools.defaultFontPixelHeight * 0.5 - anchors.left: parent.left - anchors.right: parent.right - visible: missionHeader.checked - - QGCLabel { text: qsTr("Speed") } - FactTextField { - fact: wimaController.flightSpeed - Layout.fillWidth: true - } - - QGCLabel { text: qsTr("Altitude") } - FactTextField { - fact: wimaController.altitude - Layout.fillWidth: true - } - - // Buttons - QGCButton { - id: buttonPreviousMissionPhase - text: qsTr("Reverse") - onClicked: wimaController.previousPhase(); - Layout.fillWidth: true - } - - QGCButton { - id: buttonNextMissionPhase - text: qsTr("Forward") - onClicked: wimaController.nextPhase(); - Layout.fillWidth: true - } - - QGCButton { - id: buttonResetPhase - text: qsTr("Reset Phase") - onClicked: wimaController.resetPhase(); - Layout.fillWidth: true - Layout.rowSpan: 2 - } - - - } - - SectionHeader{ - id: vehicleHeader - text: qsTr("Vehicle") - } - GridLayout { - columns: 2 - rowSpacing: ScreenTools.defaultFontPixelHeight * 0.5 - columnSpacing: ScreenTools.defaultFontPixelHeight * 0.5 - anchors.topMargin: ScreenTools.defaultFontPixelHeight * 0.5 - anchors.left: parent.left - anchors.right: parent.right - visible: vehicleHeader.checked - - QGCButton { - id: buttonUpload - text: qsTr("Upload") - onClicked: wimaController.uploadToVehicle(); - Layout.fillWidth: true - } - - QGCButton { - id: buttonRemoveFromVehicle - text: qsTr("Remove") - onClicked: wimaController.removeFromVehicle(); - Layout.fillWidth: true - } - - QGCButton { - id: buttonSmartRTL - text: qsTr("Smart RTL") - onClicked: initSmartRTL() - Layout.fillWidth: true - } - // placeholder, remove if you add stuff - QGCLabel { text: "" } - - - // progess bar - Rectangle { - id: progressBar - height: 4 - width: _controllerProgressPct * parent.width - color: qgcPal.colorGreen - visible: false - } - - QGCLabel { - id: uploadCompleteText - font.pointSize: ScreenTools.largeFontPointSize - Layout.columnSpan: 2 - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - text: "Done" - visible: false - } - - } - - SectionHeader { - id: statsHeader - text: qsTr("Statistics") - } - GridLayout { - columns: 2 - rowSpacing: ScreenTools.defaultFontPixelHeight * 0.5 - anchors.topMargin: ScreenTools.defaultFontPixelHeight * 0.25 - visible: statsHeader.checked - - QGCLabel { - text: qsTr("Phase Length: ") - wrapMode: Text.WordWrap - font.pointSize: ScreenTools.smallFontPointSize - } - QGCLabel { - text: wimaController.phaseDistance >= 0 ? wimaController.phaseDistance.toFixed(2) + " m": "" - wrapMode: Text.WordWrap - font.pointSize: ScreenTools.smallFontPointSize - } - - QGCLabel { - text: qsTr("Phase Duration: ") - wrapMode: Text.WordWrap - font.pointSize: ScreenTools.smallFontPointSize - } - QGCLabel { - text: wimaController.phaseDuration >= 0 ? getTime(wimaController.phaseDuration) : "" - wrapMode: Text.WordWrap - font.pointSize: ScreenTools.smallFontPointSize - } - } - } + Rectangle { + id: controllerFrame + anchors.top: enableWima.bottom + anchors.left: parent.left + anchors.right: parent.right + anchors.bottom: parent.bottom + anchors.margins: ScreenTools.defaultFontPixelHeight *0.25 + color: qgcPal.window + clip: true + + + ScrollView { + id: scrollView + anchors.fill: parent + + Column { + /*SectionHeader { + id: settingsHeader + text: qsTr("Settings") + }*/ + + GridLayout { + columns: 2 + rowSpacing: ScreenTools.defaultFontPixelHeight * 0.5 + columnSpacing: ScreenTools.defaultFontPixelHeight * 0.5 + visible: settingsHeader.checked + + // Settings + QGCLabel { text: qsTr("Next Waypoint") } + FactTextField { + fact: wimaController.startWaypointIndex + Layout.fillWidth: true + } + + QGCLabel { text: qsTr("Max Waypoints") } + FactTextField { + fact: wimaController.maxWaypointsPerPhase + Layout.fillWidth: true + } + + QGCLabel { text: qsTr("Overlap") } + FactTextField { + fact: wimaController.overlapWaypoints + Layout.fillWidth: true + } + + FactCheckBox { + text: qsTr("Show All") + fact: wimaController.showAllMissionItems + } + + FactCheckBox { + text: qsTr("Show Current") + fact: wimaController.showCurrentMissionItems + } + + } + + /*SectionHeader{ + id: missionHeader + text: qsTr("Mission") + }*/ + GridLayout { + columns: 2 + rowSpacing: ScreenTools.defaultFontPixelHeight * 0.5 + columnSpacing: ScreenTools.defaultFontPixelHeight * 0.5 + visible: missionHeader.checked + + QGCLabel { text: qsTr("Speed") } + FactTextField { + fact: wimaController.flightSpeed + Layout.fillWidth: true + } + + QGCLabel { text: qsTr("Altitude") } + FactTextField { + fact: wimaController.altitude + Layout.fillWidth: true + } + + // Buttons + QGCButton { + id: buttonPreviousMissionPhase + text: qsTr("Reverse") + onClicked: wimaController.previousPhase(); + Layout.fillWidth: true + } + + QGCButton { + id: buttonNextMissionPhase + text: qsTr("Forward") + onClicked: wimaController.nextPhase(); + Layout.fillWidth: true + } + + QGCButton { + id: buttonResetPhase + text: qsTr("Reset Phase") + onClicked: wimaController.resetPhase(); + Layout.fillWidth: true + Layout.rowSpan: 2 + } + + + /*} + + SectionHeader{ + id: vehicleHeader + text: qsTr("Vehicle") + } + GridLayout { + columns: 2 + rowSpacing: ScreenTools.defaultFontPixelHeight * 0.5 + columnSpacing: ScreenTools.defaultFontPixelHeight * 0.5 + visible: vehicleHeader.checked*/ + + QGCButton { + id: buttonUpload + text: qsTr("Upload") + onClicked: wimaController.uploadToVehicle(); + Layout.fillWidth: true + } + + QGCButton { + id: buttonRemoveFromVehicle + text: qsTr("Remove") + onClicked: wimaController.removeFromVehicle(); + Layout.fillWidth: true + } + + QGCButton { + id: buttonSmartRTL + text: qsTr("Smart RTL") + onClicked: initSmartRTL() + Layout.fillWidth: true + } + // placeholder, remove if you add stuff + QGCLabel { text: "" } + + + // progess bar + Rectangle { + id: progressBar + height: 4 + width: _controllerProgressPct * parent.width + color: qgcPal.colorGreen + visible: false + } + + QGCLabel { + id: uploadCompleteText + font.pointSize: ScreenTools.largeFontPointSize + Layout.columnSpan: 2 + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + text: "Done" + visible: false + } + + } + + /*SectionHeader { + id: statsHeader + text: qsTr("Statistics") + }*/ + GridLayout { + columns: 2 + rowSpacing: ScreenTools.defaultFontPixelHeight * 0.5 + anchors.topMargin: ScreenTools.defaultFontPixelHeight * 0.25 + visible: statsHeader.checked + + QGCLabel { + text: qsTr("Phase Length: ") + wrapMode: Text.WordWrap + font.pointSize: ScreenTools.smallFontPointSize + } + QGCLabel { + text: wimaController.phaseDistance >= 0 ? wimaController.phaseDistance.toFixed(2) + " m": "" + wrapMode: Text.WordWrap + font.pointSize: ScreenTools.smallFontPointSize + } + + QGCLabel { + text: qsTr("Phase Duration: ") + wrapMode: Text.WordWrap + font.pointSize: ScreenTools.smallFontPointSize + } + QGCLabel { + text: wimaController.phaseDuration >= 0 ? getTime(wimaController.phaseDuration) : "" + wrapMode: Text.WordWrap + font.pointSize: ScreenTools.smallFontPointSize + } + } + } // mainColumn + } // item + } // Rectangle } }