From 3462b4339547e6704ea504e43f75e329f88616dd Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sat, 20 Apr 2019 10:15:59 -0700 Subject: [PATCH 1/4] Reduce space between graphic and text --- src/QmlControls/QGCCheckBox.qml | 2 ++ src/QmlControls/QGCRadioButton.qml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/QmlControls/QGCCheckBox.qml b/src/QmlControls/QGCCheckBox.qml index 5e334c6..af2dfa9 100644 --- a/src/QmlControls/QGCCheckBox.qml +++ b/src/QmlControls/QGCCheckBox.qml @@ -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) diff --git a/src/QmlControls/QGCRadioButton.qml b/src/QmlControls/QGCRadioButton.qml index 79792d3..6f28fde 100644 --- a/src/QmlControls/QGCRadioButton.qml +++ b/src/QmlControls/QGCRadioButton.qml @@ -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 From fdfb7f039a8aa9f128663280de2516e9e1baf732 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sat, 20 Apr 2019 10:16:12 -0700 Subject: [PATCH 2/4] Show extra unit in small font --- src/QmlControls/QGCTextField.qml | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/QmlControls/QGCTextField.qml b/src/QmlControls/QGCTextField.qml index 4e132f5..317ffd8 100644 --- a/src/QmlControls/QGCTextField.qml +++ b/src/QmlControls/QGCTextField.qml @@ -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 { 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 { From b0a1524dd155fed024c1ffcfe711ee2f9871fe67 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sat, 20 Apr 2019 10:16:56 -0700 Subject: [PATCH 3/4] Use new extraUnitField --- .../FactControls/AltitudeFactTextField.qml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/FactSystem/FactControls/AltitudeFactTextField.qml b/src/FactSystem/FactControls/AltitudeFactTextField.qml index 11d287a..1a3d5f3 100644 --- a/src/FactSystem/FactControls/AltitudeFactTextField.qml +++ b/src/FactSystem/FactControls/AltitudeFactTextField.qml @@ -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 { _altitudeModeExtraUnits = "" } } - - onAltitudeModeChanged: updateAltitudeModeExtraUnits() } From e12fbcfa22378e903e1e4e189f2c67820a8f871c Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sat, 20 Apr 2019 10:17:11 -0700 Subject: [PATCH 4/4] Use consistent Altitude Mode labeling --- src/PlanView/CameraCalc.qml | 9 ++++++--- src/PlanView/CorridorScanEditor.qml | 11 ++++++----- src/PlanView/StructureScanEditor.qml | 17 ++++++++++------- src/PlanView/SurveyItemEditor.qml | 11 ++++++----- 4 files changed, 28 insertions(+), 20 deletions(-) diff --git a/src/PlanView/CameraCalc.qml b/src/PlanView/CameraCalc.qml index 95c531f..14b626e 100644 --- a/src/PlanView/CameraCalc.qml +++ b/src/PlanView/CameraCalc.qml @@ -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 { onClicked: cameraCalc.valueSetIsDistance.value = 1 } - FactTextField { + AltitudeFactTextField { fact: cameraCalc.distanceToSurface + altitudeMode: distanceToSurfaceAltitudeMode enabled: fixedDistanceRadio.checked Layout.fillWidth: true } @@ -285,8 +287,9 @@ Column { visible: cameraCalc.isManualCamera QGCLabel { text: distanceToSurfaceLabel } - FactTextField { + AltitudeFactTextField { fact: cameraCalc.distanceToSurface + altitudeMode: distanceToSurfaceAltitudeMode Layout.fillWidth: true } diff --git a/src/PlanView/CorridorScanEditor.qml b/src/PlanView/CorridorScanEditor.qml index ab42e20..6c833a2 100644 --- a/src/PlanView/CorridorScanEditor.qml +++ b/src/PlanView/CorridorScanEditor.qml @@ -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 { diff --git a/src/PlanView/StructureScanEditor.qml b/src/PlanView/StructureScanEditor.qml index 380ef8f..ea8d454 100644 --- a/src/PlanView/StructureScanEditor.qml +++ b/src/PlanView/StructureScanEditor.qml @@ -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 { } 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 } diff --git a/src/PlanView/SurveyItemEditor.qml b/src/PlanView/SurveyItemEditor.qml index 183dc25..2b183a7 100644 --- a/src/PlanView/SurveyItemEditor.qml +++ b/src/PlanView/SurveyItemEditor.qml @@ -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 {