mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
mobile-widgets/qml: connect QML to Backend.
Add property pressureUnit to use as BAR/PSI text. Added slot to catch when user changes BAR <-> PSI. Add Backend variables to Planning section. Signed-off-by: jan Iversen <jan@casacondor.com>
This commit is contained in:
parent
ff360d28f5
commit
c1bbab6eaa
1 changed files with 43 additions and 9 deletions
|
@ -12,6 +12,7 @@ Kirigami.ScrollablePage {
|
||||||
|
|
||||||
property string speedUnit: (Backend.length === Enums.METERS) ? qsTr(" m/min") : qsTr(" ft/min")
|
property string speedUnit: (Backend.length === Enums.METERS) ? qsTr(" m/min") : qsTr(" ft/min")
|
||||||
property string volumeUnit: (Backend.volume === Enums.LITER) ? qsTr(" l/min") : qsTr(" cuft/min")
|
property string volumeUnit: (Backend.volume === Enums.LITER) ? qsTr(" l/min") : qsTr(" cuft/min")
|
||||||
|
property string pressureUnit: (Backend.pressure === Enums.BAR) ? qsTr(" BAR") : qsTr(" PSI")
|
||||||
Connections {
|
Connections {
|
||||||
target: Backend
|
target: Backend
|
||||||
onLengthChanged: {
|
onLengthChanged: {
|
||||||
|
@ -26,6 +27,8 @@ Kirigami.ScrollablePage {
|
||||||
spinBottomsac.value = Backend.bottomsac
|
spinBottomsac.value = Backend.bottomsac
|
||||||
spinDecosac.value = Backend.decosac
|
spinDecosac.value = Backend.decosac
|
||||||
}
|
}
|
||||||
|
onPressureChanged: {
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Column {
|
Column {
|
||||||
width: parent.width
|
width: parent.width
|
||||||
|
@ -157,37 +160,46 @@ Kirigami.ScrollablePage {
|
||||||
}
|
}
|
||||||
TemplateComboBox {
|
TemplateComboBox {
|
||||||
editable: false
|
editable: false
|
||||||
|
currentIndex: Backend.dive_mode
|
||||||
model: ListModel {
|
model: ListModel {
|
||||||
ListElement {text: qsTr("Open circuit")}
|
ListElement {text: qsTr("Open circuit")}
|
||||||
ListElement {text: qsTr("CCR")}
|
ListElement {text: qsTr("CCR")}
|
||||||
ListElement {text: qsTr("pSCR")}
|
ListElement {text: qsTr("pSCR")}
|
||||||
}
|
}
|
||||||
onActivated: {
|
onActivated: {
|
||||||
|
Backend.dive_mode = currentIndex
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
TemplateCheckBox {
|
TemplateCheckBox {
|
||||||
text: qsTr("Bailout: Deco on OC")
|
text: qsTr("Bailout: Deco on OC")
|
||||||
Layout.columnSpan: 2
|
Layout.columnSpan: 2
|
||||||
|
checked: Backend.dobailout
|
||||||
}
|
}
|
||||||
|
|
||||||
TemplateRadioButton {
|
TemplateRadioButton {
|
||||||
text: qsTr("Recreational mode")
|
text: qsTr("Recreational mode")
|
||||||
Layout.columnSpan: 2
|
Layout.columnSpan: 2
|
||||||
|
checked: Backend.planner_deco_mode === Enums.RECREATIONAL
|
||||||
|
onClicked: {
|
||||||
|
Backend.planner_deco_mode = Enums.RECREATIONAL
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
TemplateLabel {
|
TemplateLabel {
|
||||||
text: qsTr("Reserve gas")
|
text: qsTr("Reserve gas")
|
||||||
leftPadding: Kirigami.Units.smallSpacing * 2
|
leftPadding: Kirigami.Units.smallSpacing * 2
|
||||||
|
enabled: Backend.planner_deco_mode === Enums.RECREATIONAL
|
||||||
}
|
}
|
||||||
TemplateSpinBox {
|
TemplateSpinBox {
|
||||||
from: 1
|
from: 1
|
||||||
to: 99
|
to: 99
|
||||||
stepSize: 1
|
stepSize: 1
|
||||||
value: 50
|
value: Backend.reserve_gas
|
||||||
textFromValue: function (value, locale) {
|
textFromValue: function (value, locale) {
|
||||||
return value + volumeUnit
|
return value + volumeUnit
|
||||||
}
|
}
|
||||||
onValueModified: {
|
onValueModified: {
|
||||||
|
Backend.reserve_gas = value
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -195,11 +207,19 @@ Kirigami.ScrollablePage {
|
||||||
text: qsTr("Safety stop")
|
text: qsTr("Safety stop")
|
||||||
Layout.columnSpan: 2
|
Layout.columnSpan: 2
|
||||||
leftPadding: Kirigami.Units.smallSpacing * 6
|
leftPadding: Kirigami.Units.smallSpacing * 6
|
||||||
|
checked: Backend.safetystop
|
||||||
|
onClicked: {
|
||||||
|
Backend.safetystop = checked
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
TemplateRadioButton {
|
TemplateRadioButton {
|
||||||
text: qsTr("Bühlmannh deco")
|
text: qsTr("Bühlmannh deco")
|
||||||
Layout.columnSpan: 2
|
Layout.columnSpan: 2
|
||||||
|
checked: Backend.planner_deco_mode === Enums.BUEHLMANN
|
||||||
|
onClicked: {
|
||||||
|
Backend.planner_deco_mode = Enums.BUEHLMANN
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
TemplateLabel {
|
TemplateLabel {
|
||||||
|
@ -210,11 +230,12 @@ Kirigami.ScrollablePage {
|
||||||
from: 1
|
from: 1
|
||||||
to: 99
|
to: 99
|
||||||
stepSize: 1
|
stepSize: 1
|
||||||
value: 50
|
value: Backend.gflow
|
||||||
textFromValue: function (value, locale) {
|
textFromValue: function (value, locale) {
|
||||||
return value + volumeUnit
|
return value + volumeUnit
|
||||||
}
|
}
|
||||||
onValueModified: {
|
onValueModified: {
|
||||||
|
Backend.gflow = value
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -226,17 +247,22 @@ Kirigami.ScrollablePage {
|
||||||
from: 1
|
from: 1
|
||||||
to: 99
|
to: 99
|
||||||
stepSize: 1
|
stepSize: 1
|
||||||
value: 50
|
value: Backend.gfhigh
|
||||||
textFromValue: function (value, locale) {
|
textFromValue: function (value, locale) {
|
||||||
return value + volumeUnit
|
return value + volumeUnit
|
||||||
}
|
}
|
||||||
onValueModified: {
|
onValueModified: {
|
||||||
|
Backend.gfhigh = value
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
TemplateRadioButton {
|
TemplateRadioButton {
|
||||||
text: qsTr("VPM-B deco")
|
text: qsTr("VPM-B deco")
|
||||||
Layout.columnSpan: 2
|
Layout.columnSpan: 2
|
||||||
|
checked: Backend.planner_deco_mode === Enums.VPMB
|
||||||
|
onClicked: {
|
||||||
|
Backend.planner_deco_mode = Enums.VPMB
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
TemplateLabel {
|
TemplateLabel {
|
||||||
|
@ -247,12 +273,12 @@ Kirigami.ScrollablePage {
|
||||||
from: 0
|
from: 0
|
||||||
to: 4
|
to: 4
|
||||||
stepSize: 1
|
stepSize: 1
|
||||||
value: 2
|
value: Backend.vpmb_conservatism
|
||||||
textFromValue: function (value, locale) {
|
textFromValue: function (value, locale) {
|
||||||
return qsTr("+") + value
|
return qsTr("+") + value
|
||||||
}
|
}
|
||||||
onValueModified: {
|
onValueModified: {
|
||||||
console.log("got value: " + value)
|
Backend.vpmb_conservatism = value
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -264,11 +290,19 @@ Kirigami.ScrollablePage {
|
||||||
TemplateCheckBox {
|
TemplateCheckBox {
|
||||||
text: qsTr("Plan backgas breaks")
|
text: qsTr("Plan backgas breaks")
|
||||||
Layout.columnSpan: 2
|
Layout.columnSpan: 2
|
||||||
|
checked: Backend.last_stop6m
|
||||||
|
onClicked: {
|
||||||
|
Backend.last_stop6m = checked
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
TemplateCheckBox {
|
TemplateCheckBox {
|
||||||
text: qsTr("Only switch at required stops")
|
text: qsTr("Only switch at required stops")
|
||||||
Layout.columnSpan: 2
|
Layout.columnSpan: 2
|
||||||
|
checked: Backend.switch_at_req_stop
|
||||||
|
onClicked: {
|
||||||
|
Backend.switch_at_req_stop = checked
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
TemplateLabel {
|
TemplateLabel {
|
||||||
|
@ -278,12 +312,12 @@ Kirigami.ScrollablePage {
|
||||||
from: 0
|
from: 0
|
||||||
to: 4
|
to: 4
|
||||||
stepSize: 1
|
stepSize: 1
|
||||||
value: 2
|
value: Backend.min_switch_duration
|
||||||
textFromValue: function (value, locale) {
|
textFromValue: function (value, locale) {
|
||||||
return qsTr("+") + value
|
return qsTr("+") + value
|
||||||
}
|
}
|
||||||
onValueModified: {
|
onValueModified: {
|
||||||
console.log("got value: " + value)
|
Backend.min_switch_duration = value
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -294,12 +328,12 @@ Kirigami.ScrollablePage {
|
||||||
from: 0
|
from: 0
|
||||||
to: 4
|
to: 4
|
||||||
stepSize: 1
|
stepSize: 1
|
||||||
value: 2
|
value: Backend.surface_segment
|
||||||
textFromValue: function (value, locale) {
|
textFromValue: function (value, locale) {
|
||||||
return qsTr("+") + value
|
return qsTr("+") + value
|
||||||
}
|
}
|
||||||
onValueModified: {
|
onValueModified: {
|
||||||
console.log("got value: " + value)
|
Backend.surface_segment = value
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue