leahi-application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'feature/LDT-4451-edit-tx-parameters' into staging

LDT-4456 Edit Treatment Parameters During Treatment - SW - 01 - Integration - R&I - 05: DEV - Feature Implementation

fix build issue common enum

    • -26
    • +85
    /etc/reports/alarms/AlarmMapping.csv
    • -27
    • +90
    /etc/reports/alarms/AlarmMapping.py
    • -16
    • +7
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'feature/LDT-4451-edit-tx-parameters' into staging

Bamboo Commit: Updated MAlarmMapping.cpp

    • -16
    • +7
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge remote-tracking branch 'origin/staging' into feature/LDT-4451-edit-tx-parameters

    • -26
    • +2
    /sources/canbus/MessageDispatcher.cpp
Merge branch 'feature/LDT-4213-create-rx-final-flag' into staging

LDT-4456 Edit Treatment Parameters During Treatment - SW - 01 - Integration - R&I - 05: DEV - Feature Implementation

fix defualt values for adjustment

LDT-4216 NON-FEATURE: SW Misc & Enhc - SW - 01 - Create Rx - Final Flag Prm - R&I - 03: SDD - Design Diagram - plantuml

fix post merge errors

Merge branch 'staging' into feature/LDT-4213-create-rx-final-flag

    • -13
    • +1
    /sources/canbus/MessageDispatcher.cpp
    • -19
    • +35
    /sources/canbus/MessageInterpreter.cpp
    • -5
    • +4
    /sources/gui/qml/components/HeaderBar.qml
    • -0
    • +1
    /sources/gui/qml/pages/TreatmentFlowBase.qml
Merge branch 'feature/LDT-4193-enhancement-water-sample' into staging

Merge remote-tracking branch 'origin/staging' into feature/LDT-4193-enhancement-water-sample

    • -1
    • +1
    /sources/canbus/MessageInterpreter.cpp
    • -1
    • +2
    /sources/gui/qml/globals/Variables.qml
Merge branch 'feature/LDT-4161-tx-review' into staging

LDT-4456 Edit Treatment Parameters During Treatment - SW - 01 - Integration - R&I - 05: DEV - Feature Implementation

update venous window ranges

LDT-4456 Edit Treatment Parameters During Treatment - SW - 01 - Integration - R&I - 05: DEV - Feature Implementation

update pressure payload

LDT-4196 NON-FEATURE: SW Misc & Enhc - SW - 01 - Water/Dialysate Sample - R&I - 03: SDD - Design Diagram - plantuml

address cr changes

    • -3
    • +5
    /sources/canbus/MessageInterpreter.cpp
LDT-4456 Edit Treatment Parameters During Treatment - SW - 01 - Integration - R&I - 05: DEV - Feature Implementation

fix common

LDT-4456 Edit Treatment Parameters During Treatment - SW - 01 - Integration - R&I - 05: DEV - Feature Implementation

fix italicising directly in string

LDT-4456 Edit Treatment Parameters During Treatment - SW - 01 - Integration - R&I - 05: DEV - Feature Implementation

updated duration adjustment

LDT-4456 Edit Treatment Parameters During Treatment - SW - 01 - Integration - R&I - 05: DEV - Feature Implementation

update set points adjustment

LDT-4456 Edit Treatment Parameters During Treatment - SW - 01 - Integration - R&I - 05: DEV - Feature Implementation

update pressures adjustment

LDT-4456 Edit Treatment Parameters During Treatment - SW - 01 - Integration - R&I - 05: DEV - Feature Implementation

Update UF Adjustment

LDT-4216 NON-FEATURE: SW Misc & Enhc - SW - 01 - Create Rx - Final Flag Prm - R&I - 03: SDD - Design Diagram - plantuml

address cr comments

Merge remote-tracking branch 'origin/staging' into feature/LDT-4213-create-rx-final-flag

LDT-4196 NON-FEATURE: SW Misc & Enhc - SW - 01 - Water/Dialysate Sample - R&I - 03: SDD - Design Diagram - plantuml

push .pro file

LDT-4196 NON-FEATURE: SW Misc & Enhc - SW - 01 - Water/Dialysate Sample - R&I - 03: SDD - Design Diagram - plantuml

addres cr comments move darkmode to vsettings

    • -24
    • +24
    /sources/gui/qml/dialogs/AlarmDialog.qml
    • -10
    • +10
    /sources/gui/qml/dialogs/AlarmListDialog.qml
    • -15
    • +6
    /sources/gui/qml/globals/Colors.qml
    • -0
    • +15
    /sources/view/settings/VSettings.cpp
LDT-4196 NON-FEATURE: SW Misc & Enhc - SW - 01 - Water/Dialysate Sample - R&I - 03: SDD - Design Diagram - plantuml

address cr comments

    • -6
    • +17
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +49
    /sources/model/dd/data/MDDOperationModeData.cpp
    • -0
    • +82
    /sources/model/dd/data/MDDOperationModeData.h
    • -49
    • +0
    /sources/model/dg/data/MDGOperationModeData.cpp
  1. … 12 more files in changeset.
LDT-4196 NON-FEATURE: SW Misc & Enhc - SW - 01 - Water/Dialysate Sample - R&I - 03: SDD - Design Diagram - plantuml

address comments

    • -4
    • +4
    /sources/gui/qml/components/HeaderBar.qml
    • -4
    • +0
    /sources/gui/qml/components/ProgressBar.qml
    • -3
    • +3
    /sources/gui/qml/components/RangeSlider.qml
    • -4
    • +4
    /sources/gui/qml/components/RangedValue.qml
    • -2
    • +1
    /sources/gui/qml/components/ScrollBar.qml
    • -2
    • +4
    /sources/gui/qml/dialogs/AlarmDialog.qml
  1. … 14 more files in changeset.
Merge remote-tracking branch 'origin/staging' into feature/LDT-4193-enhancement-water-sample

    • -11
    • +11
    /sources/gui/qml/dialogs/AlarmDialog.qml
    • -0
    • +1
    /sources/gui/qml/dialogs/AlarmListDialog.qml
Merge remote-tracking branch 'origin/staging' into feature/LDT-4161-tx-review

fix merge issues

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

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