application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Spelling correction

Small correction, had unsaved changes on ApplicationController.h

Added request for versions when UI POST is done if POST was successful

Merge branch 'staging' of ssh://dvm-linux02:7999/ui/application into DEN-13053-S82-JI

Updating branch to be up to date with staging

Bamboo Commit: Updated MAlarmMapping.cpp

    • -2
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-14294 UPG: New VM and tools for the new Qt 5.15.10 [C++ run-time issues]

    • -2
    • +2
    /sources/canbus/MessageInterpreter.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-14294 UPG: New VM and tools for the new Qt 5.15.10 [C++ compile time issues]

- Fixed the C++ compile time issues.

- There are still some runtime issues reported by Qt

- There are lots of QML issues reported in run-time.

    • -1
    • +1
    /sources/bluetooth/BluetoothInterface.cpp
    • -1
    • +1
    /sources/canbus/MessageInterpreter.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

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

    • -1
    • +1
    /sources/gui/qml/components/RangeSlider.qml
    • -1
    • +1
    /sources/gui/qml/components/Slider.qml
    • -1
    • +1
    /sources/gui/qml/globals/Variables.qml
  1. … 20 more files in changeset.
Merge branch 'DEN-14263-UI-BN-S83' into staging

Merge branch 'DEN-14147-UI-BN-S82' into staging

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -15
    • +108
    /sources/view/settings/VSettings.cpp
Merge branch 'DEN-13962-UI-BN-S82' into staging

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -310
    • +74
    /sources/view/VTreatmentCreate.cpp
Merge branch 'DEN-13962-UI-BN-S82' into develop

Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-13962-UI-BN-S82' into develop

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
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
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-14263-UI-BN-S83' into develop

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

    • -2
    • +7
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-13226_UI_Unit_Testing' of ssh://dvm-linux02:7999/ui/application into DEN-13226_UI_Unit_Testing

Fix imports for unit tests

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

    • -28
    • +40
    /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
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-14147-UI-BN-S82' into develop

DEN-14147: Add Required Heparin Volume for Treatment to Syringe Installation Screen

- Fixed isDevice in the export log.

Merge branch 'DEN-14147-UI-BN-S82' into develop

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -15
    • +108
    /sources/view/settings/VSettings.cpp
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
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -40
    • +64
    /sources/view/settings/VSettings.cpp
    • -14
    • +26
    /sources/view/settings/VSettings.h