Index: sources/canbus/MessageDispatcher.cpp
===================================================================
diff -u -r4a3504bdb88da3e7ae9b5d43d5ab5b11c9b7f884 -r0d1a10c754665f397bf7e507643d928657ed9561
--- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 4a3504bdb88da3e7ae9b5d43d5ab5b11c9b7f884)
+++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 0d1a10c754665f397bf7e507643d928657ed9561)
@@ -670,15 +670,15 @@
mData += vData.mBloodPressureMeasureInterval ;
mData += vData.mRinsebackVolume ;
mData += vData.mHepatitusBStatus ;
+ mData += vData.mAcidConcentrateIndex ;
mData += vData.mSubstitutionFluidVolume ;
mData += vData.mHeparinBolusVolume ;
mData += vData.mHeparinDispensingRate ;
mData += vData.mDialysateTemp ;
mData += vData.mAcidConcentrateConversionFactor ;
- mData += vData.mUFVolume ;
mData += vData.mUFPreWeight ;
mData += vData.mUFEstimatedTargetWeight ;
- mData += vData.mAcidConcentrateIndex ;
+ mData += vData.mUFVolume ;
onActionTransmit(GuiActionType::ID_AdjustParametersValidationReq, mData);
}
Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp
===================================================================
diff -u -r4a3504bdb88da3e7ae9b5d43d5ab5b11c9b7f884 -r0d1a10c754665f397bf7e507643d928657ed9561
--- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp (.../MPreTreatmentAdjustParametersValidationResponse.cpp) (revision 4a3504bdb88da3e7ae9b5d43d5ab5b11c9b7f884)
+++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp (.../MPreTreatmentAdjustParametersValidationResponse.cpp) (revision 0d1a10c754665f397bf7e507643d928657ed9561)
@@ -34,14 +34,15 @@
_data.mBloodPressureMeasureIntervalRejectionReason .value,
_data.mRinsebackVolumeRejectionReason .value,
_data.mHepatitusBStatusRejectionReason .value,
+ _data.mAcidConcentrateIndexRejectionReason .value,
_data.mSubstitutionFluidVolumeRejectionReason .value,
_data.mHeparinBolusVolumeRejectionReason .value,
_data.mHeparinDispensingRateRejectionReason .value,
_data.mDialysateTempRejectionReason .value,
_data.mAcidConcentrateConversionFactorRejectionReason .value,
- _data.mUFVolumeRejectionReason .value,
_data.mUFPreWeightRejectionReason .value,
- _data.mUFEstimatedTargetWeightRejectionReason .value
+ _data.mUFEstimatedTargetWeightRejectionReason .value,
+ _data.mUFVolumeRejectionReason .value
};
}
@@ -63,14 +64,15 @@
if ( ! GetValue(vByteArray, index, _data.mBloodPressureMeasureIntervalRejectionReason )) goto lError;
if ( ! GetValue(vByteArray, index, _data.mRinsebackVolumeRejectionReason )) goto lError;
if ( ! GetValue(vByteArray, index, _data.mHepatitusBStatusRejectionReason )) goto lError;
+ if ( ! GetValue(vByteArray, index, _data.mAcidConcentrateIndexRejectionReason )) goto lError;
if ( ! GetValue(vByteArray, index, _data.mSubstitutionFluidVolumeRejectionReason )) goto lError;
if ( ! GetValue(vByteArray, index, _data.mHeparinBolusVolumeRejectionReason )) goto lError;
if ( ! GetValue(vByteArray, index, _data.mHeparinDispensingRateRejectionReason )) goto lError;
if ( ! GetValue(vByteArray, index, _data.mDialysateTempRejectionReason )) goto lError;
if ( ! GetValue(vByteArray, index, _data.mAcidConcentrateConversionFactorRejectionReason)) goto lError;
- if ( ! GetValue(vByteArray, index, _data.mUFVolumeRejectionReason )) goto lError;
if ( ! GetValue(vByteArray, index, _data.mUFPreWeightRejectionReason )) goto lError;
if ( ! GetValue(vByteArray, index, _data.mUFEstimatedTargetWeightRejectionReason )) goto lError;
+ if ( ! GetValue(vByteArray, index, _data.mUFVolumeRejectionReason )) goto lError;
return true ;
@@ -98,13 +100,15 @@
data.mBloodPressureMeasureIntervalRejectionReason = _data.mBloodPressureMeasureIntervalRejectionReason .value;
data.mRinsebackVolumeRejectionReason = _data.mRinsebackVolumeRejectionReason .value;
data.mHepatitusBStatusRejectionReason = _data.mHepatitusBStatusRejectionReason .value;
+ data.mAcidConcentrateIndexRejectionReason = _data.mAcidConcentrateIndexRejectionReason .value;
data.mSubstitutionFluidVolumeRejectionReason = _data.mSubstitutionFluidVolumeRejectionReason .value;
data.mHeparinBolusVolumeRejectionReason = _data.mHeparinBolusVolumeRejectionReason .value;
data.mHeparinDispensingRateRejectionReason = _data.mHeparinDispensingRateRejectionReason .value;
data.mDialysateTempRejectionReason = _data.mDialysateTempRejectionReason .value;
data.mAcidConcentrateConversionFactorRejectionReason = _data.mAcidConcentrateConversionFactorRejectionReason .value;
- data.mUFVolumeRejectionReason = _data.mUFVolumeRejectionReason .value;
data.mUFPreWeightRejectionReason = _data.mUFPreWeightRejectionReason .value;
data.mUFEstimatedTargetWeightRejectionReason = _data.mUFEstimatedTargetWeightRejectionReason .value;
+ data.mUFVolumeRejectionReason = _data.mUFVolumeRejectionReason .value;
+
return data;
}
Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h
===================================================================
diff -u -r4a3504bdb88da3e7ae9b5d43d5ab5b11c9b7f884 -r0d1a10c754665f397bf7e507643d928657ed9561
--- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h (.../MPreTreatmentAdjustParametersValidationResponse.h) (revision 4a3504bdb88da3e7ae9b5d43d5ab5b11c9b7f884)
+++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h (.../MPreTreatmentAdjustParametersValidationResponse.h) (revision 0d1a10c754665f397bf7e507643d928657ed9561)
@@ -51,16 +51,16 @@
* | #14:(U32) | \ref Data::mBloodPressureMeasureIntervalRejectionReason |
* | #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 |
+ * | #17:(U32) | \ref Data::mAcidConcentrateIndexRejectionReason |
+ * | #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::mUFPreWeightRejectionReason |
* | #24:(U32) | \ref Data::mUFEstimatedTargetWeightRejectionReason |
- * | #25:(U32) | \ref Data::mAcidConcentrateIndexRejectionReason |
- *
+ * | #25:(U32) | \ref Data::mUFVolumeRejectionReason |
+
* \sa Data
*
*
@@ -94,15 +94,15 @@
Types::U32 mBloodPressureMeasureIntervalRejectionReason ;
Types::U32 mRinsebackVolumeRejectionReason ;
Types::U32 mHepatitusBStatusRejectionReason ;
+ Types::U32 mAcidConcentrateIndexRejectionReason ;
Types::U32 mSubstitutionFluidVolumeRejectionReason ;
Types::U32 mHeparinBolusVolumeRejectionReason ;
Types::U32 mHeparinDispensingRateRejectionReason ;
Types::U32 mDialysateTempRejectionReason ;
Types::U32 mAcidConcentrateConversionFactorRejectionReason ;
- Types::U32 mUFVolumeRejectionReason ;
Types::U32 mUFPreWeightRejectionReason ;
Types::U32 mUFEstimatedTargetWeightRejectionReason ;
- Types::U32 mAcidConcentrateIndexRejectionReason ;
+ Types::U32 mUFVolumeRejectionReason ;
} _data;
public:
@@ -128,15 +128,15 @@
quint32 mBloodPressureMeasureIntervalRejectionReason = 0;
quint32 mRinsebackVolumeRejectionReason = 0;
quint32 mHepatitusBStatusRejectionReason = 0;
+ quint32 mAcidConcentrateIndexRejectionReason = 0;
quint32 mSubstitutionFluidVolumeRejectionReason = 0;
quint32 mHeparinBolusVolumeRejectionReason = 0;
quint32 mHeparinDispensingRateRejectionReason = 0;
quint32 mDialysateTempRejectionReason = 0;
quint32 mAcidConcentrateConversionFactorRejectionReason = 0;
- quint32 mUFVolumeRejectionReason = 0;
quint32 mUFPreWeightRejectionReason = 0;
quint32 mUFEstimatedTargetWeightRejectionReason = 0;
- quint32 mAcidConcentrateIndexRejectionReason = 0;
+ quint32 mUFVolumeRejectionReason = 0;
};
MAdjustParametersValidationResponse () {}
Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h
===================================================================
diff -u -r4a3504bdb88da3e7ae9b5d43d5ab5b11c9b7f884 -r0d1a10c754665f397bf7e507643d928657ed9561
--- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision 4a3504bdb88da3e7ae9b5d43d5ab5b11c9b7f884)
+++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision 0d1a10c754665f397bf7e507643d928657ed9561)
@@ -87,15 +87,16 @@
* | #13:(U32) | \ref mBloodPressureMeasureInterval |
* | #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 |
+ * | #16:(U32) | \ref mAcidConcentrateIndex |
+ * | #17:(F32) | \ref mSubstitutionFluidVolume |
+ * | #18:(F32) | \ref mHeparinBolusVolume |
+ * | #19:(F32) | \ref mHeparinDispensingRate |
+ * | #20:(F32) | \ref mDialysateTemp |
+ * | #21:(F32) | \ref mAcidConcentrateConversionFactor |
* | #22:(F32) | \ref mUFPreWeight |
* | #23:(F32) | \ref mUFEstimatedTargetWeight |
- * | #24:(U32) | \ref mAcidConcentrateIndex |
+ * | #24:(F32) | \ref mUFVolume |
+
*
*/
class MAdjustParametersValidationReq : public MModel {
@@ -115,15 +116,15 @@
quint32 mBloodPressureMeasureInterval = 0; // min
quint32 mRinsebackVolume = 0; // mL
quint32 mHepatitusBStatus = 0; //
+ quint32 mAcidConcentrateIndex = 0; //
float mSubstitutionFluidVolume = 0; // L
float mHeparinBolusVolume = 0; // mL
float mHeparinDispensingRate = 0; // mL/hr
float mDialysateTemp = 0; // Celsius
float mAcidConcentrateConversionFactor = 0; // mEq/L
- float mUFVolume = 0; // L
float mUFPreWeight = 0; // kg
float mUFEstimatedTargetWeight = 0; // kg
- quint32 mAcidConcentrateIndex = 0; //
+ float mUFVolume = 0; // L
QString toString() {
return toString({
@@ -142,15 +143,15 @@
mBloodPressureMeasureInterval ,
mRinsebackVolume ,
mHepatitusBStatus ,
+ mAcidConcentrateIndex ,
mSubstitutionFluidVolume ,
mHeparinBolusVolume ,
mHeparinDispensingRate ,
mDialysateTemp ,
mAcidConcentrateConversionFactor,
- mUFVolume ,
mUFPreWeight ,
mUFEstimatedTargetWeight ,
- mAcidConcentrateIndex ,
+ mUFVolume ,
});
}
static QString toString(const QVariantList &vParameters) {
Index: sources/view/VTreatmentCreate.cpp
===================================================================
diff -u -r4a3504bdb88da3e7ae9b5d43d5ab5b11c9b7f884 -r0d1a10c754665f397bf7e507643d928657ed9561
--- sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision 4a3504bdb88da3e7ae9b5d43d5ab5b11c9b7f884)
+++ sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision 0d1a10c754665f397bf7e507643d928657ed9561)
@@ -57,15 +57,15 @@
data.mBloodPressureMeasureInterval = _bloodPressureMeasureInterval ;
data.mRinsebackVolume = _rinsebackVolume ;
data.mHepatitusBStatus = _hepatitusBStatus ;
+ data.mAcidConcentrateIndex = _acidConcentrate ;
data.mSubstitutionFluidVolume = _substitutionFluidVolume ;
data.mHeparinBolusVolume = _heparinBolusVolume ;
data.mHeparinDispensingRate = _heparinDispensingRate ;
data.mDialysateTemp = _dialysateTemp ;
data.mAcidConcentrateConversionFactor = _acidConcentrateConversionFactor ;
- data.mUFVolume = _ultrafiltrationVolume ;
data.mUFPreWeight = _ufPreWeight ;
data.mUFEstimatedTargetWeight = _ufEstimatedTargetWeight ;
- data.mAcidConcentrateIndex = _acidConcentrate ;
+ data.mUFVolume = _ultrafiltrationVolume ;
parametersConfirmed(false);
parametersValidated(false);
@@ -134,15 +134,15 @@
bloodPressureMeasureIntervalRejectReason (data.mBloodPressureMeasureIntervalRejectionReason );
rinsebackVolumeRejectReason (data.mRinsebackVolumeRejectionReason );
hepatitusBStatusRejectReason (data.mHepatitusBStatusRejectionReason );
+ acidConcentrateIndexRejectionReason (data.mAcidConcentrateIndexRejectionReason );
substitutionFluidVolumeRejectReason (data.mSubstitutionFluidVolumeRejectionReason );
heparinBolusVolumeRejectReason (data.mHeparinBolusVolumeRejectionReason );
heparinDispensingRateRejectReason (data.mHeparinDispensingRateRejectionReason );
dialysateTempRejectReason (data.mDialysateTempRejectionReason );
acidConcentrateConversionFactorRejectionReason (data.mAcidConcentrateConversionFactorRejectionReason );
- ufVolumeRejectionReason (data.mUFVolumeRejectionReason );
ufPreWeightRejectionReason (data.mUFPreWeightRejectionReason );
ufEstimatedTargetWeightRejectionReason (data.mUFEstimatedTargetWeightRejectionReason );
- acidConcentrateIndexRejectionReason (data.mAcidConcentrateIndexRejectionReason );
+ ufVolumeRejectionReason (data.mUFVolumeRejectionReason );
parametersValidated(false);
}
Index: sources/view/VTreatmentCreate.h
===================================================================
diff -u -r4a3504bdb88da3e7ae9b5d43d5ab5b11c9b7f884 -r0d1a10c754665f397bf7e507643d928657ed9561
--- sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 4a3504bdb88da3e7ae9b5d43d5ab5b11c9b7f884)
+++ sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 0d1a10c754665f397bf7e507643d928657ed9561)
@@ -94,17 +94,16 @@
VALUESET(quint32 , bloodPressureMeasureInterval , 0)
VALUESET(quint32 , rinsebackVolume , 0)
VALUESET(quint32 , hepatitusBStatus , 0)
+ VALUESET(quint32 , acidConcentrate , 0)
VALUESET(float , substitutionFluidVolume , 0)
VALUESET(float , heparinBolusVolume , 0)
VALUESET(float , heparinDispensingRate , 0)
VALUESET(float , dialysateTemp , 0)
VALUESET(float , acidConcentrateConversionFactor , 0)
- VALUESET(float , ultrafiltrationVolume , 0)
VALUESET(float , ufPreWeight , 0)
VALUESET(float , ufEstimatedTargetWeight , 0)
+ VALUESET(float , ultrafiltrationVolume , 0)
- VALUESET(quint32 , acidConcentrate , 0)
-
VALUESET(QString , patientID ,"")
VALUESET(bool , parametersValidated , 0)
VALUESET(bool , parametersConfirmed , 0)