Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDT-5417 Disposable Tube Set Auto Priming Process - SW - 01- Pre-Tx - Prime - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

bug fix from merge clonflict

LDT-5417 Disposable Tube Set Auto Priming Process - SW - 01- Pre-Tx - Prime - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

push finishing steps to prime

    • -60
    • +27
    ./gui/qml/compounds/CheckListView.qml
LDT-5417 Disposable Tube Set Auto Priming Process - SW - 01- Pre-Tx - Prime - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

add prime data

  1. … 1 more file in changeset.
LDT-5417 Disposable Tube Set Auto Priming Process - SW - 01- Pre-Tx - Prime - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

added prime code

    • -0
    • +86
    ./model/td/data/pretreatment/MPreTreatmentDisposablesPrimeData.h
  1. … 7 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

Merge branch 'feature/LDT-5246-bicarb-Low' into staging

  1. … 2 more files in changeset.
Merge branch 'feature/LDT-5232-hdf' into staging

    • -1
    • +40
    ./gui/qml/pages/treatment/TreatmentStack.qml
  1. … 1 more file in changeset.
LDT-4772 NON-FEATURE: SW Misc & Enhc - SW - 01 - Isolated UF - R&I - 05: DEV - Feature Implementation

update common defs iso

LDT-4772 NON-FEATURE: SW Misc & Enhc - SW - 01 - Isolated UF - R&I - 05: DEV - Feature Implementation

address cr comemnts

LDT-4772 NON-FEATURE: SW Misc & Enhc - SW - 01 - Isolated UF - R&I - 05: DEV - Feature Implementation

address cr comments

Merge remote-tracking branch 'origin/staging' into feature/LDT-4767-enhancement-Isolated-UF

    • -0
    • +3
    ./gui/qml/pages/treatment/TreatmentStack.qml
  1. … 2 more files in changeset.
LDT-5235 HDF - SW - 01 - HDF - Messaging & Models - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

    • -2
    • +2
    ./gui/qml/pages/treatment/TreatmentHDF.qml
Bamboo Commit: Updated MAlarmMapping.cpp

    • -2
    • +102
    ./model/hd/alarm/MAlarmMapping.cpp
Merge remote-tracking branch 'origin/staging' into feature/LDT-5246-bicarb-Low

LDT-5249 System Interface for Users - SW - 01 - Bicarb/Acid Low Replacement - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

added treatment pause to dry demo menu

LDT-5235 HDF - SW - 01 - HDF - Messaging & Models - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

fix minor buigs

    • -2
    • +2
    ./gui/qml/pages/treatment/TreatmentHDF.qml
Merge remote-tracking branch 'origin/staging' into feature/LDT-5232-hdf

    • -0
    • +3
    ./gui/qml/pages/treatment/TreatmentStack.qml
LDT-5248 System Interface for Users - SW - 01 - Bicarb/Acid Low Replacement - R&I - 02: SDD - Design Diagram - plantuml & Review

LDT-4964 Service - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

address CR commetns

    • -1
    • +0
    ./gui/qml/dialogs/CalibrationDialog.qml
    • -1
    • +0
    ./view/settings/VCalibrationSettings.h
Merge remote-tracking branch 'origin/staging' into feature/LDT-4767-enhancement-Isolated-UF

LDT-5249 System Interface for Users - SW - 01 - Bicarb/Acid Low Replacement - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

update low priiority alarm color

LDT-5249 System Interface for Users - SW - 01 - Bicarb/Acid Low Replacement - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

fiunalize alarm dialog sizes

LDT-5249 System Interface for Users - SW - 01 - Bicarb/Acid Low Replacement - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

add headerbar butto nto open dialog and finished dialog

    • -0
    • +28
    ./gui/qml/components/DryBicartDisconnectButton.qml
    • -5
    • +3
    ./gui/qml/compounds/ProcessStatusView.qml
  1. … 1 more file in changeset.
LDT-5249 System Interface for Users - SW - 01 - Bicarb/Acid Low Replacement - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

added dialog and component for drain bicart items

    • -0
    • +33
    ./gui/qml/compounds/DryBicartDisconnect.qml
    • -2
    • +33
    ./gui/qml/compounds/ProcessStatusView.qml
    • -0
    • +40
    ./gui/qml/dialogs/DryBicartDisconnectDialog.qml
    • -0
    • +38
    ./gui/qml/dialogs/DryBicartDisconnectDialog.qml.autosave
  1. … 1 more file in changeset.
LDT-5249 System Interface for Users - SW - 01 - Bicarb/Acid Low Replacement - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

added syringe to td diagnostics

    • -1
    • +34
    ./gui/qml/dialogs/diagnostics/DiagnosticsTD.qml
    • -71
    • +0
    ./model/hd/data/MHDSyringePumpData.cpp
    • -113
    • +0
    ./model/hd/data/MHDSyringePumpData.h
    • -0
    • +68
    ./model/td/data/MTDSyringePumpData.cpp
    • -0
    • +110
    ./model/td/data/MTDSyringePumpData.h
    • -34
    • +0
    ./view/hd/data/VHDSyringePumpData.cpp
  1. … 4 more files in changeset.
LDT-5249 System Interface for Users - SW - 01 - Bicarb/Acid Low Replacement - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

added model and view classes

    • -0
    • +58
    ./model/td/data/treatment/MTreatmentDryBicartDisconnectData.cpp
    • -0
    • +70
    ./model/td/data/treatment/MTreatmentDryBicartDisconnectData.h
  1. … 4 more files in changeset.
LDT-5235 HDF - SW - 01 - HDF - Messaging & Models - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

LDT-5249 System Interface for Users - SW - 01 - Bicarb/Acid Low Replacement - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

Merge remote-tracking branch 'origin/staging' into feature/LDT-4919-SW-Integration-Rinseback

LDT-5249 System Interface for Users - SW - 01 - Bicarb/Acid Low Replacement - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

  1. … 1 more file in changeset.