Index: sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml =================================================================== diff -u -r493c6653bc98492d200bfd82abd6abf9af8d29ca -rc9764bd0ad823c5c1725d7c7f556290c2c459d4d --- sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml (.../TreatmentFlows.qml) (revision 493c6653bc98492d200bfd82abd6abf9af8d29ca) +++ sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml (.../TreatmentFlows.qml) (revision c9764bd0ad823c5c1725d7c7f556290c2c459d4d) @@ -27,7 +27,7 @@ * \brief Treatment Screen Flows section */ TreatmentSection { id: _root - property bool editEnabled : header.editEnabled + property bool editEnabled : true header.title : qsTr("Treatment Parameters") header.showLock : true @@ -46,41 +46,53 @@ title : qsTr("Blood Flow") height : _row.cellHeight width : _row.cellWidth - value : Variables.notSetVariable(vTreatmentParametersSetPoint.bloodFlow.toFixed(Variables.bloodFlowPrecision)) + value : vTreatmentParametersSetPoint.bloodFlow + precision : Variables.bloodFlowPrecision + minimum : vTreatmentRanges.bloodFlowRateMin + maximum : vTreatmentRanges.bloodFlowRateMax + step : vTreatmentRanges.bloodFlowRateRes unitText : Variables.unitTextFlowRate - buttonsEnabled : editEnabled + buttonsEnabled : editEnabled // LEAHI-PRS-376 - onIncrement : print(" increment blood flow") - onDecrement : print(" decrement blood flow") + onIncrement : function(newValue) { vTreatmentAdjustmentBloodFlowRate.doAdjustment(newValue) } + onDecrement : function(newValue) { vTreatmentAdjustmentBloodFlowRate.doAdjustment(newValue) } } TreatmentFlowsComponent { id: _dialysateFlow objectName : "dialysateFlowComponent" title : qsTr("Dialysate Flow") height : _row.cellHeight width : _row.cellWidth - value : vTreatmentParametersSetPoint.dialysateFlow.toFixed(Variables.dialysateFlowPrecision) // Need to show 0 value + value : vTreatmentParametersSetPoint.dialysateFlow + precision : Variables.dialysateFlowPrecision + minimum : vTreatmentRanges.dialysateFlowRateMin + maximum : vTreatmentRanges.dialysateFlowRateMax + step : vTreatmentRanges.dialysateFlowRateRes unitText : Variables.unitTextFlowRate - buttonsEnabled : editEnabled + buttonsEnabled : isTreatmentEnd ? false : editEnabled // LEAHI-PRS-376 extraText : vTreatmentParametersSetPoint.dialysateFlow === 0 ? qsTr("OFF") : ! vDDGenDialysate.isDialGood ? qsTr("Bypass") : "" - onIncrement : print(" increment dial flow") - onDecrement : print(" decrement dial flow") + onIncrement : function(newValue) { vTreatmentAdjustmentDialysateFlowRate.doAdjustment(newValue) } + onDecrement : function(newValue) { vTreatmentAdjustmentDialysateFlowRate.doAdjustment(newValue) } } TreatmentFlowsComponent { id: _dialysateTemp objectName : "dialysateTempComponent" title : qsTr("Dialysate Temp.") height : _row.cellHeight width : _row.cellWidth - value : Variables.notSetVariable(vTreatmentParametersSetPoint.dialysateTemp.toFixed(Variables.dialysateTempPrecision)) + value : vTreatmentParametersSetPoint.dialysateTemp + precision : Variables.dialysateTempPrecision + minimum : vTreatmentRanges.dialysateTempMin + maximum : vTreatmentRanges.dialysateTempMax + step : vTreatmentRanges.dialysateTempRes unitText : Variables.unitTextTemperature - buttonsEnabled : editEnabled + buttonsEnabled : isTreatmentEnd ? false : editEnabled // LEAHI-PRS-376 - onIncrement : print(" increment dial temp") - onDecrement : print(" decrement dial temp") + onIncrement : function(newValue) { vTreatmentAdjustmentDialysateTemperature.doAdjustment(newValue) } + onDecrement : function(newValue) { vTreatmentAdjustmentDialysateTemperature.doAdjustment(newValue) } } TreatmentFlowsComponent { id: _dialysateCond @@ -92,9 +104,6 @@ unitText : Variables.unitTextDialCond showButtons : false dropShadowEnabled : false - - onIncrement : print(" increment dial cond") - onDecrement : print(" decrement dial cond") } } }