application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-14263: Change Request: Enable the Alarms Dialog Timeout timer during rinseback

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

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-14209-UI-BN-S82' into staging

DEN-14209 - UI: Dry self test modifications

- Updated the View and the qml code regarding the changes to the enum made in common HDDefs.h

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

    • -38
    • +46
    /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
    • +1
    /sources/canbus/MessageInterpreter.cpp
  1. … 32 more files in changeset.
Merge branch 'DEN-13966-UI-BN-S81' into staging

    • -12
    • +20
    /sources/ApplicationController.cpp
Merge branch 'DEN-13965-UI-BN-S81' into staging

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
UI-DEN-13965: UI-DEN-13965-3

- Handling the case a new alarm is received, while a confirm is requested, UI should send a cancel to HD and close the dialog and have user to re-issue the confirm if needed.

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