Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r0d1a10c754665f397bf7e507643d928657ed9561 -rb2db816026524a19086e900eef867d7f5a3aa6f2 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 0d1a10c754665f397bf7e507643d928657ed9561) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision b2db816026524a19086e900eef867d7f5a3aa6f2) @@ -285,15 +285,16 @@ void MessageDispatcher::onAdjustment(const AdjustSetPointsRequestData &vData) { QVariantList mData; - mData += vData.bloodFlowRate ; - mData += vData.dialysateFlowRate ; - mData += vData.dialysateTemperature ; - mData += vData.acidConcentrate ; - mData += vData.bicarbConcentrate ; - mData += vData.treatmentModality ; - mData += vData.hepatitus ; - mData += vData.sodium ; - mData += vData.bicarbonate ; + mData += vData.bloodFlowRate ; + mData += vData.dialysateFlowRate ; + mData += vData.dialysateTemperature ; + mData += vData.acidConcentrate ; + mData += vData.acidConcentrateConversionFactor ; + mData += vData.bicarbConcentrate ; + mData += vData.treatmentModality ; + mData += vData.hepatitus ; + mData += vData.sodium ; + mData += vData.bicarbonate ; onActionTransmit(GuiActionType::ID_AdjustSetPointsReq, mData); } Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r4a3504bdb88da3e7ae9b5d43d5ab5b11c9b7f884 -rb2db816026524a19086e900eef867d7f5a3aa6f2 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 4a3504bdb88da3e7ae9b5d43d5ab5b11c9b7f884) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision b2db816026524a19086e900eef867d7f5a3aa6f2) @@ -168,7 +168,7 @@ {Gui::GuiActionType::ID_AdjustDurationConfirmRsp , 2 * 4 }, // 2 parameters each 4bytes // ---- - {Gui::GuiActionType::ID_AdjustSetPointsReq , 9 * 4 }, // 5 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustSetPointsReq , 10 * 4 }, // 5 parameter each 4bytes {Gui::GuiActionType::ID_AdjustSetPointsRsp , 2 * 4 }, // 2 parameters each 4bytes // ---- Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r29a44b6e5908da155195c138b5e522fa8ce90fb4 -rb2db816026524a19086e900eef867d7f5a3aa6f2 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 29a44b6e5908da155195c138b5e522fa8ce90fb4) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision b2db816026524a19086e900eef867d7f5a3aa6f2) @@ -160,6 +160,7 @@ _treatmentAdjustmentSetPoints.dialysateFlowRate , _treatmentAdjustmentSetPoints.dialysateTemperature , _treatmentAdjustmentSetPoints.acidConcentrate , + vTreatmentRanges.acidConcentrateModel.get(_treatmentAdjustmentSetPoints.acidConcentrate).value, _treatmentAdjustmentSetPoints.bicarbConcentrate , _treatmentAdjustmentSetPoints.treatmentModality , _treatmentAdjustmentSetPoints.hepatitus , @@ -217,7 +218,7 @@ // TODO update setpoints here? vTreatmentCreate.treatmentModality = _treatmentAdjustmentSetPoints.treatmentModality vTreatmentCreate.acidConcentrate = _treatmentAdjustmentSetPoints.acidConcentrate - vTreatmentCreate.acidConcentrateConversionFactor = vTreatmentRanges.acidConcentrateModel.get(vTreatmentCreate.acidConcentrate).value + vTreatmentCreate.acidConcentrateConversionFactor = _treatmentAdjustmentSetPoints.acidConcentrateConversionFactor vTreatmentCreate.dryBicarbCartSize = _treatmentAdjustmentSetPoints.bicarbConcentrate vTreatmentCreate.hepatitusBStatus = _treatmentAdjustmentSetPoints.hepatitus vTreatmentCreate.sodium = _treatmentAdjustmentSetPoints.sodium Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h =================================================================== diff -u -r29a44b6e5908da155195c138b5e522fa8ce90fb4 -rb2db816026524a19086e900eef867d7f5a3aa6f2 --- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 29a44b6e5908da155195c138b5e522fa8ce90fb4) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision b2db816026524a19086e900eef867d7f5a3aa6f2) @@ -176,39 +176,42 @@ * * | Payload || * | || - * | #1:(U32) | \ref bloodFlowRate | - * | #2:(U32) | \ref dialysateFlowRate | - * | #3:(F32) | \ref dialysateTemperature | - * | #4:(U32) | \ref acidConcentrate | - * | #5:(U32) | \ref bicarbConcentrate | - * | #6:(U32) | \ref treatmentModality | - * | #7:(U32) | \ref hepatitus | - * | #8:(U32) | \ref sodium | - * | #9:(U32) | \ref bicarbonate | + * | #1:(U32) | \ref bloodFlowRate | + * | #2:(U32) | \ref dialysateFlowRate | + * | #3:(F32) | \ref dialysateTemperature | + * | #4:(U32) | \ref acidConcentrate | + * | #5:(U32) | \ref acidConcentrateConversionFactor | + * | #6:(U32) | \ref bicarbConcentrate | + * | #7:(U32) | \ref treatmentModality | + * | #8:(U32) | \ref hepatitus | + * | #9:(U32) | \ref sodium | + * | #10:(U32)| \ref bicarbonate | * */ class MAdjustSetPointsReq : public MModel { public: - quint32 bloodFlowRate = 0; - quint32 dialysateFlowRate = 0; - float dialysateTemperature = 0; - quint32 acidConcentrate = 0; - quint32 bicarbConcentrate = 0; - quint32 treatmentModality = 0; - quint32 hepatitus = 0; - quint32 sodium = 0; - quint32 bicarbonate = 0; + quint32 bloodFlowRate = 0; + quint32 dialysateFlowRate = 0; + float dialysateTemperature = 0; + quint32 acidConcentrate = 0; + float acidConcentrateConversionFactor = 0; + quint32 bicarbConcentrate = 0; + quint32 treatmentModality = 0; + quint32 hepatitus = 0; + quint32 sodium = 0; + quint32 bicarbonate = 0; QString toString() { - return toString({bloodFlowRate, - dialysateFlowRate, - dialysateTemperature, - acidConcentrate, - bicarbConcentrate, - treatmentModality, - hepatitus, - sodium, - bicarbonate}); + return toString({ bloodFlowRate, + dialysateFlowRate, + dialysateTemperature, + acidConcentrate, + acidConcentrateConversionFactor, + bicarbConcentrate, + treatmentModality, + hepatitus, + sodium, + bicarbonate}); } static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustSetPointsReq", vParameters); Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.cpp =================================================================== diff -u -r29a44b6e5908da155195c138b5e522fa8ce90fb4 -rb2db816026524a19086e900eef867d7f5a3aa6f2 --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.cpp (.../VTreatmentAdjustmentSetPoints.cpp) (revision 29a44b6e5908da155195c138b5e522fa8ce90fb4) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.cpp (.../VTreatmentAdjustmentSetPoints.cpp) (revision b2db816026524a19086e900eef867d7f5a3aa6f2) @@ -40,35 +40,38 @@ * \brief doAdjustment * \details the invocable slot to adjust the fluid bolus volume * \param vSetPoints - fluid bolus volume adjusted value - * \param vBloodFlowRate - adjusted blood flow rate value - * \param vDialysateFlowRate - adjusted dialysate flow rate value - * \param vDialysateTemperature - adjusted dialysate temperature value - * \param vAcidConcentrate - adjusted acid concentrate value - * \param vBicarbConcentrate - adjusted bicarbonate concentrate value - * \param vTreatmentModality - adjusted treatment modality - * \param vHepatitus - adjusted hepatitis status - * \param vSodium - adjusted sodium - * \param vBicarbonate - adjusted bicarbonate + * \param vBloodFlowRate - adjusted blood flow rate value + * \param vDialysateFlowRate - adjusted dialysate flow rate value + * \param vDialysateTemperature - adjusted dialysate temperature value + * \param vAcidConcentrate - adjusted acid concentrate value + * \param vAcidConcentrateConversionFactor - adjusted acid concentrate conversion factro value + * \param vBicarbConcentrate - adjusted bicarbonate concentrate value + * \param vTreatmentModality - adjusted treatment modality + * \param vHepatitus - adjusted hepatitis status + * \param vSodium - adjusted sodium + * \param vBicarbonate - adjusted bicarbonate */ void VTreatmentAdjustmentSetPoints::doAdjustment(const quint32 vBloodFlowRate, const quint32 vDialysateFlowRate, const float vDialysateTemperature, const quint32 vAcidConcentrate, + const float vAcidConcentrateConversionFactor, const quint32 vBicarbConcentrate, const quint32 vTreatmentModality, const quint32 vHepatitus, const quint32 vSodium, const quint32 vBicarbonate ) { - _data.bloodFlowRate = vBloodFlowRate; - _data.dialysateFlowRate = vDialysateFlowRate; - _data.dialysateTemperature = vDialysateTemperature; - _data.acidConcentrate = vAcidConcentrate; - _data.bicarbConcentrate = vBicarbConcentrate; - _data.treatmentModality = vTreatmentModality; - _data.hepatitus = vHepatitus; - _data.sodium = vSodium; - _data.bicarbonate = vBicarbonate; + _data.bloodFlowRate = vBloodFlowRate; + _data.dialysateFlowRate = vDialysateFlowRate; + _data.dialysateTemperature = vDialysateTemperature; + _data.acidConcentrate = vAcidConcentrate; + _data.acidConcentrateConversionFactor = vAcidConcentrateConversionFactor; + _data.bicarbConcentrate = vBicarbConcentrate; + _data.treatmentModality = vTreatmentModality; + _data.hepatitus = vHepatitus; + _data.sodium = vSodium; + _data.bicarbonate = vBicarbonate; emit didAdjustment(_data); } Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.h =================================================================== diff -u -r29a44b6e5908da155195c138b5e522fa8ce90fb4 -rb2db816026524a19086e900eef867d7f5a3aa6f2 --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.h (.../VTreatmentAdjustmentSetPoints.h) (revision 29a44b6e5908da155195c138b5e522fa8ce90fb4) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.h (.../VTreatmentAdjustmentSetPoints.h) (revision b2db816026524a19086e900eef867d7f5a3aa6f2) @@ -48,8 +48,9 @@ public slots: void doAdjustment(const quint32 vBloodFlowRate, const quint32 vDialysateFlowRate, - const float vDialysateTemperature, + const float vDialysateTemperature, const quint32 vAcidConcentrate, + const float vAcidConcentrateConversionFactor, const quint32 vBicarbConcentrate, const quint32 vTreatmentModality, const quint32 vHepatitus,