Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -r159f2bb0317c7c3c0336e4cb80c7fef3f87e329a -r4915f20a9cb718df9f8c7fc9a9a63e83de8fec07 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 159f2bb0317c7c3c0336e4cb80c7fef3f87e329a) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 4915f20a9cb718df9f8c7fc9a9a63e83de8fec07) @@ -43,8 +43,7 @@ _bicarbonateConcentrate .active && _dialyzerType .active && _dialysateTemperature .active && _dialysateTemperature . valid && - _bloodPressureInterval .active && _bloodPressureInterval . valid && - _rinsebackFlowRate .active && _rinsebackFlowRate . valid + _bloodPressureInterval .active && _bloodPressureInterval . valid Connections{ target:vTreatmentCreate // Update flicker location to show the invalid parameter @@ -64,7 +63,6 @@ if ( vTreatmentCreate. dialysateTempRejectReason ) { scrollTo( _dialysateTemperature ); return } if ( vTreatmentCreate.bloodPressureMeasureIntervalRejectReason ) { scrollTo( _bloodPressureInterval ); return } - if ( vTreatmentCreate. rinsebackFlowRateRejectReason ) { scrollTo( _rinsebackFlowRate ); return } } } @@ -805,24 +803,6 @@ } } - SliderCreateTreatment { id: _rinsebackFlowRate - objectName : "_rinsebackFlowRate" - label : qsTr("Rinseback Flow Rate") - flickable : _flickable - unit : Variables.unitTextFlowRate - minimum : vTreatmentRanges.rinsebackFlowRateMin - maximum : vTreatmentRanges.rinsebackFlowRateMax - step : vTreatmentRanges.rinsebackFlowRateRes - value : vTreatmentRanges.rinsebackFlowRateDef - valid : !vTreatmentCreate.rinsebackFlowRateRejectReason - onValueChanged: { - // Reset the valid state to allow repositioning to the next invalid parameter - if(!valid) { - vTreatmentCreate.rinsebackFlowRateRejectReason = Variables.noRejectReason - } - vTreatmentCreate.rinsebackFlowRate = value - } - } Item { width : 50 height : 50 Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml =================================================================== diff -u -r159f2bb0317c7c3c0336e4cb80c7fef3f87e329a -r4915f20a9cb718df9f8c7fc9a9a63e83de8fec07 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml (.../PreTreatmentCreateStack.qml) (revision 159f2bb0317c7c3c0336e4cb80c7fef3f87e329a) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml (.../PreTreatmentCreateStack.qml) (revision 4915f20a9cb718df9f8c7fc9a9a63e83de8fec07) @@ -107,9 +107,10 @@ Connections { target: _pretreatmentCreate function onBackClicked ( ) { pagePatientID ()} function onConfirmClicked ( ) { - vTreatmentCreate.arterialPressureLimitWindow = vTreatmentRanges.arterialPressureLimitWindowDef // these three don't have a user option on create treatment, so sending the default. - vTreatmentCreate.venousPressureLimitWindow = vTreatmentRanges.venousPressureLimitWindowDef // these three don't have a user option on create treatment, so sending the default. - vTreatmentCreate.venousPressureLimitAsymtrc = vTreatmentRanges.venousPressureLimitAsymtrcDef // these three don't have a user option on create treatment, so sending the default. + vTreatmentCreate.arterialPressureLimitWindow = vTreatmentRanges.arterialPressureLimitWindowDef // these parameters don't have a user option on create treatment, so sending the default. + vTreatmentCreate.venousPressureLimitWindow = vTreatmentRanges.venousPressureLimitWindowDef // these parameters don't have a user option on create treatment, so sending the default. + vTreatmentCreate.venousPressureLimitAsymtrc = vTreatmentRanges.venousPressureLimitAsymtrcDef // these parameters don't have a user option on create treatment, so sending the default. + vTreatmentCreate.rinsebackFlowRate = vTreatmentRanges.rinsebackFlowRateDef // these parameters don't have a user option on create treatment, so sending the default. vTreatmentCreate.doValidation ( ) } } Index: sources/view/hd/data/VTreatmentRanges.cpp =================================================================== diff -u -r159f2bb0317c7c3c0336e4cb80c7fef3f87e329a -r4915f20a9cb718df9f8c7fc9a9a63e83de8fec07 --- sources/view/hd/data/VTreatmentRanges.cpp (.../VTreatmentRanges.cpp) (revision 159f2bb0317c7c3c0336e4cb80c7fef3f87e329a) +++ sources/view/hd/data/VTreatmentRanges.cpp (.../VTreatmentRanges.cpp) (revision 4915f20a9cb718df9f8c7fc9a9a63e83de8fec07) @@ -125,6 +125,6 @@ FROMVARIANT ( rinsebackFlowRateMin , "Rinseback Flow Rate Ranges" , "Rinseback_Flow_Rate_Min" , UInt ); FROMVARIANT ( rinsebackFlowRateMax , "Rinseback Flow Rate Ranges" , "Rinseback_Flow_Rate_Max" , UInt ); - FROMVARIANT ( rinsebackFlowRateRes , "Rinseback Flow Rate Ranges" , "Rinseback_Flow_Rate_Res" , UInt ); +// FROMVARIANT ( rinsebackFlowRateRes , "Rinseback Flow Rate Ranges" , "Rinseback_Flow_Rate_Res" , UInt ); FROMVARIANT ( rinsebackFlowRateDef , "Rinseback Flow Rate Ranges" , "Rinseback_Flow_Rate_Def" , UInt ); }