Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml =================================================================== diff -u -r1a46e7e1fd9da0fcfa8359a194610c55adfff04f -r4a3504bdb88da3e7ae9b5d43d5ab5b11c9b7f884 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml (.../PreTreatmentCreatePatientPrescription.qml) (revision 1a46e7e1fd9da0fcfa8359a194610c55adfff04f) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml (.../PreTreatmentCreatePatientPrescription.qml) (revision 4a3504bdb88da3e7ae9b5d43d5ab5b11c9b7f884) @@ -21,15 +21,13 @@ vTreatmentCreate.sodiumSet = true vTreatmentCreate.bicarbonateSet = true vTreatmentCreate.fluidBolusVolumeSet = true - vTreatmentCreate.primeDiscardVolumeSet = true vTreatmentCreate.rinsebackVolumeSet = true vTreatmentCreate.bloodPressureMeasureIntervalSet = true vTreatmentCreate.hepatitusBStatusSet = true vTreatmentCreate.sodium = vTreatmentRanges.dialysateSodiumDef vTreatmentCreate.bicarbonate = vTreatmentRanges.dialysateBicarbonateDef vTreatmentCreate.fluidBolusVolume = vTreatmentRanges.salineBolusVolumeDef - vTreatmentCreate.primeDiscardVolume = vTreatmentRanges.primeDiscardVolumeDef vTreatmentCreate.rinsebackVolume = vTreatmentRanges.rinsebackVolumeDef vTreatmentCreate.bloodPressureMeasureInterval = vTreatmentRanges.bloodPressureMeasureInterval[vTreatmentRanges.vitalsInterval] vTreatmentCreate.hepatitusBStatus = 0 @@ -39,7 +37,6 @@ _sodium .refresh() _bicarbonate .refresh() _fluidBolusVolume .refresh() - _primeDiscardVolume .refresh() _primeRinsebackVolume .refresh() _bpMeasurementIntervalControl .refresh() _hepatitusStatusControl .refresh() @@ -49,7 +46,6 @@ _sodium .clear() _bicarbonate .clear() _fluidBolusVolume .clear() - _primeDiscardVolume .clear() _primeRinsebackVolume .clear() _bpMeasurementIntervalControl .clear() _hepatitusStatusControl . clear() @@ -59,7 +55,6 @@ return _sodium .isActive && _sodium .valid && _bicarbonate .isActive && _bicarbonate .valid && _fluidBolusVolume .isActive && _fluidBolusVolume .valid && - _primeDiscardVolume .isActive && _primeDiscardVolume .valid && _primeRinsebackVolume .isActive && _primeRinsebackVolume .valid && _bpMeasurementIntervalControl .isActive && _bpMeasurementInterval .valid && _hepatitusStatusControl .isActive && _hepatitusStatus .valid @@ -128,26 +123,6 @@ } } - LabelUnitValueAdjuster { id: _primeDiscardVolume - text : qsTr("Prime Discard Volume") - unitText : Variables.unitTextFluid - valid : ! vTreatmentCreate.primeDiscardVolumeRejectReason - width : _root.cellWidth - height : _root.cellHeight - editable : _root.editingEnabled - minimum : vTreatmentRanges.primeDiscardVolumeMin - maximum : vTreatmentRanges.primeDiscardVolumeMax - step : vTreatmentRanges.primeDiscardVolumeRes - defaultValue : vTreatmentRanges.primeDiscardVolumeDef - value : vTreatmentCreate.primeDiscardVolume - isActive : vTreatmentCreate.primeDiscardVolumeSet - onDidActiveChange : function(vState) { vTreatmentCreate.primeDiscardVolumeSet = vState } - onDidChange : function(vValue) { - if ( ! _primeDiscardVolume.valid ) { vTreatmentCreate.primeDiscardVolumeRejectReason = Variables.noRejectReason } - vTreatmentCreate.primeDiscardVolume = vValue - } - } - LabelUnitValueAdjuster { id: _primeRinsebackVolume text : qsTr("Prime Rinseback Volume") unitText : Variables.unitTextFluid