Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -r2fcd1a1722285e5e741b89176ad21989eb0f56f5 -r9327fae7b109203ca698d361b113a81d139a0cf9 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 2fcd1a1722285e5e741b89176ad21989eb0f56f5) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 9327fae7b109203ca698d361b113a81d139a0cf9) @@ -40,9 +40,9 @@ objectName: "TreatmentCreateFlickable" anchors { top : _root.title.bottom - topMargin : 15 + topMargin : Variables.minVGap bottom : _root.bottom - bottomMargin : Variables.notificationHeight + 15 + bottomMargin : Variables.notificationHeight + Variables.minVGap horizontalCenter: parent.horizontalCenter } width: parent.width @@ -77,13 +77,12 @@ SliderCreateTreatment { id: _bloodFlowRate objectName: "_bloodFlowRate" - sliderObjectName: objectName + "Slider" - selectedValueObjectName: objectName + "Value" - min: vTreatmentCreate.bloodFlowRateMin - max: vTreatmentCreate.bloodFlowRateMax - step: vTreatmentCreate.bloodFlowRateRes - text: qsTr("Blood Flow Rate") - units: qsTr("mL/min") + value : vTreatmentCreate.bloodFlowRate + min : vTreatmentCreate.bloodFlowRateMin + max : vTreatmentCreate.bloodFlowRateMax + step : vTreatmentCreate.bloodFlowRateRes + text : qsTr("Blood Flow Rate") + units : Variables.unitTextFlowRate onPressed: { setInteractive(false) vTreatmentCreate.bloodFlowRate = value @@ -96,13 +95,12 @@ SliderCreateTreatment { id: _dialysateFlowRate objectName: "_dialysateFlowRate" - sliderObjectName: objectName + "Slider" - selectedValueObjectName: objectName + "Value" - min: vTreatmentCreate.dialysateFlowRateMin - max: vTreatmentCreate.dialysateFlowRateMax - step: vTreatmentCreate.dialysateFlowRateRes - text: qsTr("Dialysate Flow Rate") - units: qsTr("mL/min") + value : vTreatmentCreate.dialysateFlowRate + min : vTreatmentCreate.dialysateFlowRateMin + max : vTreatmentCreate.dialysateFlowRateMax + step : vTreatmentCreate.dialysateFlowRateRes + text : qsTr("Dialysate Flow Rate") + units : Variables.unitTextFlowRate onPressed: { setInteractive(false) vTreatmentCreate.dialysateFlowRate = value @@ -115,13 +113,12 @@ SliderCreateTreatment { id: _duration objectName: "_duration" - sliderObjectName: objectName + "Slider" - selectedValueObjectName: objectName + "Value" - min: vTreatmentCreate.durationMin - max: vTreatmentCreate.durationMax - step: vTreatmentCreate.durationRes - text: qsTr("Duration") - units: qsTr("min") + value : vTreatmentCreate.duration + min : vTreatmentCreate.durationMin + max : vTreatmentCreate.durationMax + step : vTreatmentCreate.durationRes + text : qsTr("Duration") + units : Variables.unitTextDuration onPressed: { setInteractive(false) vTreatmentCreate.duration = value @@ -134,13 +131,12 @@ SliderCreateTreatment { id: _heparinDispensingRate objectName: "_heparinDispensingRate" - sliderObjectName: objectName + "Slider" - selectedValueObjectName: objectName + "Value" - min: vTreatmentCreate.heparinDispensingRateMin - max: vTreatmentCreate.heparinDispensingRateMax - step: vTreatmentCreate.heparinDispensingRateRes - text: qsTr("Heparin Dispensing Rate") - units: qsTr("mL/hr") + value : vTreatmentCreate.heparinDispensingRate + min : vTreatmentCreate.heparinDispensingRateMin + max : vTreatmentCreate.heparinDispensingRateMax + step : vTreatmentCreate.heparinDispensingRateRes + text : qsTr("Heparin Dispensing Rate") + units : Variables.unitTextDispencingRate onPressed: { setInteractive(false) vTreatmentCreate.heparinDispensingRate = value @@ -153,14 +149,12 @@ SliderCreateTreatment { id: _heparinBolusVolume objectName: "_heparinBolusVolume" - sliderObjectName: objectName + "Slider" - selectedValueObjectName: objectName + "Value" - min: vTreatmentCreate.heparinBolusVolumeMin - max: vTreatmentCreate.heparinBolusVolumeMax - step: vTreatmentCreate.heparinBolusVolumeRes - - text: qsTr("Heparin Bolus Volume") - units: qsTr("mL") + value : vTreatmentCreate.heparinBolusVolume + min : vTreatmentCreate.heparinBolusVolumeMin + max : vTreatmentCreate.heparinBolusVolumeMax + step : vTreatmentCreate.heparinBolusVolumeRes + text : qsTr("Heparin Bolus Volume") + units : Variables.unitTextFluid onPressed: { setInteractive(false) vTreatmentCreate.heparinBolusVolume = value @@ -173,13 +167,12 @@ SliderCreateTreatment { id: _heparinStopTime objectName: "_heparinStopTime" - sliderObjectName: objectName + "Slider" - selectedValueObjectName: objectName + "Value" - min: vTreatmentCreate.heparinStopTimeMin - max: vTreatmentCreate.heparinStopTimeMax - step: vTreatmentCreate.heparinStopTimeRes - text: qsTr("Heparin Stop Time") - units: qsTr("min") + value : vTreatmentCreate.heparinStopTime + min : vTreatmentCreate.heparinStopTimeMin + max : vTreatmentCreate.heparinStopTimeMax + step : vTreatmentCreate.heparinStopTimeRes + text : qsTr("Heparin Stop Time") + units : Variables.unitTextDuration onPressed: { setInteractive(false) vTreatmentCreate.heparinStopTime = value @@ -190,16 +183,14 @@ } } - SliderCreateTreatment { - id: _salineBolus + SliderCreateTreatment { id: _salineBolus objectName: "_salineBolus" - sliderObjectName: objectName + "Slider" - selectedValueObjectName: objectName + "Value" - text: "Saline Bolus" - units: qsTr("mL") - min: vTreatmentCreate.salineBolusVolumeMin - max: vTreatmentCreate.salineBolusVolumeMax - step: vTreatmentCreate.salineBolusVolumeRes + value : vTreatmentCreate.salineBolusVolume + min : vTreatmentCreate.salineBolusVolumeMin + max : vTreatmentCreate.salineBolusVolumeMax + step : vTreatmentCreate.salineBolusVolumeRes + text : "Saline Bolus" + units : Variables.unitTextFluid onPressed: { setInteractive(false) vTreatmentCreate.salineBolusVolume = value @@ -218,19 +209,18 @@ font.bold: true } - GridSelection { - id: _acidConcentrate - objectName: "_acidConcentrateRect" - name: qsTr("Acid Concentrate") - buttonNames: vTreatmentCreate.acidConcentrateOptions + GridSelection { id: _acidConcentrate + objectName : "_acidConcentrateRect" + name : qsTr("Acid Concentrate") + buttonNames : vTreatmentCreate.acidConcentrateOptions onButtonClicked: { vTreatmentCreate.acidConcentrate = selectedIndex } } GridSelection { id: _bicarbonateConcentrate - objectName: "_bicarbonateConcentrateRect" - name: qsTr("Bicarbonate Concentrate") + objectName : "_bicarbonateConcentrateRect" + name : qsTr("Bicarbonate Concentrate") numRows: 1 numCols: 2 buttonNames: vTreatmentCreate.bicarbonateConcentrateOptions @@ -252,13 +242,12 @@ SliderCreateTreatment { id: _dialysateTemperature objectName: "_dialysateTemperature" - sliderObjectName: objectName + "Slider" - selectedValueObjectName: objectName + "Value" - min: vTreatmentCreate.dialysateTempMin - max: vTreatmentCreate.dialysateTempMax - step: vTreatmentCreate.dialysateTempRes - text: qsTr("Dialysate Temperature") - units: qsTr("C") + value : vTreatmentCreate.dialysateTemp + min : vTreatmentCreate.dialysateTempMin + max : vTreatmentCreate.dialysateTempMax + step : vTreatmentCreate.dialysateTempRes + text : qsTr("Dialysate Temperature") + units : Variables.unitTextTemperature onPressed: { setInteractive(false) vTreatmentCreate.dialysateTemp = value @@ -403,13 +392,12 @@ SliderCreateTreatment { id: _bloodPressureMeasurementInterval objectName: "_bloodPressureMeasurementInterval" - sliderObjectName: objectName + "Slider" - selectedValueObjectName: objectName + "Value" - text: qsTr("Blood Pressure Measurement Interval") - units: Variables.unitTextBPMeasurementInterval - min: vTreatmentCreate.bloodPressureMeasureIntervalMin - max: vTreatmentCreate.bloodPressureMeasureIntervalMax - step: vTreatmentCreate.bloodPressureMeasureIntervalRes + value : vTreatmentCreate.bloodPressureMeasureInterval + min : vTreatmentCreate.bloodPressureMeasureIntervalMin + max : vTreatmentCreate.bloodPressureMeasureIntervalMax + step : vTreatmentCreate.bloodPressureMeasureIntervalRes + text : qsTr("Blood Pressure Measurement Interval") + units : Variables.unitTextDuration stepSnap: true onPressed: { setInteractive(false) @@ -423,13 +411,12 @@ SliderCreateTreatment { id: _rinsebackFlowRate objectName: "_rinsebackFlowRate" - sliderObjectName: objectName + "Slider" - selectedValueObjectName: objectName + "Value" - text: qsTr("Rinseback Flow Rate") - units: Variables.unitTextFlowRate - min: vTreatmentCreate.rinsebackFlowRateMin - max: vTreatmentCreate.rinsebackFlowRateMax - step: vTreatmentCreate.rinsebackFlowRateRes + value : vTreatmentCreate.rinsebackFlowRate + min : vTreatmentCreate.rinsebackFlowRateMin + max : vTreatmentCreate.rinsebackFlowRateMax + step : vTreatmentCreate.rinsebackFlowRateRes + text : qsTr("Rinseback Flow Rate") + units : Variables.unitTextFlowRate stepSnap: true onPressed: { setInteractive(false)