Index: sources/view/VTreatmentCreate.cpp =================================================================== diff -u -r2dd4e9c952d65e68f1c81a1cfc13d1f96b0d7d43 -rcf61c7736f11f4b75a4e2df803f29bdc7769db53 --- sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision 2dd4e9c952d65e68f1c81a1cfc13d1f96b0d7d43) +++ sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision cf61c7736f11f4b75a4e2df803f29bdc7769db53) @@ -41,24 +41,23 @@ AdjustParametersValidationRequestData data; - data.bloodFlowRate = _bloodFlowRate; - data.dialysateFlowRate = _dialysateFlowRate; - data.treatmentDuration = _treatmentDuration; - data.heparinDispensingRate = _heparinDispensingRate; - data.heparinBolusVolume = _heparinBolusVolume; - data.heparinStopTime = _heparinStopTime; - data.salineBolus = _salineBolusVolume; - data.heparinType = _heparinType; - data.acidConcentrate = _acidConcentrate; - data.bicarbonateConcentrate = _bicarbonateConcentrate; - data.dialyzerType = _dialyzerType; - data.dialysateTemp = _dialysateTemp; - data.arterialPressureLimitLow = _arterialPressureLimitLow; - data.arterialPressureLimitHigh = _arterialPressureLimitHigh; - data.venousPressureLimitLow = _venousPressureLimitLow; - data.venousPressureLimitHigh = _venousPressureLimitHigh; - data.bloodPressureMeasureInterval = _bloodPressureMeasureInterval; - data.rinsebackFlowRate = _rinsebackFlowRate; + data.mBloodFlowRate = _bloodFlowRate ; + data.mDialysateFlowRate = _dialysateFlowRate ; + data.mTreatmentDuration = _treatmentDuration ; + data.mHeparinDispensingRate = _heparinDispensingRate ; + data.mHeparinBolusVolume = _heparinBolusVolume ; + data.mHeparinStopTime = _heparinStopTime ; + data.mSalineBolus = _salineBolusVolume ; + data.mHeparinType = _heparinType ; + data.mAcidConcentrate = _acidConcentrate ; + data.mBicarbonateConcentrate = _bicarbonateConcentrate ; + data.mDialyzerType = _dialyzerType ; + data.mDialysateTemp = _dialysateTemp ; + data.mArterialPressureLimitWindow = _arterialPressureLimitWindow ; + data.mVenousPressureLimitWindow = _venousPressureLimitWindow ; + data.mVenousPressureLimitAsymtrc = _venousPressureLimitAsymtrc ; + data.mBloodPressureMeasureInterval = _bloodPressureMeasureInterval ; + data.mRinsebackFlowRate = _rinsebackFlowRate ; emit didAdjustment(data); } @@ -108,26 +107,25 @@ void VTreatmentCreate::onActionReceive(const AdjustParametersValidationResponseData &data) { if (! data.mAccepted) { - bloodFlowRateRejectReason (data.bloodFlowRate ); - dialysateFlowRateRejectReason (data.dialysateFlowRate ); - treatmentDurationRejectReason (data.duration ); - heparinDispensingRateRejectReason (data.heparinDispensingRate ); - heparinBolusVolumeRejectReason (data.heparinBolusVolume ); - heparinStopTimeRejectReason (data.heparinStopTime ); - salineBolusVolumeRejectReason (data.salineBolus ); + bloodFlowRateRejectReason (data.mBloodFlowRate ); + dialysateFlowRateRejectReason (data.mDialysateFlowRate ); + treatmentDurationRejectReason (data.mDuration ); + heparinDispensingRateRejectReason (data.mHeparinDispensingRate ); + heparinBolusVolumeRejectReason (data.mHeparinBolusVolume ); + heparinStopTimeRejectReason (data.mHeparinStopTime ); + salineBolusVolumeRejectReason (data.mSalineBolus ); - heparinTypeRejectReason (data.heparinType ); - acidConcentrateRejectReason (data.acidConcentrate ); - bicarbonateConcentrateRejectReason (data.bicarbonateConcentrate ); - dialyzerTypeRejectReason (data.dialyzerType ); + heparinTypeRejectReason (data.mHeparinType ); + acidConcentrateRejectReason (data.mAcidConcentrate ); + bicarbonateConcentrateRejectReason (data.mBicarbonateConcentrate ); + dialyzerTypeRejectReason (data.mDialyzerType ); - dialysateTempRejectReason (data.dialysateTemp ); - arterialPressureLimitLowRejectReason (data.arterialPressureLimitLow ); - arterialPressureLimitHighRejectReason (data.arterialPressureLimitHigh ); - venousPressureLimitLowRejectReason (data.venousPressureLimitLow ); - venousPressureLimitHighRejectReason (data.venousPressureLimitHigh ); - bloodPressureMeasureIntervalRejectReason (data.bloodPressureMeasureInterval); - rinsebackFlowRateRejectReason (data.rinsebackFlowRate ); + dialysateTempRejectReason (data.mDialysateTemp ); + arterialPressureLimitWindowRejectReason (data.mArterialPressureLimitWindow ); + venousPressureLimitWindowRejectReason (data.mVenousPressureLimitWindow ); + venousPressureLimitAsymtrcRejectReason (data.mVenousPressureLimitAsymtrc ); + bloodPressureMeasureIntervalRejectReason (data.mBloodPressureMeasureInterval); + rinsebackFlowRateRejectReason (data.mRinsebackFlowRate ); emit didValidationFail(); } @@ -197,10 +195,6 @@ << mBicarbonateConcentrate << mDialyzerType << QString("%0 °C" ).arg(_dialysateTemp ) - << QString("%0 mmHg" ).arg(_arterialPressureLimitLow ) - << QString("%0 mmHg" ).arg(_arterialPressureLimitHigh ) - << QString("%0 mmHg" ).arg(_venousPressureLimitLow ) - << QString("%0 mmHg" ).arg(_venousPressureLimitHigh ) << ( _bloodPressureMeasureInterval ? QString("%0 min").arg(_bloodPressureMeasureInterval) : tr("OFF") ) << QString("%0 mL/min" ).arg(_rinsebackFlowRate ); }