Skip to content

Q
qgroundcontrol
Commit 11be16f2 authored by Don Gagne's avatar Don Gagne
Browse files
Options

parent bdd844fc
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 15 deletions
src/ui/preferences/GeneralSettings.qml
View file @ 11be16f2
...@@ -395,38 +395,61 @@ QGCView { ...@@ -395,38 +395,61 @@ QGCView {
anchors.top: parent.top anchors.top: parent.top
Layout.fillWidth: true Layout.fillWidth: true
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
columns: 2 columns: 3
property var rtkSettings: QGroundControl.settingsManager.rtkSettings property var rtkSettings: QGroundControl.settingsManager.rtkSettings
property bool useFixedPosition: rtkSettings.useFixedBasePosition.rawValue property bool useFixedPosition: rtkSettings.useFixedBasePosition.rawValue
property real firstColWidth: ScreenTools.defaultFontPixelWidth * 3
ExclusiveGroup {
id: useFixedBasePositionRadioGroup
}
QGCRadioButton {
text: qsTr("Perform Survey-In")
visible: rtkGrid.rtkSettings.useFixedBasePosition.visible
checked: rtkGrid.rtkSettings.useFixedBasePosition.value == false
onClicked: rtkGrid.rtkSettings.useFixedBasePosition.value = false
exclusiveGroup: useFixedBasePositionRadioGroup
Layout.columnSpan: 3
}
Item { width: rtkGrid.firstColWidth; height: 1 }
QGCLabel { QGCLabel {
text: rtkGrid.rtkSettings.surveyInAccuracyLimit.shortDescription text: rtkGrid.rtkSettings.surveyInAccuracyLimit.shortDescription
visible: rtkGrid.rtkSettings.surveyInAccuracyLimit.visible visible: rtkGrid.rtkSettings.surveyInAccuracyLimit.visible
enabled: !rtkGrid.useFixedPosition
} }
FactTextField { FactTextField {
fact: rtkGrid.rtkSettings.surveyInAccuracyLimit fact: rtkGrid.rtkSettings.surveyInAccuracyLimit
visible: rtkGrid.rtkSettings.surveyInAccuracyLimit.visible visible: rtkGrid.rtkSettings.surveyInAccuracyLimit.visible
enabled: !rtkGrid.useFixedPosition
Layout.preferredWidth: _valueFieldWidth Layout.preferredWidth: _valueFieldWidth
} }
Item { width: rtkGrid.firstColWidth; height: 1 }
QGCLabel { QGCLabel {
text: rtkGrid.rtkSettings.surveyInMinObservationDuration.shortDescription text: rtkGrid.rtkSettings.surveyInMinObservationDuration.shortDescription
visible: rtkGrid.rtkSettings.surveyInMinObservationDuration.visible visible: rtkGrid.rtkSettings.surveyInMinObservationDuration.visible
enabled: !rtkGrid.useFixedPosition
} }
FactTextField { FactTextField {
fact: rtkGrid.rtkSettings.surveyInMinObservationDuration fact: rtkGrid.rtkSettings.surveyInMinObservationDuration
visible: rtkGrid.rtkSettings.surveyInMinObservationDuration.visible visible: rtkGrid.rtkSettings.surveyInMinObservationDuration.visible
enabled: !rtkGrid.useFixedPosition
Layout.preferredWidth: _valueFieldWidth Layout.preferredWidth: _valueFieldWidth
} }
FactCheckBox { QGCRadioButton {
text: rtkGrid.rtkSettings.useFixedBasePosition.shortDescription text: qsTr("Use Specified Base Position")
visible: rtkGrid.rtkSettings.useFixedBasePosition.visible visible: rtkGrid.rtkSettings.useFixedBasePosition.visible
fact: rtkGrid.rtkSettings.useFixedBasePosition checked: rtkGrid.rtkSettings.useFixedBasePosition.value == true
Layout.columnSpan: 2 onClicked: rtkGrid.rtkSettings.useFixedBasePosition.value = true
exclusiveGroup: useFixedBasePositionRadioGroup
Layout.columnSpan: 3
} }
Item { width: rtkGrid.firstColWidth; height: 1 }
QGCLabel { QGCLabel {
text: rtkGrid.rtkSettings.fixedBasePositionLatitude.shortDescription text: rtkGrid.rtkSettings.fixedBasePositionLatitude.shortDescription
visible: rtkGrid.rtkSettings.fixedBasePositionLatitude.visible visible: rtkGrid.rtkSettings.fixedBasePositionLatitude.visible
...@@ -439,10 +462,11 @@ QGCView { ...@@ -439,10 +462,11 @@ QGCView {
Layout.fillWidth: true Layout.fillWidth: true
} }
Item { width: rtkGrid.firstColWidth; height: 1 }
QGCLabel { QGCLabel {
text: rtkGrid.rtkSettings.fixedBasePositionLongitude.shortDescription text: rtkGrid.rtkSettings.fixedBasePositionLongitude.shortDescription
visible: rtkGrid.rtkSettings.fixedBasePositionLongitude.visible visible: rtkGrid.rtkSettings.fixedBasePositionLongitude.visible
enabled: rtkGrid.useFixedPosition enabled: rtkGrid.useFixedPosition
} }
FactTextField { FactTextField {
fact: rtkGrid.rtkSettings.fixedBasePositionLongitude fact: rtkGrid.rtkSettings.fixedBasePositionLongitude
...@@ -451,10 +475,11 @@ QGCView { ...@@ -451,10 +475,11 @@ QGCView {
Layout.fillWidth: true Layout.fillWidth: true
} }
Item { width: rtkGrid.firstColWidth; height: 1 }
QGCLabel { QGCLabel {
text: rtkGrid.rtkSettings.fixedBasePositionAltitude.shortDescription text: rtkGrid.rtkSettings.fixedBasePositionAltitude.shortDescription
visible: rtkGrid.rtkSettings.fixedBasePositionAltitude.visible visible: rtkGrid.rtkSettings.fixedBasePositionAltitude.visible
enabled: rtkGrid.useFixedPosition enabled: rtkGrid.useFixedPosition
} }
FactTextField { FactTextField {
fact: rtkGrid.rtkSettings.fixedBasePositionAltitude fact: rtkGrid.rtkSettings.fixedBasePositionAltitude
...@@ -463,10 +488,11 @@ QGCView { ...@@ -463,10 +488,11 @@ QGCView {
Layout.fillWidth: true Layout.fillWidth: true
} }
Item { width: rtkGrid.firstColWidth; height: 1 }
QGCLabel { QGCLabel {
text: rtkGrid.rtkSettings.fixedBasePositionAccuracy.shortDescription text: rtkGrid.rtkSettings.fixedBasePositionAccuracy.shortDescription
visible: rtkGrid.rtkSettings.fixedBasePositionAccuracy.visible visible: rtkGrid.rtkSettings.fixedBasePositionAccuracy.visible
enabled: rtkGrid.useFixedPosition enabled: rtkGrid.useFixedPosition
} }
FactTextField { FactTextField {
fact: rtkGrid.rtkSettings.fixedBasePositionAccuracy fact: rtkGrid.rtkSettings.fixedBasePositionAccuracy
...@@ -475,10 +501,11 @@ QGCView { ...@@ -475,10 +501,11 @@ QGCView {
Layout.fillWidth: true Layout.fillWidth: true
} }
Item { width: rtkGrid.firstColWidth; height: 1 }
QGCButton { QGCButton {
text: qsTr("Save Current Base Position") text: qsTr("Save Current Base Position")
Layout.columnSpan: 2
enabled: QGroundControl.gpsRtk.valid.value enabled: QGroundControl.gpsRtk.valid.value
Layout.columnSpan: 2
onClicked: { onClicked: {
rtkGrid.rtkSettings.fixedBasePositionLatitude.rawValue = QGroundControl.gpsRtk.currentLatitude.rawValue rtkGrid.rtkSettings.fixedBasePositionLatitude.rawValue = QGroundControl.gpsRtk.currentLatitude.rawValue
......
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