Index: sources/view/VTreatmentCreate.cpp =================================================================== diff -u -ra631df5b4ae818e351d8b8332bbe1e760f7de888 -rb1462640e36df3f567c42aa8c8cbd6dafe865625 --- sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision a631df5b4ae818e351d8b8332bbe1e760f7de888) +++ sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision b1462640e36df3f567c42aa8c8cbd6dafe865625) @@ -58,14 +58,14 @@ data.mArterialPressureLimitWindow = _arterialPressureLimitWindow ; data.mVenousPressureLimitWindow = _venousPressureLimitWindow ; data.mVenousPressureLimitAsymtrc = _venousPressureLimitAsymtrc ; - data.mTrancembrncPressureLimitWindow = _trancembrncPressureLimitWindow ; + data.mTransmembranePressureLimitWindow = _transmembranePressureLimitWindow; data.mDialysateTemp = _dialysateTemp ; data.mHeparinDispensingRate = _heparinDispensingRate ; data.mHeparinBolusVolume = _heparinBolusVolume ; - emit didAdjustment(data); parametersConfirmed(false); parametersValidated(false); + emit didAdjustment(data); } /** @@ -77,9 +77,8 @@ void VTreatmentCreate::doConfirm() { AdjustParametersConfirmRequestData confirmTreatmentRequest; confirmTreatmentRequest.requestedState = AdjustParametersConfirmRequestData::eConfirm; - emit didAdjustment(confirmTreatmentRequest); parametersConfirmed(true); - + emit didAdjustment(confirmTreatmentRequest); } /** @@ -91,8 +90,9 @@ { AdjustParametersConfirmRequestData confirmTreatmentRequest; confirmTreatmentRequest.requestedState = AdjustParametersConfirmRequestData::eCancel; - emit didAdjustment(confirmTreatmentRequest); parametersValidated(false); + parametersConfirmed(false); + emit didAdjustment(confirmTreatmentRequest); } /** @@ -133,15 +133,14 @@ bloodPressureMeasureIntervalRejectReason (data.mBloodPressureMeasureIntervalRejectReason ); rinsebackFlowRateRejectReason (data.mRinsebackFlowRateRejectReason ); rinsebackVolumeRejectReason (data.mRinsebackVolumeRejectReason ); - trancembrncPressureLimitWindowRejectReason (data.mTrancembrncPressureLimitWindowRejectReason ); + transmembranePressureLimitWindowRejectReason(data.mTransmembranePressureLimitWindowRejectReason ); - emit didValidationFail(); parametersValidated(false); } else { if ( _txCode.isEmpty()) { generateTxCode(); } - emit didValidationPass(); parametersValidated(true); + emit didValidationPass(); } }