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

Merge pull request #7371 from DonLakeFlyer/master 

Consistent Altitutude Mode labelling in all complex items
QGC4.4
Don Gagne 6 years ago committed by GitHub
parent
c0ea93e954 e12fbcfa22
commit
16e93829e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 58 additions and 35 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. 22
      src/FactSystem/FactControls/AltitudeFactTextField.qml
  2. 9
      src/PlanView/CameraCalc.qml
  3. 11
      src/PlanView/CorridorScanEditor.qml
  4. 17
      src/PlanView/StructureScanEditor.qml
  5. 11
      src/PlanView/SurveyItemEditor.qml
  6. 2
      src/QmlControls/QGCCheckBox.qml
  7. 2
      src/QmlControls/QGCRadioButton.qml
  8. 19
      src/QmlControls/QGCTextField.qml

22
src/FactSystem/FactControls/AltitudeFactTextField.qml
Unescape View File

@ -1,20 +1,24 @@
import QtQuick 2.3
import QGroundControl 1.0 import QGroundControl 1.0
import QGroundControl.FactSystem 1.0 import QGroundControl.FactSystem 1.0
FactTextField { FactTextField {
unitsLabel: fact ? fact.units + _altitudeModeExtraUnits : "" unitsLabel: fact ? fact.units : ""
showUnits: true extraUnitsLabel: fact ? _altitudeModeExtraUnits : ""
showHelp: true showUnits: true
showHelp: true
property int altitudeMode: QGroundControl.AltitudeModeNone property int altitudeMode: QGroundControl.AltitudeModeNone
readonly property string _altModeNoneExtraUnits: "" readonly property string _altModeNoneExtraUnits: ""
readonly property string _altModeRelativeExtraUnits: qsTr(" (Rel)") readonly property string _altModeRelativeExtraUnits: qsTr("(Rel)")
readonly property string _altModeAbsoluteExtraUnits: qsTr(" (AMSL)") readonly property string _altModeAbsoluteExtraUnits: qsTr("(AMSL)")
readonly property string _altModeAboveTerrainExtraUnits: qsTr(" (Abv Terr)") readonly property string _altModeAboveTerrainExtraUnits: qsTr("(Abv Terr)")
readonly property string _altModeTerrainFrameExtraUnits: qsTr(" (TerrF)") readonly property string _altModeTerrainFrameExtraUnits: qsTr("(TerrF)")
property string _altitudeModeExtraUnits: _altModeRelativeExtraUnits property string _altitudeModeExtraUnits: _altModeNoneExtraUnits
onAltitudeModeChanged: updateAltitudeModeExtraUnits()
function updateAltitudeModeExtraUnits() { function updateAltitudeModeExtraUnits() {
if (altitudeMode === QGroundControl.AltitudeModeNone) { if (altitudeMode === QGroundControl.AltitudeModeNone) {
@ -32,6 +36,4 @@ FactTextField {
_altitudeModeExtraUnits = "" _altitudeModeExtraUnits = ""
} }
} }
onAltitudeModeChanged: updateAltitudeModeExtraUnits()
} }

9
src/PlanView/CameraCalc.qml
Unescape View File

@ -15,8 +15,9 @@ Column {
spacing: _margin spacing: _margin
property var cameraCalc property var cameraCalc
property bool vehicleFlightIsFrontal: true property bool vehicleFlightIsFrontal: true
property string distanceToSurfaceLabel property string distanceToSurfaceLabel
property int distanceToSurfaceAltitudeMode: QGroundControl.AltitudeModeNone
property string frontalDistanceLabel property string frontalDistanceLabel
property string sideDistanceLabel property string sideDistanceLabel
@ -226,8 +227,9 @@ Column {
onClicked: cameraCalc.valueSetIsDistance.value = 1 onClicked: cameraCalc.valueSetIsDistance.value = 1
} }
FactTextField { AltitudeFactTextField {
fact: cameraCalc.distanceToSurface fact: cameraCalc.distanceToSurface
altitudeMode: distanceToSurfaceAltitudeMode
enabled: fixedDistanceRadio.checked enabled: fixedDistanceRadio.checked
Layout.fillWidth: true Layout.fillWidth: true
} }
@ -285,8 +287,9 @@ Column {
visible: cameraCalc.isManualCamera visible: cameraCalc.isManualCamera
QGCLabel { text: distanceToSurfaceLabel } QGCLabel { text: distanceToSurfaceLabel }
FactTextField { AltitudeFactTextField {
fact: cameraCalc.distanceToSurface fact: cameraCalc.distanceToSurface
altitudeMode: distanceToSurfaceAltitudeMode
Layout.fillWidth: true Layout.fillWidth: true
} }

11
src/PlanView/CorridorScanEditor.qml
Unescape View File

@ -67,11 +67,12 @@ Rectangle {
CameraCalc { CameraCalc {
cameraCalc: missionItem.cameraCalc cameraCalc: missionItem.cameraCalc
vehicleFlightIsFrontal: true vehicleFlightIsFrontal: true
distanceToSurfaceLabel: qsTr("Altitude") distanceToSurfaceLabel: qsTr("Altitude")
frontalDistanceLabel: qsTr("Trigger Distance") distanceToSurfaceAltitudeMode: missionItem.followTerrain ? QGroundControl.AltitudeModeAboveTerrain : QGroundControl.AltitudeModeRelative
sideDistanceLabel: qsTr("Spacing") frontalDistanceLabel: qsTr("Trigger Dist")
sideDistanceLabel: qsTr("Spacing")
} }
SectionHeader { SectionHeader {

17
src/PlanView/StructureScanEditor.qml
Unescape View File

@ -75,11 +75,12 @@ Rectangle {
} }
CameraCalc { CameraCalc {
cameraCalc: missionItem.cameraCalc cameraCalc: missionItem.cameraCalc
vehicleFlightIsFrontal: false vehicleFlightIsFrontal: false
distanceToSurfaceLabel: qsTr("Scan Distance") distanceToSurfaceLabel: qsTr("Scan Distance")
frontalDistanceLabel: qsTr("Layer Height") distanceToSurfaceAltitudeMode: QGroundControl.AltitudeModeNone
sideDistanceLabel: qsTr("Trigger Distance") frontalDistanceLabel: qsTr("Layer Height")
sideDistanceLabel: qsTr("Trigger Distance")
} }
SectionHeader { SectionHeader {
@ -117,14 +118,16 @@ Rectangle {
} }
QGCLabel { text: qsTr("Scan Bottom Alt") } QGCLabel { text: qsTr("Scan Bottom Alt") }
FactTextField { AltitudeFactTextField {
fact: missionItem.scanBottomAlt fact: missionItem.scanBottomAlt
altitudeMode: QGroundControl.AltitudeModeRelative
Layout.fillWidth: true Layout.fillWidth: true
} }
QGCLabel { text: qsTr("Entrance/Exit Alt") } QGCLabel { text: qsTr("Entrance/Exit Alt") }
FactTextField { AltitudeFactTextField {
fact: missionItem.entranceAlt fact: missionItem.entranceAlt
altitudeMode: QGroundControl.AltitudeModeRelative
Layout.fillWidth: true Layout.fillWidth: true
} }

11
src/PlanView/SurveyItemEditor.qml
Unescape View File

@ -67,11 +67,12 @@ Rectangle {
} }
CameraCalc { CameraCalc {
cameraCalc: missionItem.cameraCalc cameraCalc: missionItem.cameraCalc
vehicleFlightIsFrontal: true vehicleFlightIsFrontal: true
distanceToSurfaceLabel: qsTr("Altitude") distanceToSurfaceLabel: qsTr("Altitude")
frontalDistanceLabel: qsTr("Trigger Distance") distanceToSurfaceAltitudeMode: missionItem.followTerrain ? QGroundControl.AltitudeModeAboveTerrain : QGroundControl.AltitudeModeRelative
sideDistanceLabel: qsTr("Spacing") frontalDistanceLabel: qsTr("Trigger Dist")
sideDistanceLabel: qsTr("Spacing")
} }
SectionHeader { SectionHeader {

2
src/QmlControls/QGCCheckBox.qml
Unescape View File

@ -16,6 +16,8 @@ CheckBox {
activeFocusOnPress: true activeFocusOnPress: true
style: CheckBoxStyle { style: CheckBoxStyle {
spacing: _noText ? 0 : ScreenTools.defaultFontPixelWidth * 0.25
label: Item { label: Item {
implicitWidth: _noText ? 0 : text.implicitWidth + ScreenTools.defaultFontPixelWidth * 0.25 implicitWidth: _noText ? 0 : text.implicitWidth + ScreenTools.defaultFontPixelWidth * 0.25
implicitHeight: _noText ? 0 : Math.max(text.implicitHeight, ScreenTools.checkBoxIndicatorSize) implicitHeight: _noText ? 0 : Math.max(text.implicitHeight, ScreenTools.checkBoxIndicatorSize)

2
src/QmlControls/QGCRadioButton.qml
Unescape View File

@ -17,7 +17,7 @@ RadioButton {
activeFocusOnPress: true activeFocusOnPress: true
style: RadioButtonStyle { style: RadioButtonStyle {
spacing: _noText ? 0 : ScreenTools.defaultFontPixelWidth / 2 spacing: _noText ? 0 : ScreenTools.defaultFontPixelWidth * 0.25
label: Item { label: Item {
implicitWidth: _noText ? 0 : text.implicitWidth + ScreenTools.defaultFontPixelWidth * 0.25 implicitWidth: _noText ? 0 : text.implicitWidth + ScreenTools.defaultFontPixelWidth * 0.25

19
src/QmlControls/QGCTextField.qml
Unescape View File

@ -13,9 +13,10 @@ TextField {
activeFocusOnPress: true activeFocusOnPress: true
antialiasing: true antialiasing: true
property bool showUnits: false property bool showUnits: false
property bool showHelp: false property bool showHelp: false
property string unitsLabel: "" property string unitsLabel: ""
property string extraUnitsLabel: ""
signal helpClicked signal helpClicked
@ -89,7 +90,17 @@ TextField {
font.family: ScreenTools.normalFontFamily font.family: ScreenTools.normalFontFamily
antialiasing: true antialiasing: true
color: control.textColor color: control.textColor
visible: control.showUnits visible: control.showUnits && text !== ""
}
Text {
Layout.alignment: Qt.AlignVCenter
text: control.extraUnitsLabel
font.pointSize: ScreenTools.smallFontPointSize
font.family: ScreenTools.normalFontFamily
antialiasing: true
color: control.textColor
visible: control.showUnits && text !== ""
} }
Rectangle { Rectangle {

Write Preview
Loading…
Cancel
Save