Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r5335f246461dfd5b9a48dcc8c01aa97778ae773b -r5fdac82425ab432aeda805a3ed7ad8cb2efc2bd1 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 5335f246461dfd5b9a48dcc8c01aa97778ae773b) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 5fdac82425ab432aeda805a3ed7ad8cb2efc2bd1) @@ -665,6 +665,7 @@ { QVariantList mData; mData += vData.requestedState; + mData += vData.modality; actionTransmit(GuiActionType::ID_AdjustInitTreatmentReq, mData); } Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -re7a8d5092cb499d6c6ed621eabde437bccbc1e0e -r5fdac82425ab432aeda805a3ed7ad8cb2efc2bd1 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision e7a8d5092cb499d6c6ed621eabde437bccbc1e0e) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 5fdac82425ab432aeda805a3ed7ad8cb2efc2bd1) @@ -222,7 +222,7 @@ // Pre-Treatment // Create Parameters // Pre-Treatment Initiate Treatment - {Gui::GuiActionType::ID_AdjustInitTreatmentReq , 1 * 4 }, // 1 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustInitTreatmentReq , 2 * 4 }, // 1 parameters each 4bytes {Gui::GuiActionType::ID_AdjustInitTreatmentRsp , 2 * 4 }, // 2 parameters each 4bytes // Pre-Treatment Treatment Parameters Validation/Confirm {Gui::GuiActionType::ID_AdjustParametersValidationReq , 25 * 4 }, //25 parameters each 4bytes Index: sources/gui/qml/components/HeaderBar.qml =================================================================== diff -u -r80e196a153549a10b01ddc52fdd3c4f09d215da6 -r5fdac82425ab432aeda805a3ed7ad8cb2efc2bd1 --- sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision 80e196a153549a10b01ddc52fdd3c4f09d215da6) +++ sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision 5fdac82425ab432aeda805a3ed7ad8cb2efc2bd1) @@ -32,8 +32,9 @@ } enum TreatmentModality { - Mode_HD , - Mode_HDF + Mode_HD , + Mode_HDF , + Mode_HD_Online_Fluid } onIsHDFFeaturedChanged : vHeaderbarModel.setHeaderbarHDFVisible(_root.isHDFFeatured ) Index: sources/gui/qml/pages/MainHome.qml =================================================================== diff -u -r39a514158384c0ad4bfcfb90bafbaa4ca8dc5a26 -r5fdac82425ab432aeda805a3ed7ad8cb2efc2bd1 --- sources/gui/qml/pages/MainHome.qml (.../MainHome.qml) (revision 39a514158384c0ad4bfcfb90bafbaa4ca8dc5a26) +++ sources/gui/qml/pages/MainHome.qml (.../MainHome.qml) (revision 5fdac82425ab432aeda805a3ed7ad8cb2efc2bd1) @@ -82,6 +82,23 @@ selectColor : Colors.backgroundButtonSelectDark } + TouchRect { id : _createHDOnlineFluidTreatment + anchors { + top : _createHDFTreatment.bottom + topMargin : Variables.defaultMargin * 2 + horizontalCenter: _createHDFTreatment.horizontalCenter + } + text.text : qsTr("Hemodialysis-Online Fluid") + onClicked : createTreatment(HeaderBar.Mode_HD_Online_Fluid) + width : 435 //// ----- @LEAHIZED: Move to Variables.qml + height : 92 //// ----- @LEAHIZED: Move to Variables.qml + pixelSize : 30 //// ----- @LEAHIZED: Move to Variables.qml + backgroundColor : Colors.panelBackgroundColor + borderColor : Colors.panelBorderColor + selectColor : Colors.backgroundButtonSelectDark + } + + NotificationBarSmall { id: _notification anchors.bottomMargin: Variables.mainMenuHeight } Index: sources/gui/qml/pages/MainStack.qml =================================================================== diff -u -r4fd94e57fbbdb54c779f28ef50f0997e8eefee5f -r5fdac82425ab432aeda805a3ed7ad8cb2efc2bd1 --- sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 4fd94e57fbbdb54c779f28ef50f0997e8eefee5f) +++ sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 5fdac82425ab432aeda805a3ed7ad8cb2efc2bd1) @@ -63,7 +63,7 @@ MainHome { id: _mainHome onCreateTreatment: function (vValue) { vTreatmentCreate.treatmentModality = vValue - vPreTreatmentAdjustmentInitTreatment.doInitiate( ) + vPreTreatmentAdjustmentInitTreatment.doInitiate( vValue ) } } Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h =================================================================== diff -u -rac290dfdbd332fafc7a70ad7f78a21ef15e7f82e -r5fdac82425ab432aeda805a3ed7ad8cb2efc2bd1 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision ac290dfdbd332fafc7a70ad7f78a21ef15e7f82e) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision 5fdac82425ab432aeda805a3ed7ad8cb2efc2bd1) @@ -44,6 +44,7 @@ * | Payload || * | || * | #1:(U32) | \ref requestedState | + * | #2:(U32) | \ref modality | * */ class MAdjustInitTreatmentReq : public MModel { @@ -53,7 +54,9 @@ eCancel = 0, eInitiate = 1, }; - Options requestedState = eUnknown; + Options requestedState = eUnknown; + quint32 modality = 0; + QString toString() { return toString({requestedState}); } Index: sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r5fdac82425ab432aeda805a3ed7ad8cb2efc2bd1 --- sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.cpp (.../VPreTreatmentAdjustmentInitTreatment.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.cpp (.../VPreTreatmentAdjustmentInitTreatment.cpp) (revision 5fdac82425ab432aeda805a3ed7ad8cb2efc2bd1) @@ -46,9 +46,10 @@ * \brief View::VPreTreatmentAdjustmentInitTreatment::doInitiate * \details requests to initiate a treatment and starting to set treatment parameters. */ -void View::VPreTreatmentAdjustmentInitTreatment::doInitiate() { +void View::VPreTreatmentAdjustmentInitTreatment::doInitiate( int vTreatmentModality ) { AdjustInitTreatmentRequestData data; data.requestedState = AdjustInitTreatmentRequestData::eInitiate; + data.modality = vTreatmentModality; emit didAdjustment(data); } Index: sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r5fdac82425ab432aeda805a3ed7ad8cb2efc2bd1 --- sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.h (.../VPreTreatmentAdjustmentInitTreatment.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.h (.../VPreTreatmentAdjustmentInitTreatment.h) (revision 5fdac82425ab432aeda805a3ed7ad8cb2efc2bd1) @@ -45,7 +45,7 @@ // ----------- Adjust Ultrafiltration public slots: - void doInitiate(); + void doInitiate( int vTreatmentModality ); void doCancel (); signals: