Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentSetPoints.qml =================================================================== diff -u -r62797b3c6e0539e22a04404e16daa7c4465e178f -re1816d3c0bcda6e4810d634a02160c1aab41e643 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentSetPoints.qml (.../TreatmentAdjustmentSetPoints.qml) (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentSetPoints.qml (.../TreatmentAdjustmentSetPoints.qml) (revision e1816d3c0bcda6e4810d634a02160c1aab41e643) @@ -29,7 +29,13 @@ */ TreatmentAdjustmentBase { id: _root objectName: "_TreatmentAdjustmentFlow" // SquishQt testability - + + readonly property alias bloodFlowRate : _bloodFlowRate.value + readonly property alias dialysateFlowRate : _dialysateFlowRate.value + readonly property alias dialysateTemperature : _dialysateTemperature.value + readonly property alias acidConcentrate : _acidConcentrateComboBox.currentIndex + readonly property alias bicarbConcentrate : _bicarbConcentrateComboBox.currentIndex + QtObject { id: _private objectName: "_private" readonly property int containerWidth: (_root.width - (Variables.defaultMargin * 5))/2 @@ -170,16 +176,16 @@ } } - LabelUnitContainer { id: _bicarbonateConcentrate - objectName : "_bicarbonateConcentrate" + LabelUnitContainer { id: _bicarbConcentrate + objectName : "_bicarbConcentrate" width : _private.containerWidth height : Variables.adjustmentLabelUnitContainerHeight text : qsTr("Bicarbonate Concentrate") titleFontPixelSize : _private.titleFontPixelSize unitFontPixelSize : _private.unitFontPixelSize - contentItem: BaseComboBox { id: _bicarbonateConcentrateComboBox - objectName : "_bicarbonateConcentrateComboBox" + contentItem: BaseComboBox { id: _bicarbConcentrateComboBox + objectName : "_bicarbConcentrateComboBox" anchors { topMargin : Variables.defaultMargin / 2 bottomMargin: anchors.topMargin @@ -192,8 +198,8 @@ model : vTreatmentRanges.bicarbonateConcentrateOptions onClear : vTreatmentCreate.bicarbonateConcentrateSet = false onActivated : { - if ( ! _bicarbonateConcentrate.valid ) { vTreatmentCreate.bicarbonateConcentrateRejectReason = Variables.noRejectReason } - vTreatmentCreate.bicarbonateConcentrate = _bicarbonateConcentrateComboBox.currentIndex + if ( ! _bicarbConcentrate.valid ) { vTreatmentCreate.bicarbonateConcentrateRejectReason = Variables.noRejectReason } + vTreatmentCreate.bicarbonateConcentrate = _bicarbConcentrateComboBox.currentIndex vTreatmentCreate.bicarbonateConcentrateSet = true } }