application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merged DEN-17260

DENBUG-302: When treatment time is updated mid-treatment, update UF rate to keep the volume prescription the same

- Modified message 0xBA to send up to 4 float payloads to the UI

- Changed MDuetConfirmHD to receive and process the new payloads

- Changed VConfirm to update the confirm messages that have {} in them and replace them with actual values

    • -10
    • +21
    /sources/model/confirm/MDuetConfirmHDi.h
    • -2
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-17269: Change_version_format_from_dot_to_dash

- Changed the format of the version from dot to dash before compatibility value.

DENBUG-298: User unable to deliver saline bolus during alarm conditions where the blood pump is recirculating

- Reduced the font size of fluid value font from 32 to 28.

Merge branch 'develop' of bitbucket.org:diality-cloud/application into develop

Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-17260-ui-dn-release-21' into develop

    • -1
    • +1
    /sources/bluetooth/BluetoothInterface.cpp
    • -1
    • +1
    /sources/bluetooth/BluetoothInterface.h
    • -1
    • +1
    /sources/gui/qml/globals/Variables.qml
    • -1
    • +1
    /sources/view/settings/VNetworkModel.cpp
    • -1
    • +1
    /sources/view/settings/VNetworkModel.h
DEN-17260: UI-DN-Release-21

- DENBUG-298: Removed the Maximum Saline Bolus State

- DENBUG-298: Added Deliver Saline Bolus in treatment stop.

StagingMerge - DEN-17260-ui-dn-release-21 (13 commits squashed)

DEN-17260: UI-DN-Release-21

- DEN-17261: Corrected the treatment logs doxygen and data type for potassium and calcium.

DEN-17260: UI-DN-Release-21

- DENBUG-298: Removed the Maximum Saline Bolus State

- DENBUG-298: Added Deliver Saline Bolus in treatment stop.

DENBUG-298: User unable to deliver saline bolus during alarm conditions where the blood pump is recirculating

- Reduced the font size of fluid value font from 32 to 28.

DEN-17269: Change_version_format_from_dot_to_dash

- Changed the format of the version from dot to dash before compatibility value.

DENBUG-302: When treatment time is updated mid-treatment, update UF rate to keep the volume prescription the same

- Modified message 0xBA to send up to 4 float payloads to the UI

- Changed MDuetConfirmHD to receive and process the new payloads

- Changed VConfirm to update the confirm messages that have {} in them and replace them with actual values

DENBUG-298: User unable to deliver saline bolus during alarm conditions where the blood pump is recirculating

- Updated the TreatmentSaline.qml file to clear the reject reasons associated with saline bolus once the treatment state has changed.

DENBUG-302: When treatment time is updated mid-treatment, update UF rate to keep the volume prescription the same

- Updated the VConfirm to trigger the confirm messages even if the ID has not changed.

DENBUG-298: User unable to deliver saline bolus during alarm conditions where the blood pump is recirculating

- Updated the code to clear the saline bolus related reject reasons upon changing the saline bolus states.

DENBUG-298: User unable to deliver saline bolus during alarm conditions where the blood pump is recirculating

- Added code to clear the saline bolus reject reason upon changing the treatment states.

DENBUG-302: When treatment time is updated mid-treatment, update UF rate to keep the volume prescription the same

- Updated the code to round up the UF rate that is displayed on the UF rate change screen.

DENBUG-302: When treatment time is updated mid-treatment, update UF rate to keep the volume prescription the same

- Updated the current UF rate in the VTreatmentUltrafiltration to be rounded up.

- Removed commented code.

DENBUG-302: When treatment time is updated mid-treatment, update UF rate to keep the volume prescription the same

- Made UF Rate related values in VTreatmentAdjustmentUltrafiltrationEdit to be rounded up prior to displaying on the UI.

DENBUG-302: When treatment time is updated mid-treatment, update UF rate to keep the volume prescription the same

- Addressed the code review comments

    • -2
    • +13
    /sources/gui/qml/pages/MainStack.qml
    • -10
    • +21
    /sources/model/confirm/MDuetConfirmHDi.h
    • -2
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
  1. … 3 more files in changeset.
DEN-17260: UI-DN-Release-21

