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

9
src/PlanView/CameraCalc.qml
Unescape View File

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

11
src/PlanView/CorridorScanEditor.qml
Unescape View File

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

17
src/PlanView/StructureScanEditor.qml
Unescape View File

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

11
src/PlanView/SurveyItemEditor.qml
Unescape View File

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

2
src/QmlControls/QGCCheckBox.qml
Unescape View File

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

2
src/QmlControls/QGCRadioButton.qml
Unescape View File

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

19
src/QmlControls/QGCTextField.qml
Unescape View File

@ -13,9 +13,10 @@ TextField { @@ -13,9 +13,10 @@ TextField {
activeFocusOnPress: true
antialiasing: true
property bool showUnits: false
property bool showHelp: false
property string unitsLabel: ""
property bool showUnits: false
property bool showHelp: false
property string unitsLabel: ""
property string extraUnitsLabel: ""
signal helpClicked
@ -89,7 +90,17 @@ TextField { @@ -89,7 +90,17 @@ TextField {
font.family: ScreenTools.normalFontFamily
antialiasing: true
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 {

Write Preview
Loading…
Cancel
Save