Index: SDDs/Heat_Disinfect.png =================================================================== diff -u Binary files differ Index: SDDs/Heat_Disinfect.puml =================================================================== diff -u --- SDDs/Heat_Disinfect.puml (revision 0) +++ SDDs/Heat_Disinfect.puml (revision bc47c079f70ec78861f75bf9bbf07c95a727a2e8) @@ -0,0 +1,68 @@ +@startuml Heat_Disinfect + + participant DD as DD + participant TD as TD + participant SW as SW + participant UI as UI + actor USER as US + + 'Possible actions and interaction tuypes + ' TD -> SW: MSG: Message + ' SW -> TD: MSG: Message + ' SW -> UI: CMD: command + ' UI -> SW: ACT: Action + ' US -> UI: User actions are: + ' ENT: User enters a value or string + ' TCH: User touches a button (RadioButton, CheckBox, ...) + ' SET: User sets/slides a slider + ' SCL: User scrolls a flipable area + ' + 'Messages conventions: + '[x \n ,] + '[x \n ,# certain amount of parameters according to the content] + '[x \n ,X The rest of the parameters do not matter.] + + == Post Treatment == + TD -> SW: MSG: [x12: #1] \n OpMode - Post Treatment + SW -> UI: CMD: Post Treatment + UI -> US: ACT: Display Post Treatment stack + TD -> SW: MSG: [0xDA: #1] Post Treatment State broadcast \ + \n\t(U32) state=TD_POST_TREATMENT_DISINFECTION_STATE + SW -> UI: CMD: Post Treatment Disinfection + UI -> US: ACT: Display Post Treatment Disinfection screen + + US -> UI: TCH: Heat Disinfection button + UI -> SW: ACT: Disinfection Selection - Heat Disinfection + SW -> TD: MSG[0xCC: #1] Disinfection Selection Req \ + \n\t(U32) state=DISINFECT_SEL_HEAT + TD -> SW: MSG[0xCD: #2] Disinfection Selection Rsp \ + \n\t(U32) Accept \ + \n\t(U32) Reject + alt Accept + TD -> SW: MSG: [x12: #3,1] Dat \n OpMode - Standby + SW -> UI: CMD: Standby + UI -> US: ACT: Display Standby screen + TD -> DD: ACT: Request Heat Disinfeiton + TD -> SW: MSG: [x01: #4] \nTD AlarmStatus : \ + \n\t(U32) mState \ + \n\t(U32) mTop=HEAT_DISINFECT_IN_PROGRESS \ + \n\t(U32) mMuteTimeout \ + \n\t(U16) mFlags |= NO_BUTTONS + SW -> UI: ACT: Display Alarm Dialog \ + \n\t - NO_BUTTONS visible + UI -> US: ACT: Display Alarm Dialog \ + \n\t - NO_BUTTONS visible + + DD -> DD: ACT: Perform Heat Disinfection + DD -> TD: ACT: Heat Disinfection Completed + TD -> SW: MSG: [x01: #4] \nTD AlarmStatus : \ + \n\t(U32) mState \ + \n\t(U32) mTop=0 \ + \n\t(U32) mMuteTimeout \ + \n\t(U16) mFlags |= NO_BUTTONS + + else #Pink Reject + SW -> UI: ACT: Send Rejection Reason + UI -> US: ACT: SHow Rejection Reason + end +@enduml Index: sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentRecirculateProgress.qml =================================================================== diff -u -rc1651f840faf3ed767fb19b76742b68401f96272 -rbc47c079f70ec78861f75bf9bbf07c95a727a2e8 --- sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentRecirculateProgress.qml (.../EndTreatmentRecirculateProgress.qml) (revision c1651f840faf3ed767fb19b76742b68401f96272) +++ sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentRecirculateProgress.qml (.../EndTreatmentRecirculateProgress.qml) (revision bc47c079f70ec78861f75bf9bbf07c95a727a2e8) @@ -14,7 +14,7 @@ footer.anchors.bottomMargin: Variables.notificationHeight + Variables.defaultMargin readonly property int timeoutCountdown : vTreatmentRecirculate .timeoutCountDown - readonly property int bloodFlowRate : vTreatmentParametersSetPoint.bloodFlow + readonly property int bloodFlowRate : 100 // LEAHI-PRS-366 readonly property string recirculationImage : "qrc:/images/iRecirculate" Row { id: _infoRow Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentIsolatedUFVolumeEdit.qml =================================================================== diff -u -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca -rbc47c079f70ec78861f75bf9bbf07c95a727a2e8 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentIsolatedUFVolumeEdit.qml (.../TreatmentAdjustmentIsolatedUFVolumeEdit.qml) (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentIsolatedUFVolumeEdit.qml (.../TreatmentAdjustmentIsolatedUFVolumeEdit.qml) (revision bc47c079f70ec78861f75bf9bbf07c95a727a2e8) @@ -37,7 +37,6 @@ function reset() { _volumeAdjuster.value = _volumeAdjuster.minimum - _volumeAdjuster.isActive = false } QtObject { id: _private @@ -136,7 +135,7 @@ horizontalCenter: parent.horizontalCenter } text : qsTr("Isolated UF Volume Goal") - isActive : false + isActive : true unitText : Variables.unitVolume decimal : _private.precision step : _private.volumeRes Index: sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartRequests.h =================================================================== diff -u -rf835b04c0a82a4ebf58f94b817f7961b2e824c35 -rbc47c079f70ec78861f75bf9bbf07c95a727a2e8 --- sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartRequests.h (.../MDisinfectAdjustStartRequests.h) (revision f835b04c0a82a4ebf58f94b817f7961b2e824c35) +++ sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartRequests.h (.../MDisinfectAdjustStartRequests.h) (revision bc47c079f70ec78861f75bf9bbf07c95a727a2e8) @@ -49,7 +49,7 @@ */ class MAdjustDisinfectStartReq : public MModel { public: - GuiDisinfectDGStates mState = GuiDisinfectDDSelection::DISINFECT_SEL_SKIP; + GuiDisinfectDDSelection mState = GuiDisinfectDDSelection::DISINFECT_SEL_SKIP; static QString toString(const QVariantList &vParameters) { return MModel::toString("DisinfectStart", vParameters); }