Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -rb2db816026524a19086e900eef867d7f5a3aa6f2 -r38677167535b480612809a53d824b86e11b2e5f9 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision b2db816026524a19086e900eef867d7f5a3aa6f2) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 38677167535b480612809a53d824b86e11b2e5f9) @@ -373,6 +373,7 @@ { QVariantList mData; mData += vData.volume; + mData += vData.rate; onActionTransmit(GuiActionType::ID_AdjustUltrafiltrationConfirmReq, mData); } Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r83acad721bd36d2c88a15feddd6812d2e591bef3 -r38677167535b480612809a53d824b86e11b2e5f9 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 83acad721bd36d2c88a15feddd6812d2e591bef3) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 38677167535b480612809a53d824b86e11b2e5f9) @@ -189,10 +189,10 @@ // ---- {Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq , 1 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp , 8 * 4 }, // 8 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp , 4 * 4 }, // 8 parameters each 4bytes // ---- - {Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq , 1 * 4 }, // 1 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp , 2 * 4 }, // 2 parameters each 4bytes // ---- Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml =================================================================== diff -u -rdb4320d261b5e52f1ae60293fe9d7fd069506c26 -r38677167535b480612809a53d824b86e11b2e5f9 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (.../TreatmentAdjustmentUltrafiltrationConfirm.qml) (revision db4320d261b5e52f1ae60293fe9d7fd069506c26) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (.../TreatmentAdjustmentUltrafiltrationConfirm.qml) (revision 38677167535b480612809a53d824b86e11b2e5f9) @@ -33,7 +33,7 @@ property real ultrafiltrationVolume : 0.000 property real ultrafiltrationRate : 0.000 - signal confirmVolumeClicked(real vVolume) + signal confirmVolumeClicked(real vVolume, real vRate) Item { id: _newValuesItem objectName: "_newValuesItem" @@ -119,6 +119,7 @@ font.weight : Font.Medium } - onClicked: confirmVolumeClicked(_root.ultrafiltrationVolume.toFixed(Variables.ultrafiltrationPrecision)) + onClicked: confirmVolumeClicked(_root.ultrafiltrationVolume.toFixed(Variables.ultrafiltrationPrecision), + _root.ultrafiltrationRate.toFixed(Variables.ultrafiltrationPrecision)) } } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStack.qml =================================================================== diff -u -r6a1b6539a619ac8a7acda691913289d1604b14cf -r38677167535b480612809a53d824b86e11b2e5f9 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStack.qml (.../TreatmentAdjustmentUltrafiltrationStack.qml) (revision 6a1b6539a619ac8a7acda691913289d1604b14cf) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStack.qml (.../TreatmentAdjustmentUltrafiltrationStack.qml) (revision 38677167535b480612809a53d824b86e11b2e5f9) @@ -117,8 +117,8 @@ _root.titleText = qsTr("Confirm Ultrafiltration Volume ") + Variables.unitTextUltrafiltrationVolume _root.notificationText = "" } - onConfirmVolumeClicked : { - vTreatmentAdjustmentUltrafiltrationConfirm.doConfirm(vVolume) + onConfirmVolumeClicked : function(vVolume, vRate) { + vTreatmentAdjustmentUltrafiltrationConfirm.doConfirm(vVolume, vRate) } } Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h =================================================================== diff -u -r5941bc1d07e5d58f9d848afbf1414ef4f78e9185 -r38677167535b480612809a53d824b86e11b2e5f9 --- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 5941bc1d07e5d58f9d848afbf1414ef4f78e9185) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 38677167535b480612809a53d824b86e11b2e5f9) @@ -180,7 +180,7 @@ * | #2:(U32) | \ref dialysateFlowRate | * | #3:(F32) | \ref dialysateTemperature | * | #4:(U32) | \ref acidConcentrate | - * | #5:(U32) | \ref acidConcentrateConversionFactor | + * | #5:(F32) | \ref acidConcentrateConversionFactor | * | #6:(U32) | \ref bicarbConcentrate | * | #7:(U32) | \ref treatmentModality | * | #8:(U32) | \ref hepatitus | @@ -348,20 +348,22 @@ * * | MSG | CAN ID | Type | Ack | Src | Dst | Description | * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | - * |0x6600| 0x041 | Req | Y | UI | HD | UF Vol. Change User Confirm | + * |0x6600| 0x041 | Req | Y | UI | TD | UF Vol. Change User Confirm | * * | Payload || * | || * | #1:(F32) | \ref volume | + * | #2:(F32) | \ref rate | * * \sa Options * */ class MAdjustUltrafiltrationConfirmReq : public MModel { public: - float volume = 0; + float volume = 0; + float rate = 0; QString toString() { - return toString({volume}); + return toString({volume, rate}); } static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustUFConfirm", vParameters); @@ -555,7 +557,7 @@ * * | MSG | CAN ID | Type | Ack | Src | Dest | Description | * |:----:|:------:|:----:|:---:|:---:|:----:|:---------------------------:| - * |0x4600| 0x100 | Req | Y | UI | TD | A/V BP Limit Change Request | + * |0x7200| 0x100 | Req | Y | UI | TD | A/V BP Limit Change Request | * * | Payload ||| * | ||| Index: sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.h =================================================================== diff -u -r8325066ffcce349e21df74e33bd3d298d3042ef3 -r38677167535b480612809a53d824b86e11b2e5f9 --- sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.h (.../MTreatmentAdjustPressuresLimitsResponse.h) (revision 8325066ffcce349e21df74e33bd3d298d3042ef3) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.h (.../MTreatmentAdjustPressuresLimitsResponse.h) (revision 38677167535b480612809a53d824b86e11b2e5f9) @@ -32,7 +32,7 @@ * * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:----------------------------:| - * |0x7200| 0x020 | 6 | Rsp | Y | TD | UI | A/V BP Limit Change Response | + * |0x7300| 0x020 | 6 | Rsp | Y | TD | UI | A/V BP Limit Change Response | * * | Payload || * | || Index: sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.cpp =================================================================== diff -u -r3ba0ffbe79f453701c0e7f55e4dae72ca3e45142 -r38677167535b480612809a53d824b86e11b2e5f9 --- sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.cpp (.../MTreatmentAdjustUltrafiltrationEditResponse.cpp) (revision 3ba0ffbe79f453701c0e7f55e4dae72ca3e45142) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.cpp (.../MTreatmentAdjustUltrafiltrationEditResponse.cpp) (revision 38677167535b480612809a53d824b86e11b2e5f9) @@ -21,11 +21,7 @@ _data.mAccepted .value, _data.mReason .value, _data.mVolume .value, - _data.mDuration .value, - _data.mDurationDiff .value, _data.mRate .value, - _data.mRateDiff .value, - _data.mRateOld .value, }; } @@ -34,11 +30,7 @@ if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError; if ( ! GetValue(vByteArray, index, _data.mReason )) goto lError; if ( ! GetValue(vByteArray, index, _data.mVolume )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mDuration )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mDurationDiff )) goto lError; if ( ! GetValue(vByteArray, index, _data.mRate )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mRateDiff )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mRateOld )) goto lError; return true ; @@ -58,10 +50,6 @@ data.mAccepted = _data.mAccepted .value; data.mReason = _data.mReason .value; data.mVolume = _data.mVolume .value; - data.mDuration = _data.mDuration .value; - data.mDurationDiff = _data.mDurationDiff.value; data.mRate = _data.mRate .value; - data.mRateDiff = _data.mRateDiff .value; - data.mRateOld = _data.mRateOld .value; return data; } Index: sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.h =================================================================== diff -u -r3ba0ffbe79f453701c0e7f55e4dae72ca3e45142 -r38677167535b480612809a53d824b86e11b2e5f9 --- sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.h (.../MTreatmentAdjustUltrafiltrationEditResponse.h) (revision 3ba0ffbe79f453701c0e7f55e4dae72ca3e45142) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.h (.../MTreatmentAdjustUltrafiltrationEditResponse.h) (revision 38677167535b480612809a53d824b86e11b2e5f9) @@ -38,14 +38,8 @@ * | || * | #1:(U32) | \ref Data::mAccepted | * | #2:(U32) | \ref Data::mReason | - * | | | * | #3:(F32) | \ref Data::mVolume | - * | #4:(U32) | \ref Data::mDuration | - * | #5:(S32) | \ref Data::mDurationDiff | - * | | | - * | #6:(F32) | \ref Data::mRate | - * | #7:(F32) | \ref Data::mRateDiff | - * | #8:(F32) | \ref Data::mRateOld | + * | #4:(F32) | \ref Data::mRate | * * \sa Data * @@ -68,11 +62,7 @@ Types::U32 mAccepted ; Types::U32 mReason ; Types::F32 mVolume ; - Types::U32 mDuration ; - Types::S32 mDurationDiff ; Types::F32 mRate ; - Types::F32 mRateDiff ; - Types::F32 mRateOld ; } _data; public: @@ -87,11 +77,7 @@ bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ float mVolume = 0; /*!< volume value of type float extracted out */ - quint32 mDuration = 0; /*!< duration 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 mRateOld = 0; /*!< rateOld value of type float extracted out */ }; public: Index: sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp =================================================================== diff -u -r43ae56f762e6f3e1416d39e3d16f9103fc597e41 -r38677167535b480612809a53d824b86e11b2e5f9 --- sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp (.../VPreTreatmentStatesData.cpp) (revision 43ae56f762e6f3e1416d39e3d16f9103fc597e41) +++ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp (.../VPreTreatmentStatesData.cpp) (revision 38677167535b480612809a53d824b86e11b2e5f9) @@ -86,22 +86,25 @@ // Self tests dry state bool mSelfTestDry = vData.mSubMode == GuiPreTreatmentStates ::TD_PRE_TREATMENT_SELF_TEST_DRY_STATE ; if ( mSelfTestDry ) { - selfTestDry_start ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_START_STATE ); - selfTestDry_waitDoorClose ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE ); - selfTestDry_usedCartridge ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE ); - selfTestDry_cartridgeLoaded ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_STATE ); - selfTestDry_pressureSensorsNormalSetup ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_SETUP_STATE ); - selfTestDry_pressureSensorsVenousSetup ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_PRESSURE_SENSORS_VENOUS_SETUP_STATE ); - selfTestDry_pressureSensorsVenous ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_PRESSURE_SENSORS_VENOUS ); - selfTestDry_pressureSensorsArterialSetup ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_PRESSURE_SENSORS_ARTERIAL_SETUP_STATE ); - selfTestDry_pressureSensorsArterial ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_PRESSURE_SENSORS_ARTERIAL ); - selfTestDry_pressureSensorsDecay ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_PRESSURE_SENSORS_DECAY_STATE ); - selfTestDry_pressureSensorsStability ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_PRESSURE_SENSORS_STABILITY_STATE ); - selfTestDry_pressureSensorsNormal ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE ); - selfTestDry_syringePump ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE ); - selfTestDry_syringePumpOcclusionDetection ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_DETECTION_STATE ); - selfTestDry_stopped ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_STOPPED_STATE ); - selfTestDry_complete ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_COMPLETE_STATE ); + selfTestDry_start ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_START_STATE ); + selfTestDry_waitDoorClose ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE ); + selfTestDry_usedTubeSetCheck ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_USED_TUBE_SET_CHECK_STATE ); + selfTestDry_tubeSetLoadedCheck ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_TUBE_SET_LOADED_CHECK_STATE ); + selfTestDry_tubeSetAuthentication ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_TUBE_SET_AUTHENTICATION_STATE ); + selfTestDry_syringePumpSeek ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_SYRINGE_PUMP_SEEK_STATE ); + selfTestDry_pressureSensorNormalSetup ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_PRESSURE_SENSOR_NORMAL_SETUP_STATE ); + selfTestDry_pressureSensorVenousSetup ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_PRESSURE_VENOUS_SETUP_STATE ); + selfTestDry_venousPressureStabilization ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_VENOUS_PRESSURE_STABILIZATION_STATE ); + selfTestDry_venousPressureLeakCheck ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_VENOUS_PRESSURE_LEAK_CHECK_STATE ); + selfTestDry_venousPressureRelief ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_VENOUS_PRESSURE_RELIEF_STATE ); + selfTestDry_pressureArterialSetup ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_PRESSURE_ARTERIAL_SETUP_STATE ); + selfTestDry_arterialPressureStabilization ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_ARTERIAL_PRESSURE_STABILIZATION_STATE ); + selfTestDry_arterialPressureLeakCheck ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_ARTERIAL_PRESSURE_LEAK_CHECK_STATE ); + selfTestDry_arterialPressureRelief ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_ARTERIAL_PRESSURE_RELIEF_STATE ); + selfTestDry_syringePump ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE ); + selfTestDry_syringePumpOcclusionCheck ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_CHECK_STATE ); + selfTestDry_complete ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_COMPLETE_STATE ); + selfTestDry_stopped ( vData.mSelfTestDryState == GuiPreTreatmentSelfTestDryStates ::DRY_SELF_TESTS_STOPPED_STATE ); } selfTestDry(mSelfTestDry); // it's the main even so moved last to have all the sub-states updated prior to. Index: sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r38677167535b480612809a53d824b86e11b2e5f9 --- sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h (.../VPreTreatmentStatesData.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h (.../VPreTreatmentStatesData.h) (revision 38677167535b480612809a53d824b86e11b2e5f9) @@ -89,22 +89,23 @@ // Self tests dry state PROPERTY( bool , selfTestDry_start , false ) ///< DRY_SELF_TESTS_START_STATE , Dry self-tests starting state. PROPERTY( bool , selfTestDry_waitDoorClose , false ) ///< DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE , Wait for door to close before executing self-tests. - STATE ( bool , selfTestDry_usedCartridge , false ) ///< DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE , Used Cartridge self-test state. - STATE ( bool , selfTestDry_cartridgeLoaded , false ) ///< DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_STATE , Cartridge loaded check dry self-test state. - - STATE ( bool , selfTestDry_pressureSensorsNormalSetup , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_SETUP_STATE , Pressure sensor setup state. - STATE ( bool , selfTestDry_pressureSensorsVenousSetup , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_VENOUS_SETUP_STATE , Venous pressure sensor dry self-test setup valves and pump state - STATE ( bool , selfTestDry_pressureSensorsVenous , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_VENOUS , Venous pressure sensor dry self-test - STATE ( bool , selfTestDry_pressureSensorsArterialSetup , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_ARTERIAL_SETUP_STATE , Arterial pressure sensor dry self-test setup valves and pump state - STATE ( bool , selfTestDry_pressureSensorsArterial , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_ARTERIAL , Arterial pressure sensor dry self-test - - STATE ( bool , selfTestDry_pressureSensorsDecay , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_DECAY_STATE , Pressure sensors verify pressure loss state - STATE ( bool , selfTestDry_pressureSensorsStability , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_STABILITY_STATE , Pressure sensors verify pressure stability state - STATE ( bool , selfTestDry_pressureSensorsNormal , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE , Pressure sensors verify normal pressure readings state. + STATE ( bool , selfTestDry_usedTubeSetCheck , false ) ///< DRY_SELF_TESTS_USED_TUBE_SET_CHECK_STATE + STATE ( bool , selfTestDry_tubeSetLoadedCheck , false ) ///< DRY_SELF_TESTS_TUBE_SET_LOADED_CHECK_STATE + STATE ( bool , selfTestDry_tubeSetAuthentication , false ) ///< DRY_SELF_TESTS_TUBE_SET_AUTHENTICATION_STATE + STATE ( bool , selfTestDry_syringePumpSeek , false ) ///< DRY_SELF_TESTS_SYRINGE_PUMP_SEEK_STATE + STATE ( bool , selfTestDry_pressureSensorNormalSetup , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSOR_NORMAL_SETUP_STATE + STATE ( bool , selfTestDry_pressureSensorVenousSetup , false ) ///< DRY_SELF_TESTS_PRESSURE_VENOUS_SETUP_STATE + STATE ( bool , selfTestDry_venousPressureStabilization , false ) ///< DRY_SELF_TESTS_VENOUS_PRESSURE_STABILIZATION_STATE + STATE ( bool , selfTestDry_venousPressureLeakCheck , false ) ///< DRY_SELF_TESTS_VENOUS_PRESSURE_LEAK_CHECK_STATE + STATE ( bool , selfTestDry_venousPressureRelief , false ) ///< DRY_SELF_TESTS_VENOUS_PRESSURE_RELIEF_STATE + STATE ( bool , selfTestDry_pressureArterialSetup , false ) ///< DRY_SELF_TESTS_PRESSURE_ARTERIAL_SETUP_STATE + STATE ( bool , selfTestDry_arterialPressureStabilization, false ) ///< DRY_SELF_TESTS_ARTERIAL_PRESSURE_STABILIZATION_STATE + STATE ( bool , selfTestDry_arterialPressureLeakCheck , false ) ///< DRY_SELF_TESTS_ARTERIAL_PRESSURE_LEAK_CHECK_STATE + STATE ( bool , selfTestDry_arterialPressureRelief , false ) ///< DRY_SELF_TESTS_ARTERIAL_PRESSURE_RELIEF_STATE STATE ( bool , selfTestDry_syringePump , false ) ///< DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE , Prime syringe pump state - STATE ( bool , selfTestDry_syringePumpOcclusionDetection, false ) ///< DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_DETECTION_STATE , Occlusion detection state - STATE ( bool , selfTestDry_stopped , false ) ///< DRY_SELF_TESTS_STOPPED_STATE , Dry self-test stopped state. + STATE ( bool , selfTestDry_syringePumpOcclusionCheck , false ) ///< DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_CHECK_STATE, Occlusion check state STATE ( bool , selfTestDry_complete , false ) ///< DRY_SELF_TESTS_COMPLETE_STATE , Dry self-test complete state. + STATE ( bool , selfTestDry_stopped , false ) ///< DRY_SELF_TESTS_STOPPED_STATE , Dry self-test stopped state. // Prime blood and dialysate circuits and run wet self-tests state STATE ( bool , prime_waitUserStart , false ) ///< HD_PRIME_WAIT_FOR_USER_START_STATE , Wait for user to start prime state Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp =================================================================== diff -u -r48343520806859178923efdcca8a95f6af8599e9 -r38677167535b480612809a53d824b86e11b2e5f9 --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp (.../VTreatmentAdjustmentUltrafiltrationConfirm.cpp) (revision 48343520806859178923efdcca8a95f6af8599e9) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp (.../VTreatmentAdjustmentUltrafiltrationConfirm.cpp) (revision 38677167535b480612809a53d824b86e11b2e5f9) @@ -47,8 +47,9 @@ * \details the invocable slot to adjust the ultrafiltration set volume * \param vVolume - the new ultrafiltration volume */ -void View::VTreatmentAdjustmentUltrafiltrationConfirm::doConfirm(float vVolume) +void View::VTreatmentAdjustmentUltrafiltrationConfirm::doConfirm(float vVolume, float vRate) { - _data.volume = int(vVolume * 1000); // cast to int to truncate the float after convert to mL + _data.volume = vVolume; + _data.rate = vRate; emit didAdjustment(_data); } Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.h =================================================================== diff -u -r48343520806859178923efdcca8a95f6af8599e9 -r38677167535b480612809a53d824b86e11b2e5f9 --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.h (.../VTreatmentAdjustmentUltrafiltrationConfirm.h) (revision 48343520806859178923efdcca8a95f6af8599e9) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.h (.../VTreatmentAdjustmentUltrafiltrationConfirm.h) (revision 38677167535b480612809a53d824b86e11b2e5f9) @@ -47,7 +47,7 @@ // ----------- Adjust Ultrafiltration public slots: - void doConfirm (float vVolume); + void doConfirm (float vVolume, float vRate); signals: /*! Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.cpp =================================================================== diff -u -raa03f07a386a12895435facfff9f4bff9f7a45f0 -r38677167535b480612809a53d824b86e11b2e5f9 --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.cpp (.../VTreatmentAdjustmentUltrafiltrationEdit.cpp) (revision aa03f07a386a12895435facfff9f4bff9f7a45f0) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.cpp (.../VTreatmentAdjustmentUltrafiltrationEdit.cpp) (revision 38677167535b480612809a53d824b86e11b2e5f9) @@ -36,13 +36,8 @@ { adjustment_Accepted ( vData.mAccepted ); adjustment_Reason ( vData.mReason ); - - volume ( vData.mVolume / 1000 ); // mL => L - duration ( vData.mDuration ); - durationDiff ( vData.mDurationDiff ); + volume ( vData.mVolume ); rate ( vData.mRate ); - rateDiff ( vData.mRateDiff ); - 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. *** @@ -55,6 +50,6 @@ * \param vVolume - requested ultrafiltration volume */ void View::VTreatmentAdjustmentUltrafiltrationEdit::doAdjustment(float vVolume) { - _data.volume = vVolume * 1000; // L => mL - emit didAdjustment(_data); + _data.volume = vVolume ; + emit didAdjustment(_data) ; } Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.h =================================================================== diff -u -raa03f07a386a12895435facfff9f4bff9f7a45f0 -r38677167535b480612809a53d824b86e11b2e5f9 --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.h (.../VTreatmentAdjustmentUltrafiltrationEdit.h) (revision aa03f07a386a12895435facfff9f4bff9f7a45f0) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.h (.../VTreatmentAdjustmentUltrafiltrationEdit.h) (revision 38677167535b480612809a53d824b86e11b2e5f9) @@ -45,11 +45,7 @@ // Treatment Ultrafiltration data PROPERTY( float , volume , 0) - PROPERTY( quint32 , duration , 0) - PROPERTY( qint32 , durationDiff , 0) PROPERTY( float , rate , 0) - PROPERTY( float , rateDiff , 0) - PROPERTY( float , rateOld , 0) VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentUltrafiltrationEdit, AdjustUltrafiltrationEditResponseData)