Skip to content

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

wima menu scrollbar fixed

parent 99d9796c
Hide whitespace changes
Inline Side-by-side
Showing with 233 additions and 199 deletions
deploy/appImageCommand.txt
View file @ accb2ed3
./create_linux_appimage.sh /home/valentin/drones/qgroundcontrol/ /home/valentin/drones/build-qgroundcontrol-Desktop_Qt_5_11_3_GCC_64bit-Release/release/
./create_linux_appimage.sh /home/valentin/Desktop/drones/qgroundcontrol/ /home/valentin/Desktop/drones/build-qgroundcontrol-Desktop_Qt_5_11_3_GCC_64bit-Release/release/
src/FlightDisplay/FlightDisplayWimaMenu.qml
View file @ accb2ed3
......@@ -62,18 +62,14 @@ Item {
width: enableWima.enableWimaBoolean ? parent.width : enableWima.width
color: enableWima.enableWimaBoolean ? qgcPal.window : "transparent"
radius: ScreenTools.defaultFontPixelHeight / 4
anchors.topMargin: ScreenTools.defaultFontPixelHeight * 0.5
anchors.bottomMargin: ScreenTools.defaultFontPixelHeight * 0.5
anchors.rightMargin: ScreenTools.defaultFontPixelHeight * 0.5
anchors.leftMargin: ScreenTools.defaultFontPixelHeight * 0.5
// checkbox to enable/ disable wima
SliderSwitch {
id: enableWima
anchors.horizontalCenter: parent.horizontalCenter
anchors.topMargin: ScreenTools.defaultFontPixelHeight * 0.25
anchors.top: parent.top
confirmText: enableWimaBoolean ? qsTr("disable WiMA") : qsTr("enable WiMA")
anchors.horizontalCenter: parent.horizontalCenter
anchors.topMargin: ScreenTools.defaultFontPixelHeight * 0.25
anchors.top: parent.top
confirmText: enableWimaBoolean ? qsTr("disable WiMA") : qsTr("enable WiMA")
property var enableWimaFact: wimaController.enableWimaController
property bool enableWimaBoolean: enableWimaFact.value
......@@ -87,201 +83,240 @@ Item {
}
}
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
Item {
id: flickableWrapper
anchors.top: enableWima.bottom
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: parent.bottom
anchors.margins: ScreenTools.defaultFontPixelHeight*0.5
QGCFlickable {
clip: true
anchors.fill: parent
contentHeight: wrapperItem.height
contentWidth: wrapperItem.width
Item {
id: wrapperItem
width: Math.max(flickableWrapper.width, mainColumn.width)
height: mainColumn.height
property int itemWidth: 120
Column {
id: mainColumn
anchors.horizontalCenter: parent.horizontalCenter
spacing: 4
SectionHeader{
id: settingsHeader
text: qsTr("Settings")
}
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
GridLayout {
columns: 2
rowSpacing: ScreenTools.defaultFontPixelHeight * 0.5
columnSpacing: ScreenTools.defaultFontPixelHeight * 0.5
visible: settingsHeader.checked
QGCLabel {
text: qsTr("Next Waypoint")
Layout.fillWidth: true
}
FactTextField {
fact: wimaController.startWaypointIndex
Layout.fillWidth: true
}
QGCLabel {
text: qsTr("Max Waypoints")
Layout.fillWidth: true
}
FactTextField {
fact: wimaController.maxWaypointsPerPhase
Layout.fillWidth: true
}
QGCLabel {
text: qsTr("Overlap")
Layout.fillWidth: true
}
FactTextField {
fact: wimaController.overlapWaypoints
Layout.fillWidth: true
}
FactCheckBox {
text: qsTr("Show All")
fact: wimaController.showAllMissionItems
Layout.fillWidth: true
}
FactCheckBox {
text: qsTr("Show Current")
fact: wimaController.showCurrentMissionItems
Layout.fillWidth: true
}
} // Grid
SectionHeader{
id: missionHeader
text: qsTr("Mission")
}
GridLayout {
columns: 2
rowSpacing: ScreenTools.defaultFontPixelHeight * 0.5
columnSpacing: ScreenTools.defaultFontPixelHeight * 0.5
visible: missionHeader.checked
width: parent.width
QGCLabel {
text: qsTr("Speed")
Layout.fillWidth: true
}
FactTextField {
fact: wimaController.flightSpeed
Layout.fillWidth: true
}
QGCLabel {
text: qsTr("Altitude")
Layout.fillWidth: true
}
FactTextField {
fact: wimaController.altitude
Layout.fillWidth: true
}
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
GridLayout {
columns: 2
rowSpacing: ScreenTools.defaultFontPixelHeight * 0.5
columnSpacing: ScreenTools.defaultFontPixelHeight * 0.5
visible: missionHeader.checked
width: parent.width
// 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.columnSpan: 2
Layout.fillWidth: true
}
} // Grid
SectionHeader{
id: vehicleHeader
text: qsTr("Vehicle")
}
QGCLabel {
text: wimaController.phaseDistance >= 0 ? wimaController.phaseDistance.toFixed(2) + " m": ""
wrapMode: Text.WordWrap
font.pointSize: ScreenTools.smallFontPointSize
GridLayout {
columns: 2
rowSpacing: ScreenTools.defaultFontPixelHeight * 0.5
columnSpacing: ScreenTools.defaultFontPixelHeight * 0.5
visible: vehicleHeader.checked
width: parent.width
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.columnSpan: 2
Layout.fillWidth: true
}
// progess bar
Rectangle {
id: progressBar
height: 4
width: _controllerProgressPct * parent.width
color: qgcPal.colorGreen
visible: false
Layout.columnSpan: 2
Layout.fillWidth: true
}
QGCLabel {
id: uploadCompleteText
font.pointSize: ScreenTools.largeFontPointSize
Layout.columnSpan: 2
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
text: "Done"
visible: false
Layout.fillWidth: true
}
}
QGCLabel {
text: qsTr("Phase Duration: ")
wrapMode: Text.WordWrap
font.pointSize: ScreenTools.smallFontPointSize
SectionHeader {
id: statsHeader
text: qsTr("Statistics")
}
QGCLabel {
text: wimaController.phaseDuration >= 0 ? getTime(wimaController.phaseDuration) : ""
wrapMode: Text.WordWrap
font.pointSize: ScreenTools.smallFontPointSize
GridLayout {
columns: 2
rowSpacing: ScreenTools.defaultFontPixelHeight * 0.5
anchors.topMargin: ScreenTools.defaultFontPixelHeight * 0.5
visible: statsHeader.checked
QGCLabel {
text: qsTr("Phase Length: ")
wrapMode: Text.WordWrap
Layout.fillWidth: true
}
QGCLabel {
text: wimaController.phaseDistance >= 0 ? wimaController.phaseDistance.toFixed(2) + " m": ""
wrapMode: Text.WordWrap
Layout.fillWidth: true
}
QGCLabel {
text: qsTr("Phase Duration: ")
wrapMode: Text.WordWrap
Layout.fillWidth: true
}
QGCLabel {
text: wimaController.phaseDuration >= 0 ? getTime(wimaController.phaseDuration) : ""
wrapMode: Text.WordWrap
Layout.fillWidth: true
}
QGCLabel {
text: ""
Layout.columnSpan: 2
}
}
}
} // mainColumn
} // item
} // Rectangle
} // settingsColumn
} // wrapperItem
} // QGCFlickable
} // Item
}
}
src/QmlControls/SectionHeader.qml
View file @ accb2ed3
......@@ -7,10 +7,9 @@ import QGroundControl.ScreenTools 1.0
import QGroundControl.Palette 1.0
FocusScope {
id: _root
anchors.left: parent.left
anchors.right: parent.right
height: column.height
id: _root
width: parent.width
height: column.height
property alias text: label.text
property bool checked: true
......
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