application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-13962-UI-BN-S82' into develop

    • -310
    • +74
    /sources/view/VTreatmentCreate.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +5
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-13962: UI: Update pressure limits to match treatment params and UI screen

- Fixed the issue with the sliders not updating the ranges and the pressure adjustment was not able to be adjusted.

    • -27
    • +4
    /sources/gui/qml/components/RangeSlider.qml
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

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-14209-UI-BN-S82' into develop

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

    • -1
    • +1
    /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

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.

    • -29
    • +0
    /sources/gui/qml/globals/Variables.qml
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
  1. … 3 more files in changeset.
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
Bamboo Commit: Updated MAlarmMapping.cpp

    • -2
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
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.

    • -0
    • +1
    /sources/gui/qml/components/Slider.qml
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -310
    • +74
    /sources/view/VTreatmentCreate.cpp
    • -163
    • +30
    /sources/view/VTreatmentCreate.h
  1. … 3 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

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

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

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-13966-UI-BN-S81' into develop

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

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

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp