Index: SDDs/StopState.png =================================================================== diff -u -r505d481ce5dee5fcd266bee0920df47949443bee -r9b48fb662409e1c2b3c6db67f51f1356a765d772 Binary files differ Index: SDDs/StopState.puml =================================================================== diff -u -r505d481ce5dee5fcd266bee0920df47949443bee -r9b48fb662409e1c2b3c6db67f51f1356a765d772 --- SDDs/StopState.puml (.../StopState.puml) (revision 505d481ce5dee5fcd266bee0920df47949443bee) +++ SDDs/StopState.puml (.../StopState.puml) (revision 9b48fb662409e1c2b3c6db67f51f1356a765d772) @@ -51,50 +51,145 @@ == User presses Hardware Stop Button == US -> TD: PRS: Hardware Stop Button - TD -> SW: MSG: [x01: #4] \nTD AlarmStatus : \ - \n\t(U32) mState \ - \n\t(U32) mTop \ - \n\t(U32) mMuteTimeout \ - \n\t(U16) mFlags |= END_TREATMENT_BUTTON + TD -> SW: MSG: [x01: #4] \nTD AlarmStatus : \ + \n\t(U32) mState \ + \n\t(U32) mTop \ + \n\t(U32) mMuteTimeout \ + \n\t(U16) mFlags |= END_TREATMENT_BUTTON \ + \n\t |= RESUME_BUTTON \ + \n\t |= TEMPROARY_BREAK_BUTTON \ + \n\t |= RETURN_BLOOD_END_TREATMENT_BUTTON + SW -> UI: ACT: Display Alarm Dialog \ + \n\t - End Treatment Button visible \ + \n\t - Resume Button visible \ + \n\t - Temporary Break Button visible \ + \n\t - Return Blood Button visible + UI -> US: ACT: Display Alarm Dialog \ + \n\t - End Treatment Button visible\ + \n\t - Resume Button visible \ + \n\t - Temporary Break Button visible \ + \n\t - Return Blood Button visible - SW -> UI: ACT: Display Alarm Dialog \ - \n\t - End Treatment Button visible + alt #LightSalmon User Presses Resume + US -> UI: TCH: Resume Button + UI -> SW: ACT: doUserActionResume ( \ + \n\tALARM_USER_ACTION_RESUME \ + \n) + SW -> TD: MSG: [x06: #1] AlarmUserAction \ + \n\t(U32) action + TD -> SW: ACT: Resume Treatment + SW -> UI: ACT: Resume Treatment + UI -> US: ACT: Treatment resumed - UI -> US: ACT: Display Alarm Dialog \ - \n\t - End Treatment Button visible - US -> UI: TCH: End Treatment Button - UI -> SW: ACT: doUserActionEnd ( \ - \n\tALARM_USER_ACTION_END_TREATMENT \ - \n) - SW -> TD: MSG: [x06: #1] AlarmUserAction \ + else #LightBlue User Presses End Treatment + US -> UI: TCH: End Treatment Button + UI -> SW: ACT: doUserActionEnd ( \ + \n\tALARM_USER_ACTION_END_TREATMENT \ + \n) + SW -> TD: MSG: [x06: #1] AlarmUserAction \ \n\t(U32) action - TD -> SW: MSG: [xBA: #3] \nTD Confirmation : \ - \n\t(U32) mId = END_TREATMENT(6) \ - \n\t(U32) mCommand = GENERIC_CONFIRM_CMD_REQUEST_OPEN \ + TD -> SW: MSG: [xB5: #3] \nTD Confirmation : \ + \n\t(U32) mId =2 (END_TREATMENT) \ + \n\t(U32) mCommand =0 (GENERIC_CONFIRM_CMD_REQUEST_OPEN) \ \n\t(U32) mReason + SW -> UI: ACT: Open Confirm Dialog + UI -> US: ACT: Display Confirm Dialog - alt CONFIRM - US -> SW: MSG: [xBB: #2] \nEnd Treatment \ - \n\t(U32) mId \ - \n\t(U32) mConfirm = 1 - SW -> TD: MSG: [xBB: #2] \nEnd Treatment \ - \n\t(U32) mId \ - \n\t(U32) mConfirm = 1 - TD -> TD: End the treatment - else CANCEL - US -> SW: MSG: [xBB: #2] \nEnd Treatment \ - \n\t(U32) mId \ - \n\t(U32) mConfirm = 0 - SW -> TD: MSG: [xBB: #2] \nEnd Treatment \ - \n\t(U32) mId \ - \n\t(U32) mConfirm = 0 - TD -> SW: MSG: [x01: #4] \nTD AlarmStatus : \ - \n\t(U32) mState \ - \n\t(U32) mTop = 0 \ - \n\t(U32) mMuteTimeout \ - \n\t(U16) mFlags - SW -> UI: ACT: Hide Alarm Dialog - UI -> US: ACT: Hide Alarm Dialog + alt #LightGray CONFIRM + US -> UI: ACT: Press confirm + UI -> SW: ACT: Confirm Response + SW -> TD: MSG: [xB6: #2] Response \ + \n\t(U32) mId =2 (END_TREATMENT) \ + \n\t(U32) mConfirm =1 (CONFIRM) + TD -> TD: End the treatment + else #LightPink CANCEL + US -> UI: ACT: Press cancel + UI -> SW: ACT: Cancel Response + SW -> TD: MSG: [xB6: #2] Response \ + \n\t(U32) mId =2 (END_TREATMENT) \ + \n\t(U32) mConfirm =0 (CANCEL) + TD -> SW: MSG: [x01: #4] \nTD AlarmStatus : \ + \n\t(U32) mState \ + \n\t(U32) mTop = 0 \ + \n\t(U32) mMuteTimeout \ + \n\t(U16) mFlags + SW -> UI: ACT: Hide Alarm Dialog + UI -> US: ACT: Hide Alarm Dialog + end + else #LightGreen User Presses Return Blood + US -> UI: TCH: Return Blood Button + UI -> SW: ACT: doUserActionRinseback ( \ + \n\tALARM_USER_ACTION_RINSEBACK \ + \n) + SW -> TD: MSG: [x06: #1] AlarmUserAction \ + \n\t(U32) action + TD -> SW: MSG: [xB5: #3] \nTD Confirmation : \ + \n\t(U32) mId =3 (RETURN_BLOOD) \ + \n\t(U32) mCommand =0 (GENERIC_CONFIRM_CMD_REQUEST_OPEN) \ + \n\t(U32) mReason + SW -> UI: ACT: Open Confirm Dialog + UI -> US: ACT: Display Confirm Dialog + + alt #LightGray CONFIRM + US -> UI: ACT: Press confirm + UI -> SW: ACT: Confirm Response + SW -> TD: MSG: [xB6: #2] Response \ + \n\t(U32) mId =3 (RETURN_BLOOD) \ + \n\t(U32) mConfirm =1 (CONFIRM) + TD -> TD: Blood Return + else #LightPink CANCEL + US -> UI: ACT: Press cancel + UI -> SW: ACT: Cancel Response + SW -> TD: MSG: [xB6: #2] Response \ + \n\t(U32) mId =3 (RETURN_BLOOD) \ + \n\t(U32) mConfirm =0 (CANCEL) + TD -> SW: MSG: [x01: #4] \nTD AlarmStatus : \ + \n\t(U32) mState \ + \n\t(U32) mTop = 0 \ + \n\t(U32) mMuteTimeout \ + \n\t(U16) mFlags + SW -> UI: ACT: Hide Alarm Dialog + UI -> US: ACT: Hide Alarm Dialog + end + else #LightCyan User Presses Temporary Break + US -> UI: TCH: Temporary Break Button + UI -> SW: ACT: doUserActionTemporaryBreak ( \ + \n\tALARM_USER_ACTION_TEMPOARY_BREAK \ + \n) + SW -> TD: MSG: [x06: #1] AlarmUserAction \ + \n\t(U32) action + TD -> SW: MSG: [xB5: #3] \nTD Confirmation : \ + \n\t(U32) mId =4 (TEMPORARY_BREAK) \ + \n\t(U32) mCommand =0 (GENERIC_CONFIRM_CMD_REQUEST_OPEN) \ + \n\t(U32) mReason + SW -> UI: ACT: Open Confirm Dialog + UI -> US: ACT: Display Confirm Dialog + + alt #LightGray CONFIRM + US -> UI: ACT: Press confirm + UI -> SW: ACT: Confirm Response + SW -> TD: MSG: [xB6: #2] Response \ + \n\t(U32) mId =4 (TEMPORARY_BREAK) \ + \n\t(U32) mConfirm =1 (CONFIRM) + TD -> TD: Go to Blood Return + else #LightPink CANCEL + US -> UI: ACT: Press cancel + UI -> SW: ACT: Cancel Response + SW -> TD: MSG: [xB6: #2] Response \ + \n\t(U32) mId =4 (TEMPORARY_BREAK) \ + \n\t(U32) mConfirm =0 (CANCEL) + TD -> SW: MSG: [x01: #4] \nTD AlarmStatus : \ + \n\t(U32) mState \ + \n\t(U32) mTop = 0 \ + \n\t(U32) mMuteTimeout \ + \n\t(U16) mFlags + SW -> UI: ACT: Hide Alarm Dialog + UI -> US: ACT: Hide Alarm Dialog + end + end + + + @enduml \ No newline at end of file Index: sources/gui/qml/dialogs/watersample/WaterSampleDialog.qml =================================================================== diff -u -r0bb5f08eb3570de6bff3ce67ca502db129b59096 -r9b48fb662409e1c2b3c6db67f51f1356a765d772 --- sources/gui/qml/dialogs/watersample/WaterSampleDialog.qml (.../WaterSampleDialog.qml) (revision 0bb5f08eb3570de6bff3ce67ca502db129b59096) +++ sources/gui/qml/dialogs/watersample/WaterSampleDialog.qml (.../WaterSampleDialog.qml) (revision 9b48fb662409e1c2b3c6db67f51f1356a765d772) @@ -69,7 +69,7 @@ CloseButton { id : _closeButton - visible: vSettings.roWaterMode ? _waterSample.isPrimary: true + visible: vSettings.roWaterMode ? _waterSample.isPrimary : true onClicked : { _root.close()