application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Code Review Comment: UI-DEN-13966-5#c14439

http://dvm-linux02:8060/cru/UI-DEN-13966-5#c14439

UI-DEN-13966

UI-DEN-13966-5

UI-DEN-13966_UI BN S81

DEN-13966 Improvement: Export individual log files

- Added the export progress for each exporting file.

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-13966 Improvement: Export individual log files

- Used the stashed file copy by by chunk algorithm which I wrote before for exporting the log files.

- It will help later to have more control over copying files.

- Added all the signal/slots for Logger, ApplicationController, GuiController, GuiView and the QML side.

- Implemented the Export Selection Map on the C++ side to be used for individual log file selection (insert, delete, select, remove/Clear).

- Added percent update for the current exporting file. (not implemented on UI, due to some issues)

    • -122
    • +0
    /sources/_wip_/fileCopy/main.cpp
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
  1. … 4 more files in changeset.
DEN-13966: Improvement: Export individual log files

Simplified the log:

- Removed completely the Data type and defined only one type of AppED (AKA APPED, Application, log).

- therefore there is no E, or D, in the log anymore.

- added a log header for the debug type as well.

- added cppcheck to normal build process on each local build for debug and release.

    • -1
    • +1
    /sources/bluetooth/BluetoothInterface.cpp
    • -27
    • +10
    /sources/canbus/MessageInterpreter.cpp
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
  1. … 9 more files in changeset.
DEN-13966: Improvement: Export individual log files

DEN-14044: IMP:

- Adding the type GuiStringIndexMap=QMap<quint32, QString> to the signal/slot system.

    • -12
    • +12
    /sources/ApplicationController.cpp
DEN-13966: Improvement: Export individual log files

DEN-14044 - implemented the UI part and the C++ backend list property.

    • -0
    • +1
    /sources/gui/qml/components/ProgressBar.qml
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-13965: UI/HD Generic User Confirmation [Integration Testing]

- Fixing the issue UI was not able to send the message to the HD.

DEN-13965: UI/HD Generic User Confirmation [Message Mapping]]

- having issue changing the caption by isRejected, disabled for now.

DEN-13965: UI/HD Generic User Confirmation [Message Mapping]]

- Did some fixes for the auto close when rejected or when power-off.

- Some fixes to display and differ from confirm and power-off

    • -2
    • +2
    /sources/gui/qml/components/Footer.qml
    • -8
    • +22
    /sources/gui/qml/dialogs/PowerOff.qml
    • -48
    • +90
    /sources/view/confirm/VConfirm.cpp
DEN-13965: UI/HD Generic User Confirmation [Message Mapping]]

- Fixed the save issue.

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-13965: UI/HD Generic User Confirmation [Message Mapping]]

- Fixed the issue with the kyeValue of different categories overwriting by adding the category as the top level.

- I still have issue in saving for the settings, which writes duplicate.

    • -3
    • +6
    /sources/canbus/MessageInterpreter.cpp
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -54
    • +37
    /sources/model/settings/MSettings.cpp
    • -17
    • +36
    /sources/model/settings/MSettings.h
    • -29
    • +25
    /sources/view/hd/alarm/VAlarmStatus.cpp
DEN-13965: UI/HD Generic User Confirmation [Message Mapping]]

- Code preparation for the implementation.

    • -7
    • +7
    /sources/view/hd/alarm/VAlarmStatus.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
    • +1
    /sources/gui/qml/components/Footer.qml
    • -1
    • +1
    /sources/gui/qml/components/TouchRect.qml
    • -1
    • +1
    /sources/gui/qml/globals/Variables.qml
  1. … 14 more files in changeset.
Merge branch 'DEN-13965-UI-BN-S80' into staging

    • -0
    • +14
    /sources/canbus/MessageDispatcher.cpp
    • -1
    • +4
    /sources/canbus/MessageInterpreter.cpp
    • -4
    • +23
    /sources/gui/qml/globals/Variables.qml
    • -0
    • +1
    /sources/view/hd/alarm/VAlarmStatus.cpp
DEN-13939: IMP: Fixed the merge issue

- Not sure why git didn't get the changes on the ModalDialog's Norification changes to NotificationSmall, and caused the issue on the property IconVisible.

    • -1
    • +1
    /sources/gui/qml/components/ModalDialog.qml
    • -3
    • +1
    /sources/gui/qml/pages/TreatmentFlowBase.qml
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.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

    • -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.
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

    • -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

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
DEN-13844: DEN-13774: VITALS numpad appears during rinseback if BP interval is on

- It was only working on the HDOpMode to be in-treatment, but needed to get the HDTreatmentState as well to make sure it is in Dialysis state too.

    • -14
    • +0
    /sources/gui/qml/pages/MainStack.qml
    • -29
    • +29
    /sources/gui/qml/pages/treatment/TreatmentStack.qml
    • -4
    • +7
    /sources/model/hd/alarm/MAlarmMapping.cpp