leahi-application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/staging' into feature/LDT-3574-misc-sw-enhancements

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

update status colors

    • -10
    • +20
    /sources/gui/qml/components/HeaderBar.qml
    • -14
    • +4
    /sources/gui/qml/components/MainMenu.qml
    • -17
    • +3
    /sources/gui/qml/compounds/NumPad.qml
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-3579 Misc SW Enhancements - SW - 01 - General Aesthetics - 02-S24 - R&I - 05: DEV - Feature Implementation

add some of the enhancements

    • -5
    • +5
    /sources/gui/qml/components/ArrowButton.qml
    • -0
    • +8
    /sources/gui/qml/compounds/BPHREntry.qml
    • -4
    • +18
    /sources/gui/qml/compounds/NumPad.qml
LEAHI-APPLICATION-LDT-3574_Misc SW Enhancements - SW - 01 - General Aesthetics - 02-S24 - R&I
LEAHI-APPLICATION-LDT-3574_Misc SW Enhancements - SW - 01 - General Aesthetics - 02-S24 - R&I
add element for status color

add element for status color

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.

LEAHI-APPLICATION-LDT-3373_Misc SW Enhancements - SW - 01 - BloodPrime-02 - R&I
LEAHI-APPLICATION-LDT-3373_Misc SW Enhancements - SW - 01 - BloodPrime-02 - R&I
LEAHI-APPLICATION-LDT-3413_HDF - SW - 01 - Main-Tx HDF Tab - Graph - R&I
LEAHI-APPLICATION-LDT-3413_HDF - SW - 01 - Main-Tx HDF Tab - Graph - R&I
LEAHI-APPLICATION-LDT-3433_Water, Dialysate, and Blood Sampling - SW - 01 - Water sample & Dialysate Checks - R&I
LEAHI-APPLICATION-LDT-3433_Water, Dialysate, and Blood Sampling - SW - 01 - Water sample & Dialysate Checks - R&I
LEAHI-APPLICATION-LDT-3393_HDF - SW - 01 - Main-Tx HDF Tab - R&I
LEAHI-APPLICATION-LDT-3393_HDF - SW - 01 - Main-Tx HDF Tab - R&I
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