Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge staging with branch

  1. … 2 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 30 more files in changeset.
Merge branch 'DEN-14147-UI-BN-S82' into staging

  1. … 4 more files in changeset.
Merge branch 'DEN-13962-UI-BN-S82' into staging

  1. … 7 more files in changeset.
DEN-14239: Pressure monitor screen not displayed

- During the system tests, it has been observed the main treatment in-line blood pressure is not correctly setting the lower/higher bounds of the monitoring component.

  1. … 2 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

DEN-14263: Change Request: Enable the Alarms Dialog Timeout timer during rinseback

  1. … 5 more files in changeset.
Fix imports for unit tests

  1. … 3 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

  1. … 3 more files in changeset.
DEN-14147: Add Required Heparin Volume for Treatment to Syringe Installation Screen

- Implemented the instruction update.

- Improved the algorithm

- Improved the RegEx to accept spaces or empty section.

- Added and Extra string section and precision for float values.

  1. … 3 more files in changeset.
DEN-14147: Add Required Heparin Volume for Treatment to Syringe Installation Screen

- The replacement finder is implemented

- The instruction updater is changed to meed the needs of the replacement finder.

- Next needs to update the instructions regarding the received message.

  1. … 8 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 3 more files in changeset.
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

  1. … 5 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 43 more files in changeset.
DEN-13962: UI: Update pressure limits to match treatment params and UI screen

- removed the QML duplicate definitions of arterial/venous

- added monitoring values and used them in monitoring components of arterial/venous.

  1. … 16 more files in changeset.
DEN-13962: UI: Update pressure limits to match treatment params and UI screen

- Completely restructure the vTreatmentCreate class and removed all the constant ranges properties from that to the VTreatmentRanges.

- Now reading all the constant ranges values from the DataList.conf from the ui.config repository.

- Used the RANGESET property type for the ranges in the VTreatmentRanges class to have by default properties for min,max, res(olution),def(ault) properties.

- Added an ability to slider to hide the handler when needed (Pre-Treatment)

- Hide the Slider handler when slider switch is off

- Added various PROPERTYs, like IDBASED, RAGESET, VALUESET

- Modified the MPreTreatmentAdjustRequest, duration parameter to treatmentDuration for clarifying.

- Modified the Settings class to able to parse a comment on the Group line.

- Updated the ConfirmTreatmentTable to hold the required labels and added translate function for them. removed the call for get names for performance, since those never change.

- Made the SettingsData connection, standard in the VSettings class.

  1. … 16 more files in changeset.
DEN-13966 Improvement: Export individual log files

- Added the export progress for each exporting file.

  1. … 4 more files in changeset.
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)

  1. … 18 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. … 23 more files in changeset.
DEN-13966: Improvement: Export individual log files

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

  1. … 4 more files in changeset.
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. … 6 more files in changeset.
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]]

- Fixed the save issue.

  1. … 2 more files in changeset.
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.

  1. … 9 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 24 more files in changeset.
Merge branch 'DEN-13965-UI-BN-S80' into staging

  1. … 12 more files in changeset.