leahi-application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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

moved

moved

moved changing logic to main.qml

moved changing logic to main.qml

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
updated

updated

added

added

added to diagnostics

added to diagnostics

added

added

added

added

added

added

updated

updated

separatated

separatated

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
Separate models in separate classes headerbar and water sample

Separate models in separate classes headerbar and water sample

lowercase ALL property names

lowercase ALL property names

add to Colors

add to Colors

add to Colors

add to Colors

add to Colors

add to Colors

add DD opmode to diagnostics

add DD opmode to diagnostics

made 2 sets of colors for dark and light.. handle changing colors on the outside of this global

made 2 sets of colors for dark and light.. handle changing colors on the outside of this global

move to system.config

move to system.config

Add RO loop updates!

Add RO loop updates!

check and make same as req/rsp

check and make same as req/rsp

Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
added in another branch

added in another branch