application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Added back denali.pro.user

Alarm UI improvements

Moved request silence connection to initConnections() When pressing OK, the alarm bar will flash instead of the alarm window.

Displaying indication of when alarm silence function is deactivated.

Added indication when alarm silence function is active.

    • -0
    • +1
    /resources/images/bell-off.svg
    • -0
    • +1
    /resources/images/bell.svg
Moved settings item height and width to global variables.

    • -2
    • +2
    /sources/gui/qml/components/SettingsItem.qml
    • -0
    • +3
    /sources/gui/qml/globals/Variables.qml
Removed callback function -> Using signals instead.

Raising alarm when HD communication times out Added Settings base page with Sound and Diagnostic pages. Alarm design updates

    • -1
    • +5
    /sources/canbus/messageinterpreter.cpp
    • -0
    • +72
    /sources/gui/qml/components/SettingsItem.qml
    • -0
    • +114
    /sources/gui/qml/dialogs/Alarm.qml
  1. … 8 more files in changeset.
DEN-3149 : Treatment Ultrafiltration Adjustment

- Updated regarding the demo notes

- Fixed some codes to pass the existing unit tests (other than Ultrafiltration which have to work on it anyway (it's regarding mL=>L))

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

DEN-3149 : Treatment Ultrafiltration Adjustment

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

DEN-3149 : Treatment Ultrafiltration Adjustment

- The third Code Review by myself

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -1
    • +1
    /sources/canbus/messageinterpreter.cpp
    • -26
    • +26
    /sources/gui/qml/pages/treatment/TreatmentStack.qml
    • -3
    • +0
    /sources/model/mtreatmentadjustultrafiltrationconfirmresponse.h
    • -3
    • +0
    /sources/model/mtreatmentadjustultrafiltrationeditresponse.h
    • -4
    • +4
    /sources/model/mtreatmentadjustultrafiltrationstateresponse.cpp
    • -3
    • +3
    /sources/model/mtreatmentadjustultrafiltrationstateresponse.h
    • -46
    • +0
    /sources/view/vtreatmentadjustmentultrafiltration.cpp
    • -56
    • +0
    /sources/view/vtreatmentadjustmentultrafiltration.h
    • -0
    • +52
    /sources/view/vtreatmentadjustmentultrafiltrationconfirm.cpp
    • -0
    • +54
    /sources/view/vtreatmentadjustmentultrafiltrationconfirm.h
  1. … 9 more files in changeset.
DEN-3149 : Treatment Ultrafiltration Adjustment

- The second Code Review by myself

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -13
    • +3
    /sources/canbus/messagedispatcher.cpp
    • -13
    • +3
    /sources/canbus/messagedispatcher.h
    • -5
    • +2
    /sources/view/vtreatmentadjustmentduration.cpp
    • -5
    • +2
    /sources/view/vtreatmentadjustmentflows.cpp
    • -5
    • +2
    /sources/view/vtreatmentadjustmentultrafiltration.cpp
    • -5
    • +2
    /sources/view/vtreatmentultrafiltrationconfirm.cpp
    • -5
    • +2
    /sources/view/vtreatmentultrafiltrationstate.cpp
DEN-3149 : Treatment Ultrafiltration Adjustment

- The first my myself.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -10
    • +12
    /sources/applicationcontroller.h
    • -1
    • +1
    /sources/gui/qml/components/TouchRect.qml
  1. … 16 more files in changeset.
DEN-3149 : Treatment Ultrafiltration Adjustment

- Fixed a typo

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

DEN-3149 : Treatment Ultrafiltration Adjustment

- The resolution added to the Ultrafiltration Volume adjustment.

There is a discrepancy between PRS items which needs to be clarified. But for now 0.100 mL resolution has been selected.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Continuation of alarms.

    • -3
    • +3
    /sources/canbus/messageinterpreter.cpp
DEN-3149 : Treatment Ultrafiltration Adjustment

- Revert back the Ultrafiltration rate to the mL.

- Added a QT_DEBUG define for the Ultrafiltration volume because usually we are not connected to the pump and measVol would return 0 but RefVol is the calculated vol and should always have a value.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -0
    • +4
    /sources/view/vtreatmentultrafiltration.cpp
DEN-3149 : Treatment Ultrafiltration Adjustment

- Adding the last Ultrafiltration message transaction to confirm the values.

- Added the modification of the Ultrafiltration Volume unit change.

- Modified the components to support real/float variables to support Ultrafiltration volume with Liter as unit and 3 digit precision.

- So much refactoring

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -30
    • +57
    /sources/canbus/messageinterpreter.cpp
    • -0
    • +3
    /sources/gui/qml/components/ProgressBar.qml
    • -1
    • +1
    /sources/gui/qml/components/ProgressBarEx.qml
    • -2
    • +6
    /sources/gui/qml/components/ProgressRect.qml
    • -1
    • +4
    /sources/gui/qml/components/RangeBar.qml
    • -2
    • +3
    /sources/gui/qml/components/RangeMarker.qml
  1. … 27 more files in changeset.
Added Notification Dialog

    • -0
    • +111
    /sources/gui/qml/dialogs/NotificationDialog.qml
Added alarm svg

    • -0
    • +1
    /resources/images/alarm.svg
Cleaned up main.qml

Added Notification Dialog for Alarms and support for alarm dismiss actions by the user.

    • -3
    • +7
    /sources/gui/qml/components/ModalDialog.qml
    • -2
    • +2
    /sources/gui/qml/components/TouchRect.qml
    • -0
    • +4
    /sources/gui/qml/globals/Variables.qml
DEN-3154 : Implementation [ Messaging ]

- Added the Ultrafiltration Adjustment Confirm Request

- Improved the MVC and some twicks in qml.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -59
    • +10
    /sources/applicationcontroller.cpp
    • -0
    • +80
    /sources/canbus/messagedispatcher.cpp
    • -0
    • +14
    /sources/canbus/messagedispatcher.h
    • -2
    • +7
    /sources/canbus/messageinterpreter.cpp
    • -1
    • +1
    /sources/gui/qml/components/TouchRect.qml
  1. … 7 more files in changeset.
Merge branch 'DEN-2795_UIHeparinBolus(UITreatmentScreenAssets)'

DEN-3528 : The Ultrafiltration Unit shall be changed to Liter(L) form (mL)

- The Ultrafiltration Unit on the In-Treatment Screen has been changed to Liter (L)

- The simulation of the fluid has been removed.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

DEN-3149 : Treatment Ultrafiltration Adjustment

- Updated the MVC/Messaging with the updated Ultrafiltration Adjustment message.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -4
    • +4
    /sources/model/mtreatmentadjustultrafiltrationresponse.cpp
    • -4
    • +4
    /sources/model/mtreatmentadjustultrafiltrationresponse.h
    • -1
    • +1
    /sources/view/vtreatmentadjustmentultrafiltration.cpp
    • -2
    • +2
    /sources/view/vtreatmentadjustmentultrafiltration.h
DEN-3149 : Treatment Ultrafiltration Adjustment

- Adjustment Models refactoring.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -20
    • +26
    /sources/applicationcontroller.cpp
    • -3
    • +7
    /sources/canbus/messageinterpreter.cpp
    • -2
    • +8
    /sources/model/mtreatmentadjustultrafiltrationresponse.cpp
    • -0
    • +2
    /sources/model/mtreatmentadjustultrafiltrationresponse.h
    • -0
    • +38
    /sources/model/mtreatmentadjustultrafiltrationstateresponse.cpp
  1. … 11 more files in changeset.
DEN-3149 : Treatment Ultrafiltration Adjustment

- Treatment Ultrafiltration Edit => Confirm Screen.

- Added Error notification for the ultrafiltration state/adjustment response on related dialogs.

- Modified the Image/Wave/Clock to have the positioning out of the component.

- Added/Separated the pause notification on the Treatment Adjustment Base Component so the code handling would be easier to handle the pause notification and the error message handling on the dialog.

- Added overloaded text method for the ultrafiltration state although it has no rejection reason.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -5
    • +0
    /sources/gui/qml/components/ImageClock.qml
    • -6
    • +0
    /sources/gui/qml/components/ImageWave.qml
  1. … 4 more files in changeset.
DEN-3149 : Treatment Ultrafiltration Adjustment

- Added selected Ultrafiltration Volume value label in the Ultrafiltration Edit dialog

- Changed notification object exposure logic in TouchArea and ModalDialog.

- Used measuredVolume but passed refVol in C++ to make one place changed,.

- Changed connection call to property binding for the TreatmentUltrafiltration section pause notification.

- Changed the MAdjustUltrafiltrationReq model from U32(quint32) to F32(float).

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -3
    • +1
    /sources/gui/qml/components/ModalDialog.qml
    • -2
    • +2
    /sources/gui/qml/components/ProgressBarEx.qml
    • -8
    • +6
    /sources/gui/qml/components/TouchArea.qml
    • -1
    • +1
    /sources/view/vtreatmentadjustmentultrafiltration.h
    • -1
    • +6
    /sources/view/vtreatmentultrafiltration.cpp
DEN-3149 : Treatment Ultrafiltration Adjustment

- BackUp push:

- Message 19 : UF Vol. Change Response

- Incomplete.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -0
    • +36
    /sources/canbus/messageinterpreter.cpp
    • -2
    • +2
    /sources/view/vtreatmentadjustmentultrafiltration.cpp
    • -2
    • +4
    /sources/view/vtreatmentadjustmentultrafiltration.h