sources

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-5833: Implementation

- added a touch expanding area for the TouchArea so regardless of its visual size it can have expanded touchable area.

- the touch expanding for the mute button set to 25 so it can have a bigger touch area that its size which is little.

    • -0
    • +1
    ./gui/qml/components/NotificationBar.qml
    • -0
    • +1
    ./gui/qml/dialogs/NotificationDialog.qml
Merge branch 'DEN-5830_AlarmDesign' into 2020_EOY_DEMO

DEN-5833: Implementation

- Added a MACRO for convenience of empty payload messages handling.

DEN-5833: Implementation

- Fixed the bug that alarm ID zero which is the clear the alarm indication wasn't updating the properties, so caused to alarm_ID changed notification signal not to raise and GUI wasn't getting updated.

DEN-5515, DEN-5516: Moved bluetooth setup before UI application start in run.sh, fixed start treatment messaging

    • -1
    • +1
    ./gui/qml/pages/treatment/TreatmentCreate.qml
    • -5
    • +2
    ./gui/qml/pages/treatment/TreatmentStack.qml
  1. … 2 more files in changeset.
Merge DEN-4860_BLE into 2020_EOY_DEMO

    • -1
    • +2
    ./gui/qml/pages/treatment/TreatmentBegin.qml
    • -0
    • +1
    ./gui/qml/pages/treatment/TreatmentConfirm.qml
    • -2
    • +5
    ./gui/qml/pages/treatment/TreatmentCreate.qml
    • -0
    • +2
    ./gui/qml/pages/treatment/TreatmentPrime.qml
  1. … 10 more files in changeset.
Merge master into DEN-4860_BLE

    • -1
    • +0
    ./gui/qml/pages/treatment/TreatmentBegin.qml
    • -2
    • +0
    ./gui/qml/pages/treatment/TreatmentCreate.qml
    • -1
    • +0
    ./gui/qml/pages/treatment/TreatmentPrime.qml
    • -1
    • +57
    ./gui/qml/pages/treatment/TreatmentStack.qml
  1. … 9 more files in changeset.
DEN-5515, DEN-5516: Disabled verbose bluetooth debugging

DEN-5754: Implementation

- linked the pre-treatment ultrafiltration adjustment with the in-treatment ultrafiltration section and the adjustment flow.

- added the rejection reason text to the pTx uf adj screen.

    • -1
    • +1
    ./gui/qml/components/NotificationBar.qml
    • -10
    • +14
    ./gui/qml/pages/treatment/TreatmentBegin.qml
    • -2
    • +17
    ./gui/qml/pages/treatment/TreatmentStack.qml
DEN-5515, DEN-5516: Setup in-treatment bp/hr measurement alerts

- Replaced some instances of qDebug with LOG_DEBUG

- Docstring fixes, cleanup

    • -0
    • +2
    ./gui/qml/pages/treatment/TreatmentCreate.qml
Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into 2020_EOY_DEMO

DEN-5754: Implementation

- Fixed the message id of the ID_ConfirmTreatmentReq from 58 to 59

- Enabled the priming button for now since there is no FW implementation.

    • -1
    • +2
    ./gui/qml/pages/treatment/TreatmentPrime.qml
Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into 2020_EOY_DEMO

  1. … 2 more files in changeset.
DEN-5833: Implementation

- Moved version and sd-card icon to to not to cover others.

DEN-5754: Implementation

- Removed the unused flag of ALARM_ID_TEMPERATURE_SENSORS_INCONSISTENT

DEN-5516, 5514 - BLE Interface updates

- When reconnecting to the last paired device on startup, ensure we repeatedly try to connect to it by updating the BLE connection type

- Docstring additions

- Keeping some code in case it is needed for future use with other BLE devices

DEN-5754: Implementation

- Removed the semi-colon at the end of the imports.

DEN-5833: Implementation

- The message 63 has been tested

  1. … 1 more file in changeset.
DEN-5833: Implementation

- Added the message 63 (req/rsp)

    • -0
    • +41
    ./model/hd/alarm/MAlarmClearedCondition.cpp
    • -0
    • +79
    ./model/hd/alarm/MAlarmClearedCondition.h
  1. … 2 more files in changeset.
DEN-5833: Implementation

