Index: sources/canbus/messageinterpreter.h =================================================================== diff -u -rb789046c096cfdddb39adcd3d5be1e129769aac6 -r0bcf15697b32bd20e8f9c2cd780b2eef739a4ee8 --- sources/canbus/messageinterpreter.h (.../messageinterpreter.h) (revision b789046c096cfdddb39adcd3d5be1e129769aac6) +++ sources/canbus/messageinterpreter.h (.../messageinterpreter.h) (revision 0bcf15697b32bd20e8f9c2cd780b2eef739a4ee8) @@ -49,7 +49,6 @@ bool interpretMessage_HD(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; bool interpretMessage_DG(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; - // ( // ---- PowerOff bool getPowerOffData(const Message &vMessage, Model::MPowerOff &vData) __attribute_warn_unused_result__; bool powerOffData(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r03de7d132838c54a23862809357c42102b6dab99 -r0bcf15697b32bd20e8f9c2cd780b2eef739a4ee8 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 03de7d132838c54a23862809357c42102b6dab99) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 0bcf15697b32bd20e8f9c2cd780b2eef739a4ee8) @@ -157,17 +157,17 @@ vTreatmentAdjustmentUltrafiltration.durationDiff , vTreatmentAdjustmentUltrafiltration.rate , vTreatmentAdjustmentUltrafiltration.rateDiff , - vTreatmentAdjustmentUltrafiltration.rateCurr + vTreatmentAdjustmentUltrafiltration.rateOld ) if (vTreatmentAdjustmentUltrafiltration.adjustment_Accepted) { _treatmentAdjustmentUltrafiltrationEdit .close() _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationVolume = 1000 * vTreatmentAdjustmentUltrafiltration.volume .toFixed(3) - _treatmentAdjustmentUltrafiltrationConfirm.treatmentDuration = vTreatmentAdjustmentUltrafiltration.duration - _treatmentAdjustmentUltrafiltrationConfirm.treatmentDurationDiff = vTreatmentAdjustmentUltrafiltration.durationDiff - _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationRate = 1000 * vTreatmentAdjustmentUltrafiltration.rate .toFixed(3) - _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationRateDiff = 1000 * vTreatmentAdjustmentUltrafiltration.rateDiff .toFixed(3) - _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationRateCurr = 1000 * vTreatmentAdjustmentUltrafiltration.rateCurr .toFixed(3) + _treatmentAdjustmentUltrafiltrationConfirm.treatmentDuration = vTreatmentAdjustmentUltrafiltration.duration + _treatmentAdjustmentUltrafiltrationConfirm.treatmentDurationDiff = vTreatmentAdjustmentUltrafiltration.durationDiff + _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationRate = vTreatmentAdjustmentUltrafiltration.rate .toFixed(3) + _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationRateDiff = vTreatmentAdjustmentUltrafiltration.rateDiff .toFixed(3) + _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationRateOld = vTreatmentAdjustmentUltrafiltration.rateOld .toFixed(3) _treatmentAdjustmentUltrafiltrationConfirm.open() } else { Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml =================================================================== diff -u -r03de7d132838c54a23862809357c42102b6dab99 -r0bcf15697b32bd20e8f9c2cd780b2eef739a4ee8 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (.../TreatmentAdjustmentUltrafiltrationConfirm.qml) (revision 03de7d132838c54a23862809357c42102b6dab99) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (.../TreatmentAdjustmentUltrafiltrationConfirm.qml) (revision 0bcf15697b32bd20e8f9c2cd780b2eef739a4ee8) @@ -30,11 +30,12 @@ property int ultrafiltrationVolume : 0 property int ultrafiltrationRate : 0 - property int ultrafiltrationRateDiff : 0 - property int ultrafiltrationRateCurr : 0 - property string ultrafiltrationRateUnit : qsTr("mL/min") property int treatmentDuration : 0 property int treatmentDurationDiff : 0 + property int ultrafiltrationRateDiff : 0 + property int ultrafiltrationRateOld : 0 + + property string ultrafiltrationRateUnit : qsTr("mL/min") property string treatmentDurationUnit : qsTr("min") closeVisible : false @@ -105,7 +106,7 @@ buttonType: UltrafiltrationButton.ButtonType.TreatmentDuration isIncrease: treatmentDurationDiff > 0 valueText : qsTr( "UF Rate : %1 %2") - .arg(ultrafiltrationRateCurr) + .arg(ultrafiltrationRateOld ) .arg(ultrafiltrationRateUnit) onClicked : { _rateAdjustmentButton.selected = false Index: sources/model/mtreatmentadjustultrafiltrationresponse.cpp =================================================================== diff -u -r03de7d132838c54a23862809357c42102b6dab99 -r0bcf15697b32bd20e8f9c2cd780b2eef739a4ee8 --- sources/model/mtreatmentadjustultrafiltrationresponse.cpp (.../mtreatmentadjustultrafiltrationresponse.cpp) (revision 03de7d132838c54a23862809357c42102b6dab99) +++ sources/model/mtreatmentadjustultrafiltrationresponse.cpp (.../mtreatmentadjustultrafiltrationresponse.cpp) (revision 0bcf15697b32bd20e8f9c2cd780b2eef739a4ee8) @@ -24,7 +24,7 @@ .arg(_data.mDurationDiff.value) .arg(_data.mRate .value) .arg(_data.mRateDiff .value) - .arg(_data.mRateCurr .value) + .arg(_data.mRateOld .value) ; } @@ -36,7 +36,7 @@ vData += _data.mDurationDiff.value; vData += _data.mRate .value; vData += _data.mRateDiff .value; - vData += _data.mRateCurr .value; + vData += _data.mRateOld .value; } bool MAdjustUltrafiltrationResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { @@ -48,7 +48,7 @@ if (GetValue(vByteArray, index, _data.mDurationDiff )) if (GetValue(vByteArray, index, _data.mRate )) if (GetValue(vByteArray, index, _data.mRateDiff )) - if (GetValue(vByteArray, index, _data.mRateCurr )) + if (GetValue(vByteArray, index, _data.mRateOld )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -69,6 +69,6 @@ data.mDurationDiff = _data.mDurationDiff.value; data.mRate = _data.mRate .value; data.mRateDiff = _data.mRateDiff .value; - data.mRateCurr = _data.mRateCurr .value; + data.mRateOld = _data.mRateOld .value; return data; } Index: sources/model/mtreatmentadjustultrafiltrationresponse.h =================================================================== diff -u -r03de7d132838c54a23862809357c42102b6dab99 -r0bcf15697b32bd20e8f9c2cd780b2eef739a4ee8 --- sources/model/mtreatmentadjustultrafiltrationresponse.h (.../mtreatmentadjustultrafiltrationresponse.h) (revision 03de7d132838c54a23862809357c42102b6dab99) +++ sources/model/mtreatmentadjustultrafiltrationresponse.h (.../mtreatmentadjustultrafiltrationresponse.h) (revision 0bcf15697b32bd20e8f9c2cd780b2eef739a4ee8) @@ -37,10 +37,10 @@ float mVolume = 0; /*!< volume value of type float extracted out */ quint32 mDuration = 0; /*!< duration value of type quint32 extracted out */ - quint32 mDurationDiff= 0; /*!< durationDiff value of type quint32 extracted out */ + qint32 mDurationDiff= 0; /*!< durationDiff value of type quint32 extracted out */ float mRate = 0; /*!< rate value of type float extracted out */ float mRateDiff = 0; /*!< rateDiff value of type float extracted out */ - float mRateCurr = 0; /*!< rateCurr value of type float extracted out */ + float mRateOld = 0; /*!< rateOld value of type float extracted out */ }; private: @@ -50,10 +50,10 @@ Types::F32 mVolume ; Types::U32 mDuration ; - Types::U32 mDurationDiff ; + Types::S32 mDurationDiff ; Types::F32 mRate ; Types::F32 mRateDiff ; - Types::F32 mRateCurr ; + Types::F32 mRateOld ; } _data; public: Index: sources/view/vtreatmentadjustmentultrafiltration.cpp =================================================================== diff -u -r03de7d132838c54a23862809357c42102b6dab99 -r0bcf15697b32bd20e8f9c2cd780b2eef739a4ee8 --- sources/view/vtreatmentadjustmentultrafiltration.cpp (.../vtreatmentadjustmentultrafiltration.cpp) (revision 03de7d132838c54a23862809357c42102b6dab99) +++ sources/view/vtreatmentadjustmentultrafiltration.cpp (.../vtreatmentadjustmentultrafiltration.cpp) (revision 0bcf15697b32bd20e8f9c2cd780b2eef739a4ee8) @@ -36,7 +36,7 @@ durationDiff ( vData.mDurationDiff ); rate ( vData.mRate ); rateDiff ( vData.mRateDiff ); - rateCurr ( vData.mRateCurr ); + rateOld ( vData.mRateOld ); // *** has to be the last to let the information to be set and then emit the signal *** // *** otherwise will use the previous values before being set. *** Index: sources/view/vtreatmentadjustmentultrafiltration.h =================================================================== diff -u -r03de7d132838c54a23862809357c42102b6dab99 -r0bcf15697b32bd20e8f9c2cd780b2eef739a4ee8 --- sources/view/vtreatmentadjustmentultrafiltration.h (.../vtreatmentadjustmentultrafiltration.h) (revision 03de7d132838c54a23862809357c42102b6dab99) +++ sources/view/vtreatmentadjustmentultrafiltration.h (.../vtreatmentadjustmentultrafiltration.h) (revision 0bcf15697b32bd20e8f9c2cd780b2eef739a4ee8) @@ -39,10 +39,10 @@ // Treatment Ultrafiltration data PROPERTY( float , volume , 0) PROPERTY( quint32 , duration , 0) - PROPERTY( quint32 , durationDiff , 0) + PROPERTY( qint32 , durationDiff , 0) PROPERTY( float , rate , 0) PROPERTY( float , rateDiff , 0) - PROPERTY( float , rateCurr , 0) + PROPERTY( float , rateOld , 0) VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentUltrafiltration, AdjustUltrafiltrationResponseData)