leahi-application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDT-3398 HDF - SW - 01 - Main-Tx HDF Tab - R&I - 05: DEV - Feature Implementation

address cr comments

    • -11
    • +3
    /sources/gui/qml/components/HeaderBar.qml
    • -0
    • +31
    /sources/view/VListModel.cpp
    • -0
    • +59
    /sources/view/VListModel.h
Merge remote-tracking branch 'origin/staging' into feature/LDT-3393-hdf-main-tx-hdf-tab

Bamboo Commit: Updated MAlarmMapping.cpp

    • -3
    • +4
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'feature/LDT-3373-misc-sw-enhancements-bloodprime' into staging

LDT-3398 HDF - SW - 01 - Main-Tx HDF Tab - R&I - 05: DEV - Feature Implementation

address CR comments

    • -13
    • +22
    /sources/gui/qml/components/HeaderBar.qml
    • -16
    • +4
    /sources/gui/qml/components/MainMenu.qml
LDT-3376: Misc SW Enhancements - SW - 01 - BloodPrime-02 - R&I - 03: SDD - Design Diagram - plantuml

- Updated Blood Prime sequence diagram.

LDT-3378: Misc SW Enhancements - SW - 01 - BloodPrime-02 - R&I - 05: DEV - Feature Implementation

- Updated TreatmentBloodPrime.qml to remove debug output.

LDT-3378: Misc SW Enhancements - SW - 01 - BloodPrime-02 - R&I - 05: DEV - Feature Implementation

- Updated Blood Prime to add submode states for Run and Paused.

- Updated Blood Prime to add Timeout and Countdown to progress.

- Updated Blood Prime commands: removed Increase and Decrease, added Resume.

LDT-3398 HDF - SW - 01 - Main-Tx HDF Tab - R&I - 05: DEV - Feature Implementation

added treatmetn mode p[opup[ and finsihed laying oout HDF tab with NO Graph

LDT-3398 HDF - SW - 01 - Main-Tx HDF Tab - R&I - 05: DEV - Feature Implementation

add HDF tab code with graph removed - wip

    • -2
    • +3
    /sources/gui/qml/components/HeaderBar.qml
    • -5
    • +8
    /sources/gui/qml/components/MainMenu.qml
    • -0
    • +2
    /sources/gui/qml/globals/Variables.qml
    • -0
    • +80
    /sources/gui/qml/pages/treatment/TreatmentHDF.qml
Merge branch 'feature/LDT-3307-misc-sw-enhancements' into staging

LDT-3312 Misc SW Enhancements - SW - 01 - General Aesthetics - R&I - 05: DEV - Feature Implementation

PUSH qml error fixes

    • -1
    • +0
    /sources/gui/qml/components/ProgressBarEx.qml
    • -1
    • +1
    /sources/gui/qml/components/RangedValue.qml
Merge branch 'feature/LDT-3307-misc-sw-enhancements' into staging

Merge branch 'staging' into feature/LDT-3307-misc-sw-enhancements

    • -6
    • +10
    /sources/gui/qml/components/HeaderBar.qml
Merge branch 'feature/LDT-3323-enhancements-rinseback-bloodflow' into staging

Merge branch 'staging' into feature/LDT-3307-misc-sw-enhancements

    • -4
    • +4
    /sources/gui/qml/components/HeaderBar.qml
    • -1
    • +1
    /sources/gui/qml/components/RangeMarker.qml
    • -0
    • +5
    /sources/view/td/data/VTreatmentRanges.cpp
    • -0
    • +3
    /sources/view/td/data/VTreatmentRanges.h
Merge branch 'staging' of bitbucket.org:diality-cloud/leahi-application into feature/LDT-3323-enhancements-rinseback-bloodflow

    • -5
    • +5
    /sources/gui/qml/components/HeaderBar.qml
Merge branch 'staging' of bitbucket.org:diality-cloud/leahi-application into feature/LDT-3323-enhancements-rinseback-bloodflow

    • -0
    • +39
    /sources/canbus/MessageDispatcher.cpp
    • -50
    • +9
    /sources/canbus/MessageInterpreter.cpp
Merge branch 'feature/LDT-3174-pre-treatment-foundations' into staging

Merge remote-tracking branch 'origin/staging' into feature/LDT-3174-pre-treatment-foundations

    • -2
    • +2
    /sources/gui/qml/globals/Variables.qml
LDT-3312 Misc SW Enhancements - SW - 01 - General Aesthetics - R&I - 05: DEV - Feature Implementation

address CR comments

    • -1
    • +10
    /sources/gui/qml/components/HeaderBar.qml
    • -27
    • +2
    /sources/gui/qml/components/MainMenu.qml
    • -31
    • +24
    /sources/gui/qml/components/SDCInfo.qml
    • -14
    • +1
    /sources/gui/qml/compounds/SettingsSlider.qml
Merge branch 'feature/LDT-3194-isolated-uf-adjustment' into staging

Merge branch 'staging' of bitbucket.org:diality-cloud/leahi-application into feature/LDT-3194-isolated-uf-adjustment

Merge branch 'feature/LDT-3106-blood-prime' into staging

LDT-3328: Misc SW Enhancements - SW - 01 - BloodPrime-Rinseback - R&I - 05: DEV - Feature Implementation

- Updated EndTreatmentRinseback.qml to add comment.

LDT-3312 Misc SW Enhancements - SW - 01 - General Aesthetics - R&I - 05: DEV - Feature Implementation

adjust fonts of diagnosis popuip

LDT-3197: Isolated UF - SW - 01 - R&I - 03: SDD - Design Diagram - plantuml

- Updated Isolated UF sequence diagram to fix MSG and specify which screen rejection reason is being displayed on.

    • binary
    /SDDs/TreatmentAdjustmentIsolatedUF.png
    • -5
    • +5
    /SDDs/TreatmentAdjustmentIsolatedUF.puml
LDT-3199: Isolated UF - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated MessageInterpreter.h/cpp to remove adjustUltrafiltrationEdit and adjustUltrafiltrationConfirm and change to use notify.

    • -50
    • +2
    /sources/canbus/MessageInterpreter.cpp
LDT-3199: Isolated UF - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated LabelUnitText.qml to remove declared enum and instead use Text.Align enum.

    • -15
    • +10
    /sources/gui/qml/compounds/LabelUnitText.qml
LDT-3199: Isolated UF - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated TreatmentAdjustmentUltrafiltrationStack.qml to remove commented out code.