application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-13965-UI-BN-S80' into develop

    • -0
    • +14
    /sources/canbus/MessageDispatcher.cpp
    • -1
    • +4
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +1
    /sources/view/hd/alarm/VAlarmStatus.cpp
DEN-13939: IMP: Implementation of the the message [0xBB00]

    • -0
    • +14
    /sources/canbus/MessageDispatcher.cpp
    • -1
    • +2
    /sources/canbus/MessageInterpreter.cpp
DEN-13939: IMP: Implementation of the the message [0xBA00]

Messaging:

- Modified the message 0xBB00 required length from 3xU32 to 2xU32

- Renamed the VConfrimDialog to VConfirm, since the view class is not the actual dialog implementation.

- Merged the vPowerOff view to the VConfrim, and removed the VPowerOff view classes.

Alarm Integration:

- AlarmItem: add the hasAlarm to theAlarmMinimize as well to prevent the AlarmBar being visible when there is no active alarm.

- VAlarmStatus: fixed the issue with the hasAlarm property which was causing the AlarmDialog being visible while there was not active alarm.

Confirm Dialog:

- Used the PowerItem.qml and the PowerOff Dialog for Generic Confirm, and improved the code to be repurposed.

- Footer: updated the Footer component to be able to re-layout the touchrects without an open/close cycle.

- TouchRect: exposed the the buttons text.

    • -8
    • +20
    /sources/gui/qml/components/Footer.qml
    • -0
    • +1
    /sources/gui/qml/components/TouchRect.qml
    • -22
    • +47
    /sources/gui/qml/dialogs/PowerOff.qml
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
  1. … 5 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

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

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

    • -1
    • +1
    /sources/bluetooth/BluetoothInterface.cpp
  1. … 81 more files in changeset.
Merge branch 'DEN-13198-UI_BN_75' into staging

    • -18
    • +55
    /sources/ApplicationController.cpp
    • -17
    • +17
    /sources/canbus/MessageDispatcher.cpp
    • -19
    • +13
    /sources/canbus/MessageInterpreter.cpp
    • -57
    • +42
    /sources/device/DeviceController.cpp
  1. … 31 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

    • -11
    • +11
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-13939: IMP: Implementation of the the message [0xBA00]

- The Model/View are implemented and exposed to QML.

    • -0
    • +2
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +49
    /sources/model/confirm/MDuetConfirmHDi.cpp
    • -0
    • +85
    /sources/model/confirm/MDuetConfirmHDi.h
    • -2
    • +5
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -0
    • +46
    /sources/view/confirm/VConfirmDialog.cpp
    • -0
    • +56
    /sources/view/confirm/VConfirmDialog.h
Bamboo Commit: Updated MAlarmMapping.cpp

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

    • -1
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

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

    • -1
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

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

    • -4
    • +7
    /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/canbus/MessageInterpreter.cpp
  1. … 86 more files in changeset.
Merge branch 'Build_Issue_Merging__DEN-12716-UI_BN_S70__to__staging' into staging

Bamboo Commit: Updated MAlarmMapping.cpp

    • -3
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-12640-UI-BN-S79' into develop

    • -4
    • +23
    /sources/gui/qml/globals/Variables.qml
Merge branch 'DEN-13726-UI-BN-S79' into develop

Merge branch 'Build_Issue_Merging__DEN-12716-UI_BN_S70__to__staging' into develop

DEN-12640: UI: Pressure readings on blood prime / rinseback

- Added bottom line separators.

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-12640: UI: Pressure readings on blood prime / rinseback

- The In-Line Blood Pressure monitor (ILBPM) has been added to the Rinseback and blood prime screen.

- It has been requested to place the ILBPM, at same place on all three screens (Main Treatment is the third one), but on the rinseback screen we don't have space for that. So it has been moved to top/left (it was buttom/left) and swapped with the FLOWS section.

- It needs to be negotiated with the team to make sure everyone agrees.

    • -4
    • +23
    /sources/gui/qml/globals/Variables.qml
    • -46
    • +36
    /sources/gui/qml/pages/treatment/TreatmentHome.qml
DEN-13726: Change Request: Require user to go through Rinseback setup before enabling START RINSEBACK button

DEN-13845: CRV: Merge issue of DEN-12716-UI_BN_S70 into staging

- Due to some enum changes, UI couldn't build

- An idea implemented to detect the enum changes by compiler. The implementation may be able to improve.

    • -293
    • +305
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

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

    • -1
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -3
    • +5
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-13198-UI_BN_75' into develop