Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/staging' into feature/LDT-3433-water-dialysate-and-blood-sample

    • -13
    • +15
    ./gui/qml/components/HeaderBar.qml
  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/staging' into feature/LDT-3516-sw-integration-101

  1. … 1 more file in changeset.
LDT-3418 HDF - SW - 01 - Main-Tx HDF Tab - Graph - R&I - 05: DEV - Feature Implementation

updated hdf screen to latest changes

    • -3
    • +3
    ./gui/qml/pages/treatment/TreatmentHDF.qml
    • -3
    • +3
    ./gui/qml/pages/treatment/TreatmentStack.qml
  1. … 1 more file in changeset.
LDT-3418 HDF - SW - 01 - Main-Tx HDF Tab - Graph - R&I - 05: DEV - Feature Implementation

address cr comments

    • -1
    • +1
    ./gui/qml/pages/treatment/TreatmentHDF.qml
Merge remote-tracking branch 'origin/staging' into feature/LDT-3413-hdf-main-tx-hdf-graph

    • -5
    • +16
    ./gui/qml/pages/treatment/TreatmentStack.qml
LDT-3579 Misc SW Enhancements - SW - 01 - General Aesthetics - 02-S24 - R&I - 05: DEV - Feature Implementation

    • -32
    • +12
    ./gui/qml/pages/treatment/TreatmentHome.qml
LDT-3521 Misc SW Enhancements - SW - 01 - SW Integration 101 - R&I - 05: DEV - Feature Implementation

address cr comments

    • -24
    • +4
    ./gui/qml/pages/treatment/TreatmentHome.qml
LDT-3521 Misc SW Enhancements - SW - 01 - SW Integration 101 - R&I - 05: DEV - Feature Implementation

add message comment

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

add missing omment

LDT-3438 Water, Dialysate, and Blood Sampling - SW - 01 - Water sample & Dialysate Checks - R&I - 05: DEV - Feature Implementation

CR comments

    • -6
    • +35
    ./view/td/data/VTreatmentRanges.cpp
LDT-3438 Water, Dialysate, and Blood Sampling - SW - 01 - Water sample & Dialysate Checks - R&I - 05: DEV - Feature Implementation

adderss CR comments

LDT-3521 Misc SW Enhancements - SW - 01 - SW Integration 101 - R&I - 05: DEV - Feature Implementation

add messaging for pressures widening

    • -0
    • +14
    ./gui/qml/pages/treatment/TreatmentHome.qml
    • -3
    • +3
    ./view/dd/data/VDDValvesStatesData.cpp
  1. … 3 more files in changeset.
LDT-3398 HDF - SW - 01 - Main-Tx HDF Tab - R&I - 05: DEV - Feature Implementation

address cr comments

    • -1
    • +1
    ./gui/qml/pages/treatment/TreatmentHDF.qml
    • -1
    • +1
    ./gui/qml/pages/treatment/TreatmentHeparin.qml
    • -0
    • +31
    ./view/VListModel.cpp
  1. … 1 more file in changeset.
LDT-3438 Water, Dialysate, and Blood Sampling - SW - 01 - Water sample & Dialysate Checks - R&I - 05: DEV - Feature Implementation

address cr comments

    • -14
    • +13
    ./gui/qml/dialogs/watersample/WaterSamplePage.qml
    • -3
    • +3
    ./view/dd/data/VDDValvesStatesData.cpp
  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/staging' into feature/LDT-3393-hdf-main-tx-hdf-tab

    • -5
    • +16
    ./gui/qml/pages/treatment/TreatmentStack.qml
LDT-3579 Misc SW Enhancements - SW - 01 - General Aesthetics - 02-S24 - R&I - 05: DEV - Feature Implementation

finished remianing enhancements

    • -2
    • +13
    ./gui/qml/dialogs/EndTreatmentDialog.qml
LDT-3579 Misc SW Enhancements - SW - 01 - General Aesthetics - 02-S24 - R&I - 05: DEV - Feature Implementation

updated duration adjustment to latest design

Merge remote-tracking branch 'origin/staging' into feature/LDT-3574-misc-sw-enhancements

    • -5
    • +16
    ./gui/qml/pages/treatment/TreatmentStack.qml
LDT-3579 Misc SW Enhancements - SW - 01 - General Aesthetics - 02-S24 - R&I - 05: DEV - Feature Implementation

update status colors

    • -10
    • +20
    ./gui/qml/components/HeaderBar.qml
    • -10
    • +20
    ./gui/qml/pages/treatment/TreatmentHeparin.qml
    • -9
    • +5
    ./gui/qml/pages/treatment/TreatmentStack.qml
Merge branch 'staging' of bitbucket.org:diality-cloud/leahi-application into feature/LDT-2707-trends

    • -5
    • +16
    ./gui/qml/pages/treatment/TreatmentStack.qml
Bamboo Commit: Updated MAlarmMapping.cpp

LDT-2712: Trends and Screensaver Screens - SW - 01 - Trends Screen - R&I - 05: DEV - Feature Implementation

- Updated VDDValvesStatesData.cpp for changes to enums in common.

    • -3
    • +3
    ./view/dd/data/VDDValvesStatesData.cpp
LDT-3579 Misc SW Enhancements - SW - 01 - General Aesthetics - 02-S24 - R&I - 05: DEV - Feature Implementation

add some of the enhancements

    • -0
    • +14
    ./gui/qml/pages/treatment/TreatmentHome.qml
    • -3
    • +3
    ./view/dd/data/VDDValvesStatesData.cpp
  1. … 1 more file in changeset.
LDT-3438 Water, Dialysate, and Blood Sampling - SW - 01 - Water sample & Dialysate Checks - R&I - 05: DEV - Feature Implementation

update msg id

  1. … 1 more file in changeset.
LDT-3418 HDF - SW - 01 - Main-Tx HDF Tab - Graph - R&I - 05: DEV - Feature Implementation

address cr comments

    • -13
    • +22
    ./gui/qml/components/HeaderBar.qml
    • -4
    • +2
    ./gui/qml/pages/treatment/TreatmentHDF.qml
    • -1
    • +1
    ./gui/qml/pages/treatment/TreatmentHeparin.qml
    • -5
    • +5
    ./gui/qml/pages/treatment/TreatmentStack.qml
LDT-3398 HDF - SW - 01 - Main-Tx HDF Tab - R&I - 05: DEV - Feature Implementation

address CR comments

    • -13
    • +22
    ./gui/qml/components/HeaderBar.qml
    • -3
    • +2
    ./gui/qml/pages/treatment/TreatmentHDF.qml
    • -1
    • +1
    ./gui/qml/pages/treatment/TreatmentHeparin.qml
    • -5
    • +5
    ./gui/qml/pages/treatment/TreatmentStack.qml
    • -3
    • +3
    ./view/dd/data/VDDValvesStatesData.cpp
LDT-3418 HDF - SW - 01 - Main-Tx HDF Tab - Graph - R&I - 05: DEV - Feature Implementation

remove commented out lines and use method

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

optomize way to remove old points from lineseries containrers

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

Update for Beta 2.0 common code

    • -3
    • +3
    ./view/dd/data/VDDValvesStatesData.cpp
LDT-3418 HDF - SW - 01 - Main-Tx HDF Tab - Graph - R&I - 05: DEV - Feature Implementation

update graph to move vertical line to newest point when plotted