Index: SDDs/prime.png =================================================================== diff -u Binary files differ Index: SDDs/prime.puml =================================================================== diff -u --- SDDs/prime.puml (revision 0) +++ SDDs/prime.puml (revision e21325dc5cd8cce229eb129d4acbce5642ba3f57) @@ -0,0 +1,45 @@ +@startuml prime + + participant TD as TD + participant SW as SW + participant UI as UI + actor USER as US + + 'Possible actions and interaction types + ' TD -> SW: MSG: Message + ' SW -> UI: CMD: command + ' UI -> UI: 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.] + + == Prime == + TD -> SW: MSG: [xB7: #8] \nTD Pre-Treatment States Data : \ + \n\t(U32) mSubMode=TD_PRE_TREATMENT_PRIME_STATE \ + \n\t(U32) mInstallState \ + \n\t(U32) mSelfTestDryState \ + \n\t(U32) mPrimeState \ + \n\t(U32) mRecirculateState \ + \n\t(U32) mConfirmRxState \ + \n\t(U32) mHeparinState \ + \n\t(U32) mPatientConnectionState + SW -> UI: ACT: Show Pre-Treatment Prime + UI -> US: ACT: Display Prime screen + TD -> SW: MSG: [xC7: #4] \nTD Prime Data : \ + \n\t(U32) mPrimeState \ + \n\t(U32) mTotalDuration \ + \n\t(U32) mCountDown \ + \n\t(U32) mPauseCountdown + SW -> UI: ACT: Show Prime progress + UI -> US: ACT: Display Prime progress \ + \n\t- Current State \ + \n\t- Countdown timer \ + \n\t- Progress bar +@enduml \ No newline at end of file Index: sources/gui/qml/AlarmItem.qml =================================================================== diff -u -r7fb13d9e1a453a37ab4dea5536e0f19ed6e272d2 -re21325dc5cd8cce229eb129d4acbce5642ba3f57 --- sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision 7fb13d9e1a453a37ab4dea5536e0f19ed6e272d2) +++ sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision e21325dc5cd8cce229eb129d4acbce5642ba3f57) @@ -75,8 +75,8 @@ _notificationDialog.alarmMaximize() _alarmBar .visible = false } - _powerItem.cancel() } + function alarmList() { vAlarmActiveList.doRequest() _notificationDialog.alarmList() Index: sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.h =================================================================== diff -u -rbc97db7aaffa2e2115d2049bbcda2da34fb8f9a8 -re21325dc5cd8cce229eb129d4acbce5642ba3f57 --- sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.h (.../VPreTreatmentDisposablesPrimeData.h) (revision bc97db7aaffa2e2115d2049bbcda2da34fb8f9a8) +++ sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.h (.../VPreTreatmentDisposablesPrimeData.h) (revision e21325dc5cd8cce229eb129d4acbce5642ba3f57) @@ -42,15 +42,6 @@ PROPERTY( quint32 , pauseCountDown , 0) PROPERTY( quint32 , elapsed , 0) -// PROPERTY ( bool , primeBloodCircuitStart , false) -// PROPERTY ( bool , primeBloodCircuitEnd , false) -// PROPERTY ( bool , primeDialysateCircuitStart , false) -// PROPERTY ( bool , primeDialysateCircuitEnd , false) -// PROPERTY ( bool , primeDialysatePurgeStart , false) -// PROPERTY ( bool , primeDialysatePurgeEnd , false) -// PROPERTY ( bool , primePrimingFluidDiscardStart , false) -// PROPERTY ( bool , primePrimingFluidDiscardEnd , false) - PROPERTY ( bool , primeBloodCircuit , false) PROPERTY ( bool , primeDialysateCircuit , false) PROPERTY ( bool , primeDialysatePurge , false)