Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r29a44b6e5908da155195c138b5e522fa8ce90fb4 -r4a3504bdb88da3e7ae9b5d43d5ab5b11c9b7f884 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 29a44b6e5908da155195c138b5e522fa8ce90fb4) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 4a3504bdb88da3e7ae9b5d43d5ab5b11c9b7f884) @@ -668,7 +668,6 @@ mData += vData.mDialyzerType ; mData += vData.mFluidBolusVolume ; mData += vData.mBloodPressureMeasureInterval ; - mData += vData.mPrimeDiscardVolume ; mData += vData.mRinsebackVolume ; mData += vData.mHepatitusBStatus ; mData += vData.mSubstitutionFluidVolume ; Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r29a44b6e5908da155195c138b5e522fa8ce90fb4 -r4a3504bdb88da3e7ae9b5d43d5ab5b11c9b7f884 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 29a44b6e5908da155195c138b5e522fa8ce90fb4) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 4a3504bdb88da3e7ae9b5d43d5ab5b11c9b7f884) @@ -221,8 +221,8 @@ {Gui::GuiActionType::ID_AdjustInitTreatmentReq , 1 * 4 }, // 1 parameters each 4bytes {Gui::GuiActionType::ID_AdjustInitTreatmentRsp , 2 * 4 }, // 2 parameters each 4bytes // Pre-Treatment Treatment Parameters Validation/Confirm - {Gui::GuiActionType::ID_AdjustParametersValidationReq , 25 * 4 }, //23 parameters each 4bytes - {Gui::GuiActionType::ID_AdjustParametersValidationRsp , 26 * 4 }, //24 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustParametersValidationReq , 24 * 4 }, //23 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustParametersValidationRsp , 25 * 4 }, //24 parameters each 4bytes {Gui::GuiActionType::ID_AdjustParametersConfirmReq , 1 * 4 }, // 1 parameters each 4bytes // Pre-Treatment Water Sample {Gui::GuiActionType::ID_DGFilterFlushData , 2 * 4 }, // 2 parameters each 4bytes Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml =================================================================== diff -u -r29a44b6e5908da155195c138b5e522fa8ce90fb4 -r4a3504bdb88da3e7ae9b5d43d5ab5b11c9b7f884 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision 29a44b6e5908da155195c138b5e522fa8ce90fb4) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision 4a3504bdb88da3e7ae9b5d43d5ab5b11c9b7f884) @@ -65,7 +65,6 @@ vTreatmentCreate.sodiumSet = true vTreatmentCreate.bicarbonateSet = true vTreatmentCreate.fluidBolusVolumeSet = true - vTreatmentCreate.primeDiscardVolumeSet = true vTreatmentCreate.rinsebackVolumeSet = true vTreatmentCreate.bloodPressureMeasureIntervalSet = true vTreatmentCreate.hepatitusBStatusSet = true @@ -97,7 +96,6 @@ vTreatmentCreate.dialyzerTypeRejectReason = Variables.noRejectReason vTreatmentCreate.fluidBolusVolumeRejectReason = Variables.noRejectReason vTreatmentCreate.bloodPressureMeasureIntervalRejectReason = Variables.noRejectReason - vTreatmentCreate.primeDiscardVolumeRejectReason = Variables.noRejectReason vTreatmentCreate.rinsebackVolumeRejectReason = Variables.noRejectReason vTreatmentCreate.hepatitusBStatusRejectReason = Variables.noRejectReason vTreatmentCreate.substitutionFluidVolumeRejectReason = Variables.noRejectReason 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 Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp =================================================================== diff -u -r4a7dd11138d2321f1ab8d324b3bd25f02eaefe84 -r4a3504bdb88da3e7ae9b5d43d5ab5b11c9b7f884 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp (.../MPreTreatmentAdjustParametersValidationResponse.cpp) (revision 4a7dd11138d2321f1ab8d324b3bd25f02eaefe84) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp (.../MPreTreatmentAdjustParametersValidationResponse.cpp) (revision 4a3504bdb88da3e7ae9b5d43d5ab5b11c9b7f884) @@ -32,7 +32,6 @@ _data.mDialyzerTypeRejectionReason .value, _data.mFluidBolusVolumeRejectionReason .value, _data.mBloodPressureMeasureIntervalRejectionReason .value, - _data.mPrimeDiscardVolumeRejectionReason .value, _data.mRinsebackVolumeRejectionReason .value, _data.mHepatitusBStatusRejectionReason .value, _data.mSubstitutionFluidVolumeRejectionReason .value, @@ -62,7 +61,6 @@ if ( ! GetValue(vByteArray, index, _data.mDialyzerTypeRejectionReason )) goto lError; if ( ! GetValue(vByteArray, index, _data.mFluidBolusVolumeRejectionReason )) goto lError; if ( ! GetValue(vByteArray, index, _data.mBloodPressureMeasureIntervalRejectionReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mPrimeDiscardVolumeRejectionReason )) goto lError; if ( ! GetValue(vByteArray, index, _data.mRinsebackVolumeRejectionReason )) goto lError; if ( ! GetValue(vByteArray, index, _data.mHepatitusBStatusRejectionReason )) goto lError; if ( ! GetValue(vByteArray, index, _data.mSubstitutionFluidVolumeRejectionReason )) goto lError; @@ -98,7 +96,6 @@ data.mDialyzerTypeRejectionReason = _data.mDialyzerTypeRejectionReason .value; data.mFluidBolusVolumeRejectionReason = _data.mFluidBolusVolumeRejectionReason .value; data.mBloodPressureMeasureIntervalRejectionReason = _data.mBloodPressureMeasureIntervalRejectionReason .value; - data.mPrimeDiscardVolumeRejectionReason = _data.mPrimeDiscardVolumeRejectionReason .value; data.mRinsebackVolumeRejectionReason = _data.mRinsebackVolumeRejectionReason .value; data.mHepatitusBStatusRejectionReason = _data.mHepatitusBStatusRejectionReason .value; data.mSubstitutionFluidVolumeRejectionReason = _data.mSubstitutionFluidVolumeRejectionReason .value; Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h =================================================================== diff -u -r48b04367d9f229104e4048783df91089d0106379 -r4a3504bdb88da3e7ae9b5d43d5ab5b11c9b7f884 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h (.../MPreTreatmentAdjustParametersValidationResponse.h) (revision 48b04367d9f229104e4048783df91089d0106379) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h (.../MPreTreatmentAdjustParametersValidationResponse.h) (revision 4a3504bdb88da3e7ae9b5d43d5ab5b11c9b7f884) @@ -49,18 +49,17 @@ * | #12:(U32) | \ref Data::mDialyzerTypeRejectionReason | * | #13:(U32) | \ref Data::mFluidBolusVolumeRejectionReason | * | #14:(U32) | \ref Data::mBloodPressureMeasureIntervalRejectionReason | - * | #15:(U32) | \ref Data::mPrimeDiscardVolumeRejectionReason | - * | #16:(U32) | \ref Data::mRinsebackVolumeRejectionReason | - * | #17:(U32) | \ref Data::mHepatitusBStatusRejectionReason | - * | #18:(U32) | \ref Data::mSubstitutionFluidVolumeRejectionReason | - * | #19:(U32) | \ref Data::mHeparinBolusVolumeRejectionReason | - * | #20:(U32) | \ref Data::mHeparinDispensingRateRejectionReason | - * | #21:(U32) | \ref Data::mDialysateTempRejectionReason | - * | #22:(U32) | \ref Data::mAcidConcentrateConversionFactorRejectionReason | - * | #23:(U32) | \ref Data::mUFVolumeRejectionReason | - * | #24:(U32) | \ref Data::mUFPreWeightRejectionReason | - * | #25:(U32) | \ref Data::mUFEstimatedTargetWeightRejectionReason | - * | #26:(U32) | \ref Data::mAcidConcentrateIndexRejectionReason | + * | #15:(U32) | \ref Data::mRinsebackVolumeRejectionReason | + * | #16:(U32) | \ref Data::mHepatitusBStatusRejectionReason | + * | #17:(U32) | \ref Data::mSubstitutionFluidVolumeRejectionReason | + * | #18:(U32) | \ref Data::mHeparinBolusVolumeRejectionReason | + * | #19:(U32) | \ref Data::mHeparinDispensingRateRejectionReason | + * | #20:(U32) | \ref Data::mDialysateTempRejectionReason | + * | #21:(U32) | \ref Data::mAcidConcentrateConversionFactorRejectionReason | + * | #22:(U32) | \ref Data::mUFVolumeRejectionReason | + * | #23:(U32) | \ref Data::mUFPreWeightRejectionReason | + * | #24:(U32) | \ref Data::mUFEstimatedTargetWeightRejectionReason | + * | #25:(U32) | \ref Data::mAcidConcentrateIndexRejectionReason | * * \sa Data * @@ -93,7 +92,6 @@ Types::U32 mDialyzerTypeRejectionReason ; Types::U32 mFluidBolusVolumeRejectionReason ; Types::U32 mBloodPressureMeasureIntervalRejectionReason ; - Types::U32 mPrimeDiscardVolumeRejectionReason ; Types::U32 mRinsebackVolumeRejectionReason ; Types::U32 mHepatitusBStatusRejectionReason ; Types::U32 mSubstitutionFluidVolumeRejectionReason ; @@ -128,7 +126,6 @@ quint32 mDialyzerTypeRejectionReason = 0; quint32 mFluidBolusVolumeRejectionReason = 0; quint32 mBloodPressureMeasureIntervalRejectionReason = 0; - quint32 mPrimeDiscardVolumeRejectionReason = 0; quint32 mRinsebackVolumeRejectionReason = 0; quint32 mHepatitusBStatusRejectionReason = 0; quint32 mSubstitutionFluidVolumeRejectionReason = 0; Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h =================================================================== diff -u -r48b04367d9f229104e4048783df91089d0106379 -r4a3504bdb88da3e7ae9b5d43d5ab5b11c9b7f884 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision 48b04367d9f229104e4048783df91089d0106379) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision 4a3504bdb88da3e7ae9b5d43d5ab5b11c9b7f884) @@ -85,18 +85,17 @@ * | #11:(U32) | \ref mDialyzerType | * | #12:(U32) | \ref mFluidBolusVolume | * | #13:(U32) | \ref mBloodPressureMeasureInterval | - * | #14:(U32) | \ref mPrimeDiscardVolume | - * | #15:(U32) | \ref mRinsebackVolume | - * | #16:(U32) | \ref mHepatitusBStatus | - * | #17:(F32) | \ref mSubstitutionFluidVolume | - * | #18:(F32) | \ref mHeparinBolusVolume | - * | #19:(F32) | \ref mHeparinDispensingRate | - * | #20:(F32) | \ref mDialysateTemp | - * | #21:(F32) | \ref mAcidConcentrateConversionFactor | - * | #22:(F32) | \ref mUFVolume | - * | #23:(F32) | \ref mUFPreWeight | - * | #24:(F32) | \ref mUFEstimatedTargetWeight | - * | #25:(U32) | \ref mAcidConcentrateIndex | + * | #14:(U32) | \ref mRinsebackVolume | + * | #15:(U32) | \ref mHepatitusBStatus | + * | #16:(F32) | \ref mSubstitutionFluidVolume | + * | #17:(F32) | \ref mHeparinBolusVolume | + * | #18:(F32) | \ref mHeparinDispensingRate | + * | #19:(F32) | \ref mDialysateTemp | + * | #20:(F32) | \ref mAcidConcentrateConversionFactor | + * | #21:(F32) | \ref mUFVolume | + * | #22:(F32) | \ref mUFPreWeight | + * | #23:(F32) | \ref mUFEstimatedTargetWeight | + * | #24:(U32) | \ref mAcidConcentrateIndex | * */ class MAdjustParametersValidationReq : public MModel { @@ -114,7 +113,6 @@ quint32 mDialyzerType = 0; // quint32 mFluidBolusVolume = 0; // mL quint32 mBloodPressureMeasureInterval = 0; // min - quint32 mPrimeDiscardVolume = 0; // mL quint32 mRinsebackVolume = 0; // mL quint32 mHepatitusBStatus = 0; // float mSubstitutionFluidVolume = 0; // L @@ -142,7 +140,6 @@ mDialyzerType , mFluidBolusVolume , mBloodPressureMeasureInterval , - mPrimeDiscardVolume , mRinsebackVolume , mHepatitusBStatus , mSubstitutionFluidVolume , Index: sources/view/VTreatmentCreate.cpp =================================================================== diff -u -r48b04367d9f229104e4048783df91089d0106379 -r4a3504bdb88da3e7ae9b5d43d5ab5b11c9b7f884 --- sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision 48b04367d9f229104e4048783df91089d0106379) +++ sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision 4a3504bdb88da3e7ae9b5d43d5ab5b11c9b7f884) @@ -55,7 +55,6 @@ data.mDialyzerType = _dialyzerType ; data.mFluidBolusVolume = _fluidBolusVolume ; data.mBloodPressureMeasureInterval = _bloodPressureMeasureInterval ; - data.mPrimeDiscardVolume = _primeDiscardVolume ; data.mRinsebackVolume = _rinsebackVolume ; data.mHepatitusBStatus = _hepatitusBStatus ; data.mSubstitutionFluidVolume = _substitutionFluidVolume ; @@ -133,7 +132,6 @@ dialyzerTypeRejectReason (data.mDialyzerTypeRejectionReason ); fluidBolusVolumeRejectReason (data.mFluidBolusVolumeRejectionReason ); bloodPressureMeasureIntervalRejectReason (data.mBloodPressureMeasureIntervalRejectionReason ); - primeDiscardVolumeRejectReason (data.mPrimeDiscardVolumeRejectionReason ); rinsebackVolumeRejectReason (data.mRinsebackVolumeRejectionReason ); hepatitusBStatusRejectReason (data.mHepatitusBStatusRejectionReason ); substitutionFluidVolumeRejectReason (data.mSubstitutionFluidVolumeRejectionReason ); Index: sources/view/VTreatmentCreate.h =================================================================== diff -u -r48b04367d9f229104e4048783df91089d0106379 -r4a3504bdb88da3e7ae9b5d43d5ab5b11c9b7f884 --- sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 48b04367d9f229104e4048783df91089d0106379) +++ sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 4a3504bdb88da3e7ae9b5d43d5ab5b11c9b7f884) @@ -92,7 +92,6 @@ VALUESET(quint32 , dialyzerType , 0) VALUESET(quint32 , fluidBolusVolume , 0) VALUESET(quint32 , bloodPressureMeasureInterval , 0) - VALUESET(quint32 , primeDiscardVolume , 0) VALUESET(quint32 , rinsebackVolume , 0) VALUESET(quint32 , hepatitusBStatus , 0) VALUESET(float , substitutionFluidVolume , 0) @@ -127,7 +126,6 @@ TRIGGER(quint32 , dialyzerTypeRejectReason , 0) TRIGGER(quint32 , fluidBolusVolumeRejectReason , 0) TRIGGER(quint32 , bloodPressureMeasureIntervalRejectReason , 0) - TRIGGER(quint32 , primeDiscardVolumeRejectReason , 0) TRIGGER(quint32 , rinsebackVolumeRejectReason , 0) TRIGGER(quint32 , hepatitusBStatusRejectReason , 0) TRIGGER(quint32 , substitutionFluidVolumeRejectReason , 0)