- DEN-17261: Corrected the treatment logs doxygen and data type for potassium and calcium.

Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
LEAH-1976: implement-a-simple-video-screen

To provide support for animation, the following modules are created [LEAH-1974]

AnimationScreen.qml

ImageAnimator.qml

ImageNameLoader.qml

PlaybackController.qml

    • -0
    • +158
    /sources/gui/qml/components/AnimationScreen.qml
    • -0
    • +221
    /sources/gui/qml/components/ImageAnimator.qml
    • -0
    • +131
    /sources/gui/qml/components/ImageNameLoader.qml
    • -0
    • +200
    /sources/gui/qml/components/PlaybackController.qml
    • -5
    • +4
    /sources/gui/qml/components/VideoScreen.qml
Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -1
    • +1
    /sources/gui/qml/components/GridSelection.qml
    • -1
    • +1
    /sources/gui/qml/compounds/BPHREntry.qml
    • -4
    • +4
    /sources/gui/qml/dialogs/DryDemoDialog.qml
    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-17157-update_denali_application_for_dry_demo' into staging

    • -2
    • +2
    /sources/gui/qml/components/GridSelection.qml
    • -4
    • +3
    /sources/gui/qml/compounds/BPHREntry.qml
DEN-17157: Update_Denali_Application_for_Dry_Demo

- Addressed the code review comments.

DEN-17157: Update_Denali_Application_for_Dry_Demo

- Addressed the code review comments.

LEAH-1976: implement-a-simple-video-screen

Added Video Screen with button-controller with transition animation

Temporary:

The screen can be accessed by clicking on the "SD" icon

The test video is stored in "/home/denali/videos/

    • binary
    /resources/images/Backward.png
    • binary
    /resources/images/Forward.png
    • -0
    • +211
    /sources/gui/qml/components/VideoScreen.qml
Merged DEN-17157

DEN-17157: Update_Denali_Application_for_Dry_Demo

- Added code in PreTreatmentUltrafiltration.qml to clear the screen all the time.

- Removed the defaultValue in the PreTreatmentUltrafiltration.qml .

DEN-17157: Update_Denali_Application_for_Dry_Demo

- Updated the treatment vitals qml file to accept vitals in drydemo

Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'release/p1b/staging' into release/p1b/master

Bamboo Commit: Updated MAlarmMapping.cpp

    • -15
    • +21
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 605 more files in changeset.
Merge branch 'release/stagingmerge-DEN-17206-UI-BN-Release20' into release/p1b/staging

DENBUG-287 ( DEN-16823 ) : Tx Log Export Success Message via USB is Hidden Behind REQUEST_REJECT_REASON_DRAIN_NOT_COMPLETE Msg

- DEN-16823: Tx Log Export Success Message via USB is Hidden Behind REQUEST_REJECT_REASON_DRAIN_NOT_COMPLETE Msg

- Cherry Picked from Dara's commit

DEN-17161: Incorrect Calcium Value recorded in TX logs

- Cherry picked from Dara's commit 8fa28af55b1a183b75fb6ddd800192e88ac8d258.

DENBUG-294: UI: Log export between different devices on the same USB drive has conflict of names.

DENBUG-294: UI: Log export between different devices on the same USB drive has conflict of names.

- Added functionality to properly backup the BootPOST log which is the log before getting the HDSerial.

- It will get backed up if it is in the current day and system just has changed to the new log file due to receiving of the serial.

- When trying to back up the normal logs (logs with serial), will try for its BootPOST log, if exists will get backed up.

DENBUG-294: UI: Log export between different devices on the same USB drive has conflict of names.

- renamed the BootPOST log before backing up so won't remain Serial-less on the device.

DENBUG-294: UI: Log export between different devices on the same USB drive has conflict of names.

- now using the old "denali" added log format for update/manufacturing

- and delete them with the lockdown.sh script.

DENBUG-294: UI: Log export between different devices on the same USB drive has conflict of names.

- after the reboot the newly created BootPOST could not get renamed because of the same file already exists, therefore application is now append the new one to the oldone with serial and deletes the new one.

- since the BootPOST log files are small in size like 5~10K this should affect the performance of the system.

    • -1302
    • +1324
    /sources/device/DeviceController.cpp
    • -0
    • +1
    /sources/gui/qml/pages/TreatmentFlowBase.qml