Index: sources/view/VTreatmentCreate.h =================================================================== diff -u -r13d04e674e9d22091bcc72b97574bbba21fdc9c9 -rf46bc6ffce5eb0ac3e1bbd5a9b8ee9202209c881 --- sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 13d04e674e9d22091bcc72b97574bbba21fdc9c9) +++ sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision f46bc6ffce5eb0ac3e1bbd5a9b8ee9202209c881) @@ -79,6 +79,8 @@ PROPERTY(bool , heparinDispensingRateOff , true) PROPERTY(bool , heparinBolusVolumeOff , true) + VALUESET(quint32 , treatmentModality , 0) + VALUESET(quint32 , hdfTreatmentMode , 0) VALUESET(quint32 , bloodFlowRate , 0) VALUESET(quint32 , dialysateFlowRate , 0) VALUESET(quint32 , treatmentDuration , 0) @@ -94,15 +96,22 @@ VALUESET(qint32 , arterialPressureLimitWindow , 0) VALUESET(qint32 , venousPressureLimitWindow , 0) VALUESET(qint32 , venousPressureLimitAsymtrc , 0) - VALUESET(qint32 , trancembrncPressureLimitWindow , 0) + VALUESET(qint32 , transmembranePressureLimitWindow , 0) VALUESET(float , dialysateTemp , 0) VALUESET(float , heparinDispensingRate , 0) VALUESET(float , heparinBolusVolume , 0) + VALUESET(float , substitutionFluidVolume , 0) VALUESET(QString , patientID ,"") VALUESET(bool , parametersValidated , 0) VALUESET(bool , parametersConfirmed , 0) + VALUESET(qint32 , dryBicabCartridgeSize , 0) + VALUESET(qint32 , bicarbFinalDialysateComposition , 0) + VALUESET(qint32 , sodiumFinalDialysateComposition , 0) + VALUESET(qint32 , actualRORejectionPercentage , 0) + + PROPERTY(QString , txCode ,"") TRIGGER(quint32 , bloodFlowRateRejectReason , 0) @@ -123,9 +132,8 @@ TRIGGER(quint32 , bloodPressureMeasureIntervalRejectReason , 0) TRIGGER(quint32 , rinsebackFlowRateRejectReason , 0) TRIGGER(quint32 , rinsebackVolumeRejectReason , 0) - TRIGGER(quint32 , trancembrncPressureLimitWindowRejectReason , 0) + TRIGGER(quint32 , transmembranePressureLimitWindowRejectReason , 0) - VIEW_DEC_CLASS(VTreatmentCreate) VIEW_DEC_SLOT(AdjustParametersValidationResponseData) VIEW_DEC_SLOT(AdjustSerialNumberTDResponseData) @@ -139,8 +147,7 @@ void didAdjustment(const AdjustParametersValidationRequestData &data); void didAdjustment(const AdjustParametersConfirmRequestData &data); - void didValidationFail(); - void didValidationPass(); + void didValidationPass (); public slots: void doValidation ();