Browse Source

Use consistent Altitude Mode labeling

QGC4.4
Don Gagne 6 years ago
parent
commit
e12fbcfa22
  1. 9
      src/PlanView/CameraCalc.qml
  2. 11
      src/PlanView/CorridorScanEditor.qml
  3. 17
      src/PlanView/StructureScanEditor.qml
  4. 11
      src/PlanView/SurveyItemEditor.qml

9
src/PlanView/CameraCalc.qml

@ -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

@ -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

@ -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

@ -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 {

Loading…
Cancel
Save