Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -re7a8d5092cb499d6c6ed621eabde437bccbc1e0e -r45cc119e54711893ccc2b9d600412b8f51b7764f --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision e7a8d5092cb499d6c6ed621eabde437bccbc1e0e) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 45cc119e54711893ccc2b9d600412b8f51b7764f) @@ -80,8 +80,8 @@ {Gui::GuiActionType::ID_Ultrafiltration , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_IsolatedUF , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_Heparin , 2 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_Rinseback , 6 * 4 }, // 6 parameters each 4bytes - {Gui::GuiActionType::ID_Recirculate , 2 * 4 }, // 2 parameters each 4bytes + {Gui::GuiActionType::ID_Rinseback , 7 * 4 }, // 6 parameters each 4bytes + {Gui::GuiActionType::ID_Recirculate , 1 * 4 }, // 1 parameters each 4bytes {Gui::GuiActionType::ID_BloodPrime , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_TreatmentStop , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_TDAirBubbleData , 2 * 4 }, // 2 parameters each 4bytes Index: sources/gui/qml/dialogs/RinsebackCompleteDialog.qml =================================================================== diff -u -r1286d74bd015276aab604808be2766136091c125 -r45cc119e54711893ccc2b9d600412b8f51b7764f --- sources/gui/qml/dialogs/RinsebackCompleteDialog.qml (.../RinsebackCompleteDialog.qml) (revision 1286d74bd015276aab604808be2766136091c125) +++ sources/gui/qml/dialogs/RinsebackCompleteDialog.qml (.../RinsebackCompleteDialog.qml) (revision 45cc119e54711893ccc2b9d600412b8f51b7764f) @@ -3,13 +3,11 @@ import "qrc:/components" ConfirmDialog { id: _root - property bool isTxCompleted: false - messageText : qsTr("Blood Return Complete!") confirmText : qsTr("Fluid Bolus") cancelText : qsTr("End Treatment") extraText : qsTr("Recirculate") - extraVisible : ! _root.isTxCompleted + extraVisible : vTreatmentRinseback.isRecircAllowed isConfirmDefault: false width : Variables.completeDialogWidth Index: sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml =================================================================== diff -u -r39a514158384c0ad4bfcfb90bafbaa4ca8dc5a26 -r45cc119e54711893ccc2b9d600412b8f51b7764f --- sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml (.../EndTreatmentRinsebackStack.qml) (revision 39a514158384c0ad4bfcfb90bafbaa4ca8dc5a26) +++ sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml (.../EndTreatmentRinsebackStack.qml) (revision 45cc119e54711893ccc2b9d600412b8f51b7764f) @@ -27,8 +27,6 @@ * \brief the end treatment rinseback stack screen */ StackItem { id: _root - objectName: "_EndTreatmentRinsebackStack" - stackView.initialItem : null property int stackStepIndex : 0 Index: sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentRecirculateProgress.qml =================================================================== diff -u -rf41a1003ac920b64a11fc34193972bd1240003f3 -r45cc119e54711893ccc2b9d600412b8f51b7764f --- sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentRecirculateProgress.qml (.../EndTreatmentRecirculateProgress.qml) (revision f41a1003ac920b64a11fc34193972bd1240003f3) +++ sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentRecirculateProgress.qml (.../EndTreatmentRecirculateProgress.qml) (revision 45cc119e54711893ccc2b9d600412b8f51b7764f) @@ -13,7 +13,6 @@ headerTitle : qsTr("Recirculate In Progress") footer.anchors.bottomMargin: Variables.notificationHeight + Variables.defaultMargin - readonly property bool timeoutTotal : vTreatmentRecirculate .timeoutTotal readonly property int timeoutCountdown : vTreatmentRecirculate .timeoutCountDown readonly property int bloodFlowRate : vTreatmentParametersSetPoint.bloodFlow readonly property string recirculationImage : "qrc:/images/iRecirculate" Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r59a1b4dceeb629ed08a434775d819ce108fe894b -r45cc119e54711893ccc2b9d600412b8f51b7764f --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 59a1b4dceeb629ed08a434775d819ce108fe894b) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 45cc119e54711893ccc2b9d600412b8f51b7764f) @@ -53,6 +53,9 @@ stackView.initialItem : _treatmentHome + stackView.onCurrentItemChanged: if ( stackView.currentItem != _endTreatmentRinsebackStack && + stackView.currentItem != _endTreatmentRecirculateStack ) { _headerBar.activeStack = stackView } + readonly property bool isTreatmentPaused : vTDTreatmentStates.txStop readonly property bool isSBInProgress : ( vTDTreatmentStates.sbRunning || vTDTreatmentStates.sbWaitPump ) readonly property bool isTreatmentEnd : vTDTreatmentStates.txEnd Index: sources/gui/qml/pages/treatment/sections/TreatmentTime.qml =================================================================== diff -u -r5a2f0e2068f2998a9bf7377d39f2eecb0d4ad15a -r45cc119e54711893ccc2b9d600412b8f51b7764f --- sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision 5a2f0e2068f2998a9bf7377d39f2eecb0d4ad15a) +++ sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision 45cc119e54711893ccc2b9d600412b8f51b7764f) @@ -65,8 +65,6 @@ width : _circle.width height : _circle.height - onIsCompleteChanged: _rinsebackCompleteDialog.isTxCompleted = _root.isComplete - signal clicked() ProgressCircle { id: _circle Index: sources/model/hd/data/treatment/MTreatmentRecirculateData.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r45cc119e54711893ccc2b9d600412b8f51b7764f --- sources/model/hd/data/treatment/MTreatmentRecirculateData.cpp (.../MTreatmentRecirculateData.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/model/hd/data/treatment/MTreatmentRecirculateData.cpp (.../MTreatmentRecirculateData.cpp) (revision 45cc119e54711893ccc2b9d600412b8f51b7764f) @@ -18,14 +18,12 @@ QVariantList MTreatmentRecirculate::parameters() const { return { - _data.mTimeoutTotal .value, _data.mTimeoutCountDown.value, }; } bool MTreatmentRecirculate::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if ( ! GetValue(vByteArray, index, _data.mTimeoutTotal )) goto lError; if ( ! GetValue(vByteArray, index, _data.mTimeoutCountDown)) goto lError; return true ; @@ -43,7 +41,6 @@ */ MTreatmentRecirculate::Data MTreatmentRecirculate::data() const { Data data; - data.mTimeoutTotal = _data.mTimeoutTotal .value; data.mTimeoutCountDown = _data.mTimeoutCountDown.value; return data; } Index: sources/model/hd/data/treatment/MTreatmentRecirculateData.h =================================================================== diff -u -r61dfcbb2c8f58d1190a6665c4ad9427db76b51cc -r45cc119e54711893ccc2b9d600412b8f51b7764f --- sources/model/hd/data/treatment/MTreatmentRecirculateData.h (.../MTreatmentRecirculateData.h) (revision 61dfcbb2c8f58d1190a6665c4ad9427db76b51cc) +++ sources/model/hd/data/treatment/MTreatmentRecirculateData.h (.../MTreatmentRecirculateData.h) (revision 45cc119e54711893ccc2b9d600412b8f51b7764f) @@ -36,8 +36,7 @@ * * | Payload || * | || - * | #1:(U32) | \ref Data::mTimeoutTotal | - * | #2:(U32) | \ref Data::mTimeoutCountDown| + * | #1:(U32) | \ref Data::mTimeoutCountDown| * * \sa Data * \sa MAdjustRecirculateReq : Recirculate Request @@ -59,7 +58,6 @@ QVariantList parameters() const override; struct { - Types::U32 mTimeoutTotal ; Types::U32 mTimeoutCountDown; } _data; @@ -70,7 +68,6 @@ QString infoText() const override { return QString("Recirculate") ; } struct Data { - quint32 mTimeoutTotal = 0; ///< Total Timeout of Recirculate delivery quint32 mTimeoutCountDown = 0; ///< Current Timeout count down of Recirculate delivery }; Index: sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r45cc119e54711893ccc2b9d600412b8f51b7764f --- sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp (.../MTreatmentRinsebackData.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp (.../MTreatmentRinsebackData.cpp) (revision 45cc119e54711893ccc2b9d600412b8f51b7764f) @@ -24,6 +24,7 @@ _data.mTimeoutTotal .value, _data.mTimeoutCountDown .value, _data.mIsCompleted .value, + _data.mIsRecircAllowed .value, }; } @@ -35,6 +36,7 @@ if ( ! GetValue(vByteArray, index, _data.mTimeoutTotal )) goto lError; if ( ! GetValue(vByteArray, index, _data.mTimeoutCountDown )) goto lError; if ( ! GetValue(vByteArray, index, _data.mIsCompleted )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mIsRecircAllowed )) goto lError; return true ; @@ -57,5 +59,6 @@ data.mTimeoutTotal = _data.mTimeoutTotal .value; data.mTimeoutCountDown = _data.mTimeoutCountDown .value; data.mIsCompleted = _data.mIsCompleted .value? true : false; + data.mIsRecircAllowed = _data.mIsRecircAllowed .value? true : false; return data; } Index: sources/model/hd/data/treatment/MTreatmentRinsebackData.h =================================================================== diff -u -r4ae0f0abdbe4edfcd93dbf5b0240417f1f079586 -r45cc119e54711893ccc2b9d600412b8f51b7764f --- sources/model/hd/data/treatment/MTreatmentRinsebackData.h (.../MTreatmentRinsebackData.h) (revision 4ae0f0abdbe4edfcd93dbf5b0240417f1f079586) +++ sources/model/hd/data/treatment/MTreatmentRinsebackData.h (.../MTreatmentRinsebackData.h) (revision 45cc119e54711893ccc2b9d600412b8f51b7764f) @@ -41,7 +41,8 @@ * | #3:(U32) | \ref Data::mRate | * | #4:(U32) | \ref Data::mTimeoutTotal | * | #5:(U32) | \ref Data::mTimeoutCountDown| - * | #6:(F32) | \ref Data::mIsCompleted | + * | #6:(U32) | \ref Data::mIsCompleted | + * | #7:(U32) | \ref Data::mIsRecircAllowed | * * \sa Data * \sa MAdjustRinsebackReq : Rinseback Request @@ -69,6 +70,7 @@ Types::U32 mTimeoutTotal ; Types::U32 mTimeoutCountDown; Types::U32 mIsCompleted ; + Types::U32 mIsRecircAllowed ; } _data; public: @@ -84,6 +86,7 @@ quint32 mTimeoutTotal = 0; ///< Total Timeout quint32 mTimeoutCountDown = 0; ///< Current Timeout count down bool mIsCompleted = 0; ///< Rinseback is complete + bool mIsRecircAllowed = 0; ///< Rinseback is allowed }; public: Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRinseback.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r45cc119e54711893ccc2b9d600412b8f51b7764f --- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRinseback.h (.../VTreatmentAdjustmentRinseback.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRinseback.h (.../VTreatmentAdjustmentRinseback.h) (revision 45cc119e54711893ccc2b9d600412b8f51b7764f) @@ -55,11 +55,9 @@ void doDecrement () { adjustment( GuiRinsebackCommands::REQUESTED_USER_ACTION_RINSEBACK_DECREASE_RATE ); } void doPause () { adjustment( GuiRinsebackCommands::REQUESTED_USER_ACTION_RINSEBACK_PAUSE ); } void doResume () { adjustment( GuiRinsebackCommands::REQUESTED_USER_ACTION_RINSEBACK_RESUME ); } - void doEnd () { adjustment( GuiRinsebackCommands::REQUESTED_USER_ACTION_RINSEBACK_END ); } void doAdditional () { adjustment( GuiRinsebackCommands::REQUESTED_USER_ACTION_RINSEBACK_ADDITIONAL ); } - void doConfirm () { adjustment( GuiRinsebackCommands::REQUESTED_USER_ACTION_RINSEBACK_CONFIRM_DISCONNECT ); } + void doConfirm () { adjustment( GuiRinsebackCommands::REQUESTED_USER_ACTION_RINSEBACK_CONFIRM_RECIRCULATE); } void doTreatmentEnd () { adjustment( GuiRinsebackCommands::REQUESTED_USER_ACTION_RINSEBACK_END_TREATMENT ); } - void doTreatmentBack() { adjustment( GuiRinsebackCommands::REQUESTED_USER_ACTION_RINSEBACK_BACK_TO_TREATMENT ); } signals: /*! Index: sources/view/hd/alarm/VAlarmStatus.cpp =================================================================== diff -u -r0f83de066c8a116195a3cc60577d597ef9654c55 -r45cc119e54711893ccc2b9d600412b8f51b7764f --- sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 0f83de066c8a116195a3cc60577d597ef9654c55) +++ sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 45cc119e54711893ccc2b9d600412b8f51b7764f) @@ -68,7 +68,7 @@ */ void View::VAlarmStatus::doUserActionTemporaryBreak() { AlarmUserActionRequestData data; - data.action = Gui::GuiAlarmUserActions::ALARM_USER_ACTION_TEMPOARY_BREAK; + data.action = Gui::GuiAlarmUserActions::ALARM_USER_ACTION_TEMPORARY_BREAK; emit didAdjustment(data); } Index: sources/view/hd/data/treatment/VTreatmentRecirculateData.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r45cc119e54711893ccc2b9d600412b8f51b7764f --- sources/view/hd/data/treatment/VTreatmentRecirculateData.cpp (.../VTreatmentRecirculateData.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/hd/data/treatment/VTreatmentRecirculateData.cpp (.../VTreatmentRecirculateData.cpp) (revision 45cc119e54711893ccc2b9d600412b8f51b7764f) @@ -21,6 +21,5 @@ void VTreatmentRecirculate::onActionReceive(const TreatmentRecirculateData &vData) { - timeoutTotal ( vData.mTimeoutTotal ); timeoutCountDown( vData.mTimeoutCountDown ); } Index: sources/view/hd/data/treatment/VTreatmentRecirculateData.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r45cc119e54711893ccc2b9d600412b8f51b7764f --- sources/view/hd/data/treatment/VTreatmentRecirculateData.h (.../VTreatmentRecirculateData.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/hd/data/treatment/VTreatmentRecirculateData.h (.../VTreatmentRecirculateData.h) (revision 45cc119e54711893ccc2b9d600412b8f51b7764f) @@ -36,7 +36,6 @@ { Q_OBJECT - PROPERTY( quint32 , timeoutTotal , 0) PROPERTY( quint32 , timeoutCountDown, 0) VIEW_DEC(VTreatmentRecirculate, TreatmentRecirculateData) Index: sources/view/hd/data/treatment/VTreatmentRinsebackData.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r45cc119e54711893ccc2b9d600412b8f51b7764f --- sources/view/hd/data/treatment/VTreatmentRinsebackData.cpp (.../VTreatmentRinsebackData.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/hd/data/treatment/VTreatmentRinsebackData.cpp (.../VTreatmentRinsebackData.cpp) (revision 45cc119e54711893ccc2b9d600412b8f51b7764f) @@ -21,10 +21,11 @@ void VTreatmentRinseback::onActionReceive(const TreatmentRinsebackData &vData) { - target ( vData.mTarget ); - current ( vData.mCurrent ); - rate ( vData.mRate ); - timeoutTotal ( vData.mTimeoutTotal ); - timeoutCountDown( vData.mTimeoutCountDown ); - isCompleted ( vData.mIsCompleted ); + target ( vData.mTarget ); + current ( vData.mCurrent ); + rate ( vData.mRate ); + timeoutTotal ( vData.mTimeoutTotal ); + timeoutCountDown( vData.mTimeoutCountDown ); + isCompleted ( vData.mIsCompleted ); + isRecircAllowed ( vData.mIsRecircAllowed ); } Index: sources/view/hd/data/treatment/VTreatmentRinsebackData.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r45cc119e54711893ccc2b9d600412b8f51b7764f --- sources/view/hd/data/treatment/VTreatmentRinsebackData.h (.../VTreatmentRinsebackData.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/hd/data/treatment/VTreatmentRinsebackData.h (.../VTreatmentRinsebackData.h) (revision 45cc119e54711893ccc2b9d600412b8f51b7764f) @@ -42,6 +42,7 @@ PROPERTY( quint32 , timeoutTotal , 0) PROPERTY( quint32 , timeoutCountDown, 0) PROPERTY( bool , isCompleted , 0) + PROPERTY( bool , isRecircAllowed , 0) VIEW_DEC(VTreatmentRinseback, TreatmentRinsebackData) }; Index: sources/view/td/data/treatment/VTDTreatmentStatesData.cpp =================================================================== diff -u -r27a83d5f4e60279c58e3edcf0ed5730f70e3c1b5 -r45cc119e54711893ccc2b9d600412b8f51b7764f --- sources/view/td/data/treatment/VTDTreatmentStatesData.cpp (.../VTDTreatmentStatesData.cpp) (revision 27a83d5f4e60279c58e3edcf0ed5730f70e3c1b5) +++ sources/view/td/data/treatment/VTDTreatmentStatesData.cpp (.../VTDTreatmentStatesData.cpp) (revision 45cc119e54711893ccc2b9d600412b8f51b7764f) @@ -149,14 +149,12 @@ ENUM_CHECK ( GuiRinsebackStates, RINSEBACK_PAUSED_STATE ) ENUM_CHECK ( GuiRinsebackStates, RINSEBACK_STOP_STATE ) ENUM_CHECK ( GuiRinsebackStates, RINSEBACK_RUN_ADDITIONAL_STATE ) - ENUM_CHECK ( GuiRinsebackStates, RINSEBACK_RECONNECT_PATIENT_STATE ) ENUM_CHECK_C( GuiRinsebackStates, NUM_OF_RINSEBACK_STATES ) } ENUM_READ ( GuiRinsebackStates, RINSEBACK_STOP_INIT_STATE , rbInit ); ENUM_READ ( GuiRinsebackStates, RINSEBACK_RUN_STATE , rbRun ); ENUM_READ ( GuiRinsebackStates, RINSEBACK_PAUSED_STATE , rbPaused ); ENUM_READ ( GuiRinsebackStates, RINSEBACK_STOP_STATE , rbStop ); ENUM_READ ( GuiRinsebackStates, RINSEBACK_RUN_ADDITIONAL_STATE , rbAdditional ); - ENUM_READ ( GuiRinsebackStates, RINSEBACK_RECONNECT_PATIENT_STATE , rbReconnect ); } txRinseback ( mRinseback ); // it's the main rinseback event so moved last to have all the sub-rinseback-states updated prior to. Index: sources/view/td/data/treatment/VTDTreatmentStatesData.h =================================================================== diff -u -r27a83d5f4e60279c58e3edcf0ed5730f70e3c1b5 -r45cc119e54711893ccc2b9d600412b8f51b7764f --- sources/view/td/data/treatment/VTDTreatmentStatesData.h (.../VTDTreatmentStatesData.h) (revision 27a83d5f4e60279c58e3edcf0ed5730f70e3c1b5) +++ sources/view/td/data/treatment/VTDTreatmentStatesData.h (.../VTDTreatmentStatesData.h) (revision 45cc119e54711893ccc2b9d600412b8f51b7764f) @@ -99,7 +99,6 @@ PROPERTY( bool , rbPaused , false) ///< RINSEBACK_PAUSED_STATE = 2 # Rinseback paused state of the rinseback sub-mode state machine PROPERTY( bool , rbStop , false) ///< RINSEBACK_STOP_STATE = 3 # Rinseback stopped (done) state of the rinseback sub-mode state machine PROPERTY( bool , rbAdditional , false) ///< RINSEBACK_RUN_ADDITIONAL_STATE = 4 # Additional rinseback volume (10 mL) state of the rinseback sub-mode state machine - PROPERTY( bool , rbReconnect , false) ///< RINSEBACK_RECONNECT_PATIENT_STATE = 5 # Rinseback reconnect state of the rinseback sub-mode state machine // Recirculate states PROPERTY( bool , rcDisconnect , true ) ///< TREATMENT_RECIRC_DISCONNECT_PATIENT_STATE = 0 # Disconnect patient state of the treatment re-circulate sub-mode state machine