Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentSetPoints.qml =================================================================== diff -u -re1816d3c0bcda6e4810d634a02160c1aab41e643 -r0b3f64864baf035e222dc42f042929fde766217a --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentSetPoints.qml (.../TreatmentAdjustmentSetPoints.qml) (revision e1816d3c0bcda6e4810d634a02160c1aab41e643) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentSetPoints.qml (.../TreatmentAdjustmentSetPoints.qml) (revision 0b3f64864baf035e222dc42f042929fde766217a) @@ -38,9 +38,9 @@ QtObject { id: _private objectName: "_private" - readonly property int containerWidth: (_root.width - (Variables.defaultMargin * 5))/2 - readonly property int titleFontPixelSize: Fonts.fontPixelContainerTitleSmall - readonly property int unitFontPixelSize: Fonts.fontPixelContainerUnitSmall + readonly property int containerWidth : (_root.width - (Variables.defaultMargin * 5))/2 + readonly property int titleFontPixelSize : Fonts.fontPixelContainerTitleSmall + readonly property int unitFontPixelSize : Fonts.fontPixelContainerUnitSmall } titleText: qsTr("Treatment Parameters") @@ -70,22 +70,22 @@ Item { id: _contentArea objectName: "_contentArea" anchors { - top: parent.top - bottom: _confirmButton.top - left: parent.left - leftMargin: Variables.defaultMargin * 2 - right: parent.right - rightMargin: anchors.leftMargin + top : parent.top + bottom : _confirmButton.top + left : parent.left + leftMargin : Variables.defaultMargin * 2 + right : parent.right + rightMargin : anchors.leftMargin } Row { id: _controlRow - objectName: "_controlRow" - anchors.centerIn: parent - spacing: Variables.defaultMargin + objectName : "_controlRow" + anchors.centerIn : parent + spacing : Variables.defaultMargin Column { id: _controlLeftColumn - objectName: "_controlLeftColumn" - spacing: Variables.defaultMargin + objectName : "_controlLeftColumn" + spacing : Variables.defaultMargin LabelUnitValueAdjuster { id: _bloodFlowRate objectName : "_bloodFlowRate" @@ -148,8 +148,7 @@ titleFontPixelSize : _private.titleFontPixelSize unitFontPixelSize : _private.unitFontPixelSize showEdit : true - // valid : ! vTreatmentCreate.acidConcentrateRejectReason - onEditClicked : _acidConcentrateAdjustment.open() + onEditClicked : _acidConcentrateAdjustment.open() contentItem: BaseComboBox { id: _acidConcentrateComboBox objectName : "_acidConcentrateComboBox" @@ -163,6 +162,7 @@ isActive : vTreatmentCreate.acidConcentrateSet currentIndex : vTreatmentCreate.acidConcentrate model : vTreatmentRanges.acidConcentrateOptions + onClear : { vTreatmentRanges.doClearAcidConcentrate(vTreatmentCreate.acidConcentrateSet) vTreatmentCreate.acidConcentrateSet = false @@ -197,6 +197,7 @@ currentIndex : vTreatmentCreate.bicarbonateConcentrate model : vTreatmentRanges.bicarbonateConcentrateOptions onClear : vTreatmentCreate.bicarbonateConcentrateSet = false + onActivated : { if ( ! _bicarbConcentrate.valid ) { vTreatmentCreate.bicarbonateConcentrateRejectReason = Variables.noRejectReason } vTreatmentCreate.bicarbonateConcentrate = _bicarbConcentrateComboBox.currentIndex @@ -263,9 +264,7 @@ } isDefault : true - onClicked : { - _root.confirmClicked() - } + onClicked : { _root.confirmClicked() } } } }