- moved version and SD-Card icon to top which were covering the alarm bar.

- added list icon on the notification bar

- implemented the basics of the alarm list dialog.

- tweaked the Notification default coloring

-

    • -4
    • +28
    ./gui/qml/components/NotificationBar.qml
    • -0
    • +100
    ./gui/qml/dialogs/AlarmListDialog.qml
    • -3
    • +3
    ./gui/qml/dialogs/NotificationDialog.qml
  1. … 6 more files in changeset.
DEN-5833: Implementation

- fix a naming bug.

DEN-5833: Implementation

- Fixed the bug of silence logic which was reverse

- Fixed the bug that length of the silence message payload was incorrectly set to 4 instead of 1.

- changed the name of the MAlarmSilenceReq member variable to silence instead of state which now implies it is silent (1) or not (0).

DEN-5833: Implementation

- made the mute button click optional and currently enabled.

- made minimize on silent on the Notification Dialog optional and is disabled currently.

- made separate slots for each user actions instead of one for all with 4 parameter cause I think it's easier and more convenient to use this way.

- increased the Notification Bar height a little bit more.

    • -2
    • +4
    ./gui/qml/components/NotificationBar.qml
    • -12
    • +45
    ./view/hd/alarm/VAlarmStatus.cpp
DEN-5833: Implementation

- Implementation of the message 64: 'Alarm User Action'

- Cleaned up the VAlarmStatus class.

    • -38
    • +35
    ./view/hd/alarm/VAlarmStatus.cpp
DEN-5833: Implementation

- Added User Action message response model.

  1. … 1 more file in changeset.
DEN-5516, DEN-5514: Ensure connection to BP-Cuff is re-established after power cycle

DEN-5833: Implementation

- Fixed a bouncing bug of the message when sent for the first time with silenced flag on to show the alarm not maximized.

    • -1
    • +12
    ./gui/qml/dialogs/NotificationDialog.qml
DEN-5833: Implementation

- Added 3 Alarm buttons

- created Mute Button

- created Up and Down Button (minimize/maximize)

- used FW alarm status flag enum (Alarm_State_Flag_Bit_Positions) instead of the UI version and removed UI one.

Code cleaned up

- modified and cleaned up Notification Dialog and Bar.

- modified Time Text component to be able to show sections with one zero only.

- cleaned up main.qml

    • -0
    • +60
    ./gui/qml/components/MuteButton.qml
    • -37
    • +27
    ./gui/qml/components/NotificationBar.qml
    • -0
    • +37
    ./gui/qml/components/UpDownButton.qml
    • -40
    • +87
    ./gui/qml/dialogs/NotificationDialog.qml
    • -18
    • +0
    ./model/hd/alarm/MAlarmStatusData.h
    • -22
    • +17
    ./view/hd/alarm/VAlarmStatus.cpp
  1. … 7 more files in changeset.
DEN-5754: Implementation

- Added the new MVC for initial UF Volume adjustment messages (79/80).

    • -4
    • +5
    ./gui/qml/pages/treatment/TreatmentBegin.qml
    • -2
    • +2
    ./gui/qml/pages/treatment/TreatmentPrime.qml
    • -0
    • +49
    ./model/hd/adjustment/MTreatmentAdjustUltrafiltrationInitResponse.cpp
    • -0
    • +86
    ./model/hd/adjustment/MTreatmentAdjustUltrafiltrationInitResponse.h
  1. … 4 more files in changeset.
DEN-5754: Implementation

- reviewed the pre-treatment screens and modified

- added the double range slider for Arterial and Venous

- modified the treatmentBegin(ultrafiltration)

- so many other tweaks.

    • -0
    • +1
    ./gui/qml/components/ProgressCircle.qml
    • -4
    • +41
    ./gui/qml/components/RangeSlider.qml
    • -60
    • +77
    ./gui/qml/pages/treatment/TreatmentBegin.qml
    • -1
    • +0
    ./gui/qml/pages/treatment/TreatmentConfirm.qml
    • -131
    • +167
    ./gui/qml/pages/treatment/TreatmentCreate.qml
    • -102
    • +78
    ./gui/qml/pages/treatment/TreatmentPrime.qml
  1. … 4 more files in changeset.