Index: SDDs/Recirculate.puml =================================================================== diff -u -rf987d415a74cee6e9a0c7ed269877d82ee96602b -rf41a1003ac920b64a11fc34193972bd1240003f3 --- SDDs/Recirculate.puml (.../Recirculate.puml) (revision f987d415a74cee6e9a0c7ed269877d82ee96602b) +++ SDDs/Recirculate.puml (.../Recirculate.puml) (revision f41a1003ac920b64a11fc34193972bd1240003f3) @@ -21,50 +21,54 @@ '[x \n ,# certain amount of parameters according to the content] '[x \n ,X The rest of the parameters do not matter.] - == Recirculate Set Up == + == Connect Recirculation Lines == SW -> UI: CMD: Read instructions config file UI -> US: ACT: Display interactible instructions - US -> UI: TCH: End Treatment Button - UI -> SW: ACT: :Recirculate Command - SW -> TD: MSG: [xA6: Req #1] Recirculate Command Request\n\ - \t(U32) cmd=REQUESTED_USER_ACTION_TX_RECIRC_END_TREATMENT - TD -> SW: MSG: [xA7: Rsp #2] Recirculate Command Response\n\ - \t(BOOL) accepted=0\n\ - \t(U32) rejReason - alt accepted - TD -> SW: ACT: Go to end treatment - SW -> UI: ACT: Show Post Treatment - UI -> US: ACT: Post Treatment - else #Pink rejected - SW -> UI: CMD: Recirculate Command Adjustment Triggered - UI -> US: ACT: Display Rejection Reason + alt End Treatment Button + US -> UI: TCH: End Treatment Button + UI -> SW: ACT: :Recirculate Command + SW -> TD: MSG: [xA6: Req #1] Recirculate Command Request\n\ + \t(U32) cmd=REQUESTED_USER_ACTION_TX_RECIRC_END_TREATMENT + TD -> SW: MSG: [xA7: Rsp #2] Recirculate Command Response\n\ + \t(U32) accepted\n\ + \t(U32) rejReason + alt accepted + TD -> SW: MSG: [x12: #3,1] \n OpMode - Post Treatment + SW -> UI: ACT: Show Post Treatment + UI -> US: ACT: Post Treatment + else #Pink rejected + SW -> UI: CMD: Send Rejection Reason + UI -> US: ACT: Display Rejection Reason + end end - US -> UI: TCH: Start Recirculate Button - UI -> SW: ACT: :Recirculate Command - SW -> TD: MSG: [xA6: Req #1] Recirculate Command Request\n\ - \t(U32) cmd=REQUESTED_USER_ACTION_TX_RECIRC_CONFIRM_DISCONNECT - TD -> SW: MSG: [xA7: Rsp #2] Recirculate Command Response\n\ - \t(BOOL) accepted=0\n\ - \t(U32) rejReason - alt accepted - TD -> SW: MSG: [x3C: Dat #10] Treatment State\n\ - \t(U32) treatmentSubMode=4\n\ - \t(U32) bldPrimeState=X\n\ - \t(U32) dialysisState=X\n\ - \t(U32) isoUFState=X\n\ - \t(U32) txStopState=X\n\ - \t(U32) rinsebackState=X\n\ - \t(U32) txRecircState=X\n\ - \t(U32) txEndState=X\n\ - \t(U32) txSalBolusState=X\n\ - \t(U32) txHepState=X - SW -> UI: CMD: Treatment State - Recirculate Run - UI -> US: ACT: Show Recriculate Progress page - else #Pink rejected - SW -> UI: CMD: Recirculate Command Adjustment Triggered - UI -> US: ACT: Display Rejection Reason + alt Start Recirculate Button + US -> UI: TCH: Start Recirculate Button + UI -> SW: ACT: :Recirculate Command + SW -> TD: MSG: [xA6: Req #1] Recirculate Command Request\n\ + \t(U32) cmd=REQUESTED_USER_ACTION_TX_RECIRC_CONFIRM_DISCONNECT + TD -> SW: MSG: [xA7: Rsp #2] Recirculate Command Response\n\ + \t(U32) accepted\n\ + \t(U32) rejReason + alt accepted + TD -> SW: MSG: [x3C: Dat #10] Treatment State\n\ + \t(U32) treatmentSubMode=5\n\ + \t(U32) bldPrimeState=X\n\ + \t(U32) dialysisState=X\n\ + \t(U32) isoUFState=X\n\ + \t(U32) txStopState=X\n\ + \t(U32) rinsebackState=X\n\ + \t(U32) txRecircState=0(Disconnect Patient State)\n\ + \t(U32) txEndState=X\n\ + \t(U32) txSalBolusState=X\n\ + \t(U32) txHepState=X + SW -> UI: CMD: Treatment State - Recirculate Run + UI -> US: ACT: Show Recriculate Progress page + else #Pink rejected + SW -> UI: CMD: Send Rejection Reason + UI -> US: ACT: Display Rejection Reason + end end == Recirculate In Progress == @@ -74,92 +78,100 @@ SW -> UI: CMD: Recirculate Progress Data UI -> US: ACT: Display Recriculate Progress - US -> UI: TCH: End Treatment Button - UI -> SW: ACT: :Recirculate Command - SW -> TD: MSG: [xA6: Req #1] Recirculate Command Request\n\ - \t(U32) cmd=REQUESTED_USER_ACTION_TX_RECIRC_END_TREATMENT - TD -> SW: MSG: [xA7: Rsp #2] Recirculate Command Response\n\ - \t(BOOL) accepted=0\n\ - \t(U32) rejReason - alt accepted - TD -> SW: ACT: Go to end treatment - SW -> UI: ACT: Show Post Treatment - UI -> US: ACT: Post Treatment - else #Pink rejected - SW -> UI: CMD: Recirculate Command Adjustment Triggered - UI -> US: ACT: Display Rejection Reason + alt End Treatment Button + US -> UI: TCH: End Treatment Button + UI -> SW: ACT: :Recirculate Command + SW -> TD: MSG: [xA6: Req #1] Recirculate Command Request\n\ + \t(U32) cmd=REQUESTED_USER_ACTION_TX_RECIRC_END_TREATMENT + TD -> SW: MSG: [xA7: Rsp #2] Recirculate Command Response\n\ + \t(U32) accepted\n\ + \t(U32) rejReason + alt accepted + TD -> SW: MSG: [x12: #3,1] \n OpMode - Post Treatment + SW -> UI: ACT: Show Post Treatment + UI -> US: ACT: Post Treatment + else #Pink rejected + SW -> UI: CMD: Send Rejection Reason + UI -> US: ACT: Display Rejection Reason + end end - US -> UI: TCH: Rsume Treatment Button - UI -> SW: ACT: :Recirculate Command - SW -> TD: MSG: [xA6: Req #1] Recirculate Command Request\n\ - \t(U32) cmd=REQUESTED_USER_ACTION_TX_RECIRC_RECONNECT - TD -> SW: MSG: [xA7: Rsp #2] Recirculate Command Response\n\ - \t(BOOL) accepted=0\n\ - \t(U32) rejReason - alt accepted - TD -> SW: MSG: [x3C: Dat #10] Treatment State\n\ - \t(U32) treatmentSubMode=4\n\ - \t(U32) bldPrimeState=X\n\ - \t(U32) dialysisState=X\n\ - \t(U32) isoUFState=X\n\ - \t(U32) txStopState=X\n\ - \t(U32) rinsebackState=X\n\ - \t(U32) txRecircState=X\n\ - \t(U32) txEndState=X\n\ - \t(U32) txSalBolusState=X\n\ - \t(U32) txHepState=X - SW -> UI: CMD: Treatment State - Recirculate Reconnect Patien - UI -> US: ACT: Show Reconnect to patient page - else #Pink rejected - SW -> UI: CMD: Recirculate Command Adjustment Triggered - UI -> US: ACT: Display Rejection Reason + alt Resume Treatment Button + US -> UI: TCH: Resume Treatment Button + UI -> SW: ACT: :Recirculate Command + SW -> TD: MSG: [xA6: Req #1] Recirculate Command Request\n\ + \t(U32) cmd=REQUESTED_USER_ACTION_TX_RECIRC_RECONNECT + TD -> SW: MSG: [xA7: Rsp #2] Recirculate Command Response\n\ + \t(U32) accepted\n\ + \t(U32) rejReason + alt accepted + TD -> SW: MSG: [x3C: Dat #10] Treatment State\n\ + \t(U32) treatmentSubMode=5\n\ + \t(U32) bldPrimeState=X\n\ + \t(U32) dialysisState=X\n\ + \t(U32) isoUFState=X\n\ + \t(U32) txStopState=X\n\ + \t(U32) rinsebackState=X\n\ + \t(U32) txRecircState=1(Recirculate State)\n\ + \t(U32) txEndState=X\n\ + \t(U32) txSalBolusState=X\n\ + \t(U32) txHepState=X + SW -> UI: CMD: Treatment State - Recirculate Reconnect Patien + UI -> US: ACT: Show Reconnect to patient page + else #Pink rejected + SW -> UI: CMD: Send Rejection Reason + UI -> US: ACT: Display Rejection Reason + end end - == Recirculate Reconnect to patient == + == Reconnect To Patient == SW -> UI: CMD: Read instructions config file UI -> US: ACT: Display interactible instructions - US -> UI: TCH: End Treatment Button - UI -> SW: ACT: :Recirculate Command - SW -> TD: MSG: [xA6: Req #1] Recirculate Command Request\n\ - \t(U32) cmd=REQUESTED_USER_ACTION_TX_RECIRC_END_TREATMENT - TD -> SW: MSG: [xA7: Rsp #2] Recirculate Command Response\n\ - \t(BOOL) accepted=0\n\ - \t(U32) rejReason - alt accepted - TD -> SW: ACT: Go to end treatment - SW -> UI: ACT: Show Post Treatment - UI -> US: ACT: Post Treatment - else #Pink rejected - SW -> UI: CMD: Recirculate Command Adjustment Triggered - UI -> US: ACT: Display Rejection Reason + alt Resume Treatment Button + US -> UI: TCH: End Treatment Button + UI -> SW: ACT: :Recirculate Command + SW -> TD: MSG: [xA6: Req #1] Recirculate Command Request\n\ + \t(U32) cmd=REQUESTED_USER_ACTION_TX_RECIRC_END_TREATMENT + TD -> SW: MSG: [xA7: Rsp #2] Recirculate Command Response\n\ + \t(U32) accepted\n\ + \t(U32) rejReason + alt accepted + TD -> SW: MSG: [x12: #3,1] \n OpMode - Post Treatment + SW -> UI: ACT: Show Post Treatment + UI -> US: ACT: Post Treatment + else #Pink rejected + SW -> UI: CMD: Send Rejection Reason + UI -> US: ACT: Display Rejection Reason + end end - US -> UI: TCH: Resume Treatment Button - UI -> SW: ACT: :Recirculate Command - SW -> TD: MSG: [xA6: Req #1] Recirculate Command Request\n\ - \t(U32) cmd=REQUESTED_USER_ACTION_TX_RECIRC_CONFIRM_RECONNECT - TD -> SW: MSG: [xA7: Rsp #2] Recirculate Command Response\n\ - \t(BOOL) accepted=0\n\ - \t(U32) rejReason - alt accepted - TD -> SW: MSG: [x3C: Dat #10] Treatment State\n\ - \t(U32) treatmentSubMode=4\n\ - \t(U32) bldPrimeState=X\n\ - \t(U32) dialysisState=X\n\ - \t(U32) isoUFState=X\n\ - \t(U32) txStopState=X\n\ - \t(U32) rinsebackState=X\n\ - \t(U32) txRecircState=X\n\ - \t(U32) txEndState=X\n\ - \t(U32) txSalBolusState=X\n\ - \t(U32) txHepState=X - SW -> UI: CMD: Treatment State - Dialysis - UI -> US: ACT: Show Main Treatment Screen - else #Pink rejected - SW -> UI: CMD: Recirculate Command Adjustment Triggered - UI -> US: ACT: Display Rejection Reason + alt Resume Treatment Button + US -> UI: TCH: Resume Treatment Button + UI -> SW: ACT: :Recirculate Command + SW -> TD: MSG: [xA6: Req #1] Recirculate Command Request\n\ + \t(U32) cmd=REQUESTED_USER_ACTION_TX_RECIRC_CONFIRM_RECONNECT + TD -> SW: MSG: [xA7: Rsp #2] Recirculate Command Response\n\ + \t(U32) accepted\n\ + \t(U32) rejReason + alt accepted + TD -> SW: MSG: [x3C: Dat #10] Treatment State\n\ + \t(U32) treatmentSubMode=5\n\ + \t(U32) bldPrimeState=X\n\ + \t(U32) dialysisState=X\n\ + \t(U32) isoUFState=X\n\ + \t(U32) txStopState=X\n\ + \t(U32) rinsebackState=X\n\ + \t(U32) txRecircState=3(Reconnect Patient State)\n\ + \t(U32) txEndState=X\n\ + \t(U32) txSalBolusState=X\n\ + \t(U32) txHepState=X + SW -> UI: CMD: Treatment State - Dialysis + UI -> US: ACT: Show Main Treatment Screen + else #Pink rejected + SW -> UI: CMD: Send Rejection Reason + UI -> US: ACT: Display Rejection Reason + end end @enduml Index: sources/gui/qml/pages/TreatmentFlowBase.qml =================================================================== diff -u -r1da0c41020664b642359f3cd5d58a2fdc36774a2 -rf41a1003ac920b64a11fc34193972bd1240003f3 --- sources/gui/qml/pages/TreatmentFlowBase.qml (.../TreatmentFlowBase.qml) (revision 1da0c41020664b642359f3cd5d58a2fdc36774a2) +++ sources/gui/qml/pages/TreatmentFlowBase.qml (.../TreatmentFlowBase.qml) (revision f41a1003ac920b64a11fc34193972bd1240003f3) @@ -112,14 +112,12 @@ active : _root.instructionBased anchors { top : title.visible ? title.bottom : title.top -// bottom : footer.top bottom : parent.bottom left : parent.left right : parent.right leftMargin : _root.sideMargins rightMargin : _root.sideMargins topMargin : outerVMargin -// bottomMargin : outerVMargin bottomMargin : Variables.notificationHeight + Variables.minVGap } sourceComponent : InstructionView { id: _instructionView Index: sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml =================================================================== diff -u -r61dfcbb2c8f58d1190a6665c4ad9427db76b51cc -rf41a1003ac920b64a11fc34193972bd1240003f3 --- sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml (.../EndTreatmentRecirculateStack.qml) (revision 61dfcbb2c8f58d1190a6665c4ad9427db76b51cc) +++ sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml (.../EndTreatmentRecirculateStack.qml) (revision f41a1003ac920b64a11fc34193972bd1240003f3) @@ -35,12 +35,12 @@ signal reconnectClicked () signal confirmDisconnectClicked () signal confirmReconnectClicked () -// signal recirculateResumeClicked() +// signal recirculateResumeClicked() // enum command not used comment signal treatmentEndClicked () onReconnectClicked : vTreatmentAdjustmentRecirculate.doReconnect () //84.0 ///< User requests to re-connect to system (stop re-circulating, clamp arterial and venous lines) onConfirmReconnectClicked : vTreatmentAdjustmentRecirculate.doConfirmReconnect () //84.1 ///< User confirms patient connected, lines un-shunted to return to treatment -// onRecirculateResumeClicked : vTreatmentAdjustmentRecirculate.doResume () //84.2 ///< User requests to resume re-circulation +// onRecirculateResumeClicked : vTreatmentAdjustmentRecirculate.doResume () // enum command not used comment ///< User requests to resume re-circulation onTreatmentEndClicked : vTreatmentAdjustmentRecirculate.doTreatmentEnd () //84.3 ///< User requests to end treatment onConfirmDisconnectClicked : vTreatmentAdjustmentRecirculate.doConfirmDisconnect () //84.4 ///< User confirms patient disconnected, lines shunted to begin re-circulation @@ -110,6 +110,7 @@ Connections { target: vTDTreatmentStates function onRcDisconnectChanged ( vValue ) { page( _recirculateDisconnect , vValue )} // set up function onRcStartedChanged ( vValue ) { page( _recirculateProgress , vValue )} // in progress + // check during integration // function onRcStoppedChanged ( vValue ) { page( _recirculateStopped , vValue )} // complete function onRcReconnectChanged ( vValue ) { page( _recirculateReconnect , vValue )} // disconnect } @@ -120,16 +121,16 @@ // since the rejection reason will be cleared by each trasition // so it's fine to set all at the same time // and let them cleared for their own message when each get visible. - if ( ! vTreatmentAdjustmentRecirculate.adjustment_Accepted ) { - _recirculateDisconnect .reasonText = vTreatmentAdjustmentRecirculate.text() - _recirculateProgress .reasonText = vTreatmentAdjustmentRecirculate.text() - _recirculateReconnect .reasonText = vTreatmentAdjustmentRecirculate.text() - } - else { + if ( vTreatmentAdjustmentRecirculate.adjustment_Accepted ) { _recirculateDisconnect .reasonText = "" _recirculateProgress .reasonText = "" _recirculateReconnect .reasonText = "" } + else { + _recirculateDisconnect .reasonText = vTreatmentAdjustmentRecirculate.text() + _recirculateProgress .reasonText = vTreatmentAdjustmentRecirculate.text() + _recirculateReconnect .reasonText = vTreatmentAdjustmentRecirculate.text() + } } } } Index: sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentRecirculateProgress.qml =================================================================== diff -u -rf7bc98de488100270b004af851174e1329028d9a -rf41a1003ac920b64a11fc34193972bd1240003f3 --- sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentRecirculateProgress.qml (.../EndTreatmentRecirculateProgress.qml) (revision f7bc98de488100270b004af851174e1329028d9a) +++ sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentRecirculateProgress.qml (.../EndTreatmentRecirculateProgress.qml) (revision f41a1003ac920b64a11fc34193972bd1240003f3) @@ -73,6 +73,7 @@ Image { id: _rotatingImage source: "qrc:/images/iBloodpump" + // DO NOT CHANGE COORDINATE - unless image has been updated x: 190 y: 287 Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml =================================================================== diff -u -r85ccb77b7343cb0ba133b6c13585e95a23ac237e -rf41a1003ac920b64a11fc34193972bd1240003f3 --- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml (.../EndTreatmentRinsebackInit.qml) (revision 85ccb77b7343cb0ba133b6c13585e95a23ac237e) +++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml (.../EndTreatmentRinsebackInit.qml) (revision f41a1003ac920b64a11fc34193972bd1240003f3) @@ -31,7 +31,7 @@ signal rinsebackClicked () headerTitle : qsTr("Blood Return Setup") - descriptionText : qsTr("Blood return will %1 be allowed in:").arg("NOT") + descriptionText : qsTr("Blood return will NOT be allowed in:") instructionBased : true hasTimeout : vTreatmentRinseback .timeoutTotal