Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r48b04367d9f229104e4048783df91089d0106379 -r29a44b6e5908da155195c138b5e522fa8ce90fb4 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 48b04367d9f229104e4048783df91089d0106379) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 29a44b6e5908da155195c138b5e522fa8ce90fb4) @@ -290,6 +290,10 @@ mData += vData.dialysateTemperature ; mData += vData.acidConcentrate ; 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 -r48b04367d9f229104e4048783df91089d0106379 -r29a44b6e5908da155195c138b5e522fa8ce90fb4 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 48b04367d9f229104e4048783df91089d0106379) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 29a44b6e5908da155195c138b5e522fa8ce90fb4) @@ -168,7 +168,7 @@ {Gui::GuiActionType::ID_AdjustDurationConfirmRsp , 2 * 4 }, // 2 parameters each 4bytes // ---- - {Gui::GuiActionType::ID_AdjustSetPointsReq , 5 * 4 }, // 5 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustSetPointsReq , 9 * 4 }, // 5 parameter each 4bytes {Gui::GuiActionType::ID_AdjustSetPointsRsp , 2 * 4 }, // 2 parameters each 4bytes // ---- Index: sources/gui/qml/dialogs/headerbar/HeaderbarPrescription.qml =================================================================== diff -u -r52d17dab2211c2e4d9160c55c316ad7a40ce4d6c -r29a44b6e5908da155195c138b5e522fa8ce90fb4 --- sources/gui/qml/dialogs/headerbar/HeaderbarPrescription.qml (.../HeaderbarPrescription.qml) (revision 52d17dab2211c2e4d9160c55c316ad7a40ce4d6c) +++ sources/gui/qml/dialogs/headerbar/HeaderbarPrescription.qml (.../HeaderbarPrescription.qml) (revision 29a44b6e5908da155195c138b5e522fa8ce90fb4) @@ -30,10 +30,23 @@ onIsConfirmedChanged: if (isConfirmed) { _root.close() } + Text { id: descriptiveText + anchors { + top : parent.top +// topMargin : -10 + left : parent.left + leftMargin : Variables.defaultMargin * 5 + } + text : qsTr("[Original Prescribed Parameters]") + visible : vTDOpMode.inTreatment + color : Colors.mainTreatmentOrange + font.pixelSize : 24 + } + PreTreatmentCreateContent { id: _headerbarPrescriptionContent anchors { top : parent.top - topMargin : Variables.defaultMargin * -1 + topMargin : Variables.defaultMargin left : parent.left leftMargin : Variables.defaultMargin * 3 right : parent.right Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml =================================================================== diff -u -rd01d12afc4afacb7139315e91825ebbd5b6af748 -r29a44b6e5908da155195c138b5e522fa8ce90fb4 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision d01d12afc4afacb7139315e91825ebbd5b6af748) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision 29a44b6e5908da155195c138b5e522fa8ce90fb4) @@ -244,6 +244,8 @@ anchors.verticalCenter : parent.verticalCenter qrcode : vTreatmentCreate.txCode clear : ! _root.visible + height : 65 + width : height } Text { id: _txCode Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r7714d25c7d26b66d81becfd5023556ef4c233e05 -r29a44b6e5908da155195c138b5e522fa8ce90fb4 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 7714d25c7d26b66d81becfd5023556ef4c233e05) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 29a44b6e5908da155195c138b5e522fa8ce90fb4) @@ -149,22 +149,22 @@ //// Treatment Adjustment Dialogs TreatmentAdjustmentSetPoints { id: _treatmentAdjustmentSetPoints } TreatmentAdjustmentPressuresLimits { id: _treatmentAdjustmentPressuresLimits } - TreatmentAdjustmentBolusVolume { id: _treatmentAdjustmentBolusVolume } + TreatmentAdjustmentBolusVolume { id: _treatmentAdjustmentBolusVolume } TreatmentAdjustmentUltrafiltrationStack { id: _treatmentAdjustmentUltrafiltration } TreatmentAdjustmentHDF { id: _treatmentAdjustmentHDF } Connections { target: _treatmentAdjustmentSetPoints function onConfirmClicked ( vValue ) { vTreatmentAdjustmentSetPoints.doAdjustment( -// _treatmentAdjustmentSetPoints.treatmentModality , // TODO LDT-3800 _treatmentAdjustmentSetPoints.bloodFlowRate , _treatmentAdjustmentSetPoints.dialysateFlowRate , _treatmentAdjustmentSetPoints.dialysateTemperature , -// _treatmentAdjustmentSetPoints.hepatitus // TODO LDT-3800 _treatmentAdjustmentSetPoints.acidConcentrate , - _treatmentAdjustmentSetPoints.bicarbConcentrate -// _treatmentAdjustmentSetPoints.sodium // TODO LDT-3800 -// _treatmentAdjustmentSetPoints.bicarboante // TODO LDT-3800 + _treatmentAdjustmentSetPoints.bicarbConcentrate , + _treatmentAdjustmentSetPoints.treatmentModality , + _treatmentAdjustmentSetPoints.hepatitus , + _treatmentAdjustmentSetPoints.sodium , + _treatmentAdjustmentSetPoints.bicarbonate ) } } @@ -221,7 +221,7 @@ vTreatmentCreate.dryBicarbCartSize = _treatmentAdjustmentSetPoints.bicarbConcentrate vTreatmentCreate.hepatitusBStatus = _treatmentAdjustmentSetPoints.hepatitus vTreatmentCreate.sodium = _treatmentAdjustmentSetPoints.sodium - vTreatmentCreate.bicarbonate = _treatmentAdjustmentSetPoints.bicarboante + vTreatmentCreate.bicarbonate = _treatmentAdjustmentSetPoints.bicarbonate _treatmentAdjustmentSetPoints.close() } else { Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentSetPoints.qml =================================================================== diff -u -r7714d25c7d26b66d81becfd5023556ef4c233e05 -r29a44b6e5908da155195c138b5e522fa8ce90fb4 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentSetPoints.qml (.../TreatmentAdjustmentSetPoints.qml) (revision 7714d25c7d26b66d81becfd5023556ef4c233e05) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentSetPoints.qml (.../TreatmentAdjustmentSetPoints.qml) (revision 29a44b6e5908da155195c138b5e522fa8ce90fb4) @@ -39,7 +39,7 @@ readonly property alias acidConcentrate : _acidConcentrateComboBox.currentIndex readonly property alias bicarbConcentrate : _bicarbConcentrateComboBox.currentIndex readonly property alias sodium : _sodium.value - readonly property alias bicarboante : _bicarbonate.value + readonly property alias bicarbonate : _bicarbonate.value width : 1540 height : 865 Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h =================================================================== diff -u -rf723048b0efe2edf7cb08b9bba2ef67c55917503 -r29a44b6e5908da155195c138b5e522fa8ce90fb4 --- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision f723048b0efe2edf7cb08b9bba2ef67c55917503) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 29a44b6e5908da155195c138b5e522fa8ce90fb4) @@ -181,6 +181,10 @@ * | #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 | * */ class MAdjustSetPointsReq : public MModel { @@ -190,9 +194,21 @@ float dialysateTemperature = 0; quint32 acidConcentrate = 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}); + return toString({bloodFlowRate, + dialysateFlowRate, + dialysateTemperature, + acidConcentrate, + 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 -r5d5d783779f1554f5ed3c13f2c0f369842d5e79e -r29a44b6e5908da155195c138b5e522fa8ce90fb4 --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.cpp (.../VTreatmentAdjustmentSetPoints.cpp) (revision 5d5d783779f1554f5ed3c13f2c0f369842d5e79e) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.cpp (.../VTreatmentAdjustmentSetPoints.cpp) (revision 29a44b6e5908da155195c138b5e522fa8ce90fb4) @@ -45,15 +45,30 @@ * \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 */ -void VTreatmentAdjustmentSetPoints::doAdjustment(const quint32 vBloodFlowRate, const quint32 vDialysateFlowRate, - const float vDialysateTemperature, const quint32 vAcidConcentrate, const quint32 vBicarbConcentrate) +void VTreatmentAdjustmentSetPoints::doAdjustment(const quint32 vBloodFlowRate, + const quint32 vDialysateFlowRate, + const float vDialysateTemperature, + const quint32 vAcidConcentrate, + 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; emit didAdjustment(_data); } Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.h =================================================================== diff -u -r62797b3c6e0539e22a04404e16daa7c4465e178f -r29a44b6e5908da155195c138b5e522fa8ce90fb4 --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.h (.../VTreatmentAdjustmentSetPoints.h) (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.h (.../VTreatmentAdjustmentSetPoints.h) (revision 29a44b6e5908da155195c138b5e522fa8ce90fb4) @@ -46,8 +46,15 @@ VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentSetPoints, AdjustSetPointsResponseData) public slots: - void doAdjustment(const quint32 vBloodFlowRate, const quint32 vDialysateFlowRate, const float vDialysateTemperature, - const quint32 vAcidConcentrate, const quint32 vBicarbConcentrate); + void doAdjustment(const quint32 vBloodFlowRate, + const quint32 vDialysateFlowRate, + const float vDialysateTemperature, + const quint32 vAcidConcentrate, + const quint32 vBicarbConcentrate, + const quint32 vTreatmentModality, + const quint32 vHepatitus, + const quint32 vSodium, + const quint32 vBicarbonate ); signals: /*!