application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'master' into DEN-5736_UI_Heparin_Bolus

Server coverage issue fixed

- This line was not covered on server although it was covered on local.

Tested locally and it is working.

    • -1
    • +3
    /sources/view/hd/alarm/VAlarmStatus.cpp
Build failed on server because the fw common branch master was changed.

- commented out the removed enum from application.

    • -2
    • +2
    /sources/model/hd/alarm/MAlarmStatusData.cpp
Merge branch 'DEN-5830_AlarmDesign'

DEN-5838: Code Review 0

    • -1
    • +0
    /sources/model/hd/alarm/MAlarmStatusData.cpp
DEN-5837: Code Analysis

DEN-5836: Code Coverage

- 100.000% (4827/4827)

- added a unit test for the AlarmGenerator private method setBits.

DEN-5836: Code Coverage

- 99.979% (4826/4827)

    • -40
    • +41
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +2
    /sources/view/hd/alarm/VAlarmStatus.cpp
DEN-5836: Code Coverage

- commented as manually tested the AlarmClearedCondition.

    • -1
    • +2
    /sources/canbus/MessageInterpreter.cpp
    • -1
    • +0
    /sources/gui/qml/components/TimeText.qml
    • -0
    • +2
    /sources/view/hd/alarm/VAlarmStatus.cpp
DEN-5836: Alarm:Code Coverage

- 99.110% (4790/4833)

    • -1
    • +1
    /sources/view/hd/alarm/VAlarmStatus.cpp
DEN-5836: Alarm:Code Coverage

- updated the alarm message table

- fixed the -q parameter

    • -59
    • +111
    /sources/model/hd/alarm/MAlarmStatusData.cpp
    • -9
    • +8
    /sources/view/hd/alarm/VAlarmStatus.cpp
DEN-5833: Implementation

- Added a UI "AlarmGenerator" class to handle the HD_COMM_TIMEOUT and later the BLE Cuff alarm (PRS 395).

    • -0
    • +75
    /sources/AlarmGenerator.cpp
    • -0
    • +55
    /sources/AlarmGenerator.h
    • -8
    • +9
    /sources/view/hd/alarm/VAlarmStatus.cpp
DEN-5833: Implementation

- Cleaned up the unit tests

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.

    • -1
    • +1
    /sources/gui/qml/components/MuteButton.qml
    • -1
    • +4
    /sources/gui/qml/components/TouchRect.qml
DEN-5833: Implementation

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

    • -1
    • +9
    /sources/canbus/MessageInterpreter.cpp
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.

    • -6
    • +6
    /sources/view/hd/alarm/VAlarmStatus.cpp
DEN-5833: Implementation

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

DEN-5833: Implementation

- The message 63 has been tested

    • -1
    • +15
    /sources/view/hd/alarm/VAlarmStatus.cpp
DEN-5833: Implementation

- Added the message 63 (req/rsp)

    • -13
    • +13
    /sources/canbus/MessageDispatcher.cpp
    • -13
    • +20
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +41
    /sources/model/hd/alarm/MAlarmClearedCondition.cpp
    • -0
    • +79
    /sources/model/hd/alarm/MAlarmClearedCondition.h
    • -4
    • +4
    /sources/view/hd/alarm/VAlarmStatus.cpp
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

-

    • binary
    /resources/images/AlarmBell.png
    • binary
    /resources/images/AlarmBellSilent.png
    • binary
    /resources/images/doted-list.png
    • binary
    /resources/images/list.png
    • -0
    • +100
    /sources/gui/qml/dialogs/AlarmListDialog.qml
    • -1
    • +2
    /sources/gui/qml/globals/Variables.qml
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).

    • -2
    • +2
    /sources/view/hd/alarm/VAlarmStatus.cpp
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
    • +2
    /sources/gui/qml/globals/Variables.qml
    • -12
    • +45
    /sources/view/hd/alarm/VAlarmStatus.cpp
DEN-5833: Implementation

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

- Cleaned up the VAlarmStatus class.

    • -1
    • +4
    /sources/gui/qml/components/ImageLogoD.qml
    • -38
    • +35
    /sources/view/hd/alarm/VAlarmStatus.cpp
    • -20
    • +17
    /sources/view/hd/alarm/VAlarmStatus.h
DEN-5833: Implementation

- Added User Action message response model.

    • -0
    • +12
    /sources/canbus/MessageDispatcher.cpp
    • -0
    • +1
    /sources/canbus/MessageInterpreter.cpp
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.

    • -5
    • +11
    /sources/view/hd/alarm/VAlarmStatus.cpp
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

    • binary
    /resources/images/audio.png
    • binary
    /resources/images/chevron-down.png
    • binary
    /resources/images/chevron-up.png
    • binary
    /resources/images/mute.png
    • -1
    • +1
    /sources/canbus/MessageInterpreter.cpp
    • -1
    • +0
    /sources/gui/qml/components/ModalDialog.qml
    • -0
    • +60
    /sources/gui/qml/components/MuteButton.qml
    • -3
    • +8
    /sources/gui/qml/components/TimeText.qml
    • -0
    • +37
    /sources/gui/qml/components/UpDownButton.qml
    • -12
    • +55
    /sources/gui/qml/globals/Colors.qml
  1. … 7 more files in changeset.
DEN-5833: Implementation

- Updated the old Alarm model structure to used the notify in the Message Interpreter.

- Updated the Alarm Trigger,Clear,Status to inherit from MAbstract to be able to the above.

- Added a macro to make the request messages handling easier.

    • -172
    • +32
    /sources/canbus/MessageInterpreter.cpp
    • -8
    • +5
    /sources/model/hd/alarm/MAlarmCleared.cpp
    • -12
    • +14
    /sources/model/hd/alarm/MAlarmCleared.h
    • -88
    • +79
    /sources/model/hd/alarm/MAlarmStatusData.cpp
    • -24
    • +31
    /sources/model/hd/alarm/MAlarmStatusData.h
    • -8
    • +5
    /sources/model/hd/alarm/MAlarmTriggered.cpp
    • -12
    • +15
    /sources/model/hd/alarm/MAlarmTriggered.h
Merge branch 'DEN-5736_UI_Heparin_Bolus'

DEN-5744: Code Review 0

- A typo to change the #3 to #4