Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDT-1746 (UI) Main Tx Screen - Conductivity Display Resolution Incorrect - R&I - 05: DEV - Feature Implementation

Address CR comment and use variables for precision

LDT-1746 (UI) Main Tx Screen - Conductivity Display Resolution Incorrect - R&I - 05: DEV - Feature Implementation

Update precision of dialysate conductivity from 2 decimals to 1

Merge branch 'feature/LDT-1209-main-treatment-screen' into staging

  1. … 1 more file in changeset.
Merge branch 'LDT-907-Main-Treatment-Screen-SW-Diagnostics-Screen-DD' into staging

    • -1
    • +3
    ./gui/qml/components/DebugDataColumn.qml
    • -0
    • +280
    ./gui/qml/dialogs/diagnostics/DiagnosticsTD.qml
  1. … 2 more files in changeset.
LDT-912: Main Treatment Screen - SW - Diagnostics Screen-DD - 05: DEV - Feature Implementation

- Address Diagnostic QML object names

- Remove all unimplemented DD instances, leaving only DDlevel message

- MModel alignment

    • -1
    • +1
    ./gui/qml/dialogs/diagnostics/DiagnosticsSwipe.qml
LDT-912: Main Treatment Screen - SW - Diagnostics Screen-DD - 05: DEV - Feature Implementation

- Add DD level sensor message

- Add diagnostics QML patch

- Add DD diagnostics base implementation

    • -1
    • +3
    ./gui/qml/components/DebugDataColumn.qml
    • -31
    • +18
    ./gui/qml/dialogs/diagnostics/DiagnosticsDD.qml
    • -1
    • +1
    ./gui/qml/dialogs/diagnostics/DiagnosticsSwipe.qml
    • -0
    • +47
    ./model/dg/data/MDDLevelData.cpp
    • -0
    • +84
    ./model/dg/data/MDDLevelData.h
    • -0
    • +26
    ./view/dg/data/VDDLevelData.cpp
    • -0
    • +44
    ./view/dg/data/VDDLevelData.h
  1. … 1 more file in changeset.
LDT-1209 Main Treatment Screen - SW - 01 - Screen Integration (MSG,QML) - R&I - 05: DEV - Feature Implementation

Fix initial boolean setting for running the opacity animation for the ProgressCircle.qml

    • -2
    • +3
    ./gui/qml/components/ProgressCircle.qml
LDT-1209 Main Treatment Screen - SW - 01 - Screen Integration (MSG,QML) - R&I - 05: DEV - Feature Implementation

add in treatment time "treatment complete" text to timer and address CR comments

    • -0
    • +52
    ./model/td/data/treatment/MTreatmentParametersSetPointData.cpp
    • -0
    • +86
    ./model/td/data/treatment/MTreatmentParametersSetPointData.h
  1. … 7 more files in changeset.
LDT-1209 Main Treatment Screen - SW - 01 - Screen Integration (MSG,QML) - R&I - 05: DEV - Feature Implementation

fix upper and lower bound range bugs for pressures component

LDT-1209 Main Treatment Screen - SW - 01 - Screen Integration (MSG,QML) - R&I - 05: DEV - Feature Implementation

fix lower bound bug where progress would go out of scope

LDT-1209 Main Treatment Screen - SW - 01 - Screen Integration (MSG,QML) - R&I - 05: DEV - Feature Implementation

added fixed decimal to UF progress bar value

LDT-1209 Main Treatment Screen - SW - 01 - Screen Integration (MSG,QML) - R&I - 05: DEV - Feature Implementation

address cr comments

LDT-1209 Main Treatment Screen - SW - 01 - Screen Integration (MSG,QML) - R&I - 05: DEV - Feature Implementation

remove states

    • -1
    • +0
    ./gui/qml/pages/treatment/TreatmentStack.qml
LDT-1209 Main Treatment Screen - SW - 01 - Screen Integration (MSG,QML) - R&I - 05: DEV - Feature Implementation

address pr comments

LDT-1209 Main Treatment Screen - SW - 01 - Screen Integration (MSG,QML) - R&I - 05: DEV - Feature Implementation

address CR comments

Main Treatment Screen - SW - 01 - Screen Integration (MSG,QML) - R&I - 05: DEV - Feature Implementation

add missing colors

Main Treatment Screen - SW - 01 - Screen Integration (MSG,QML) - R&I - 05: DEV - Feature Implementation

add integration code

    • -0
    • +3
    ./gui/qml/pages/treatment/TreatmentStack.qml
Merge branch 'feature/LDT-853-main-treatment-screen' into staging

    • -0
    • +40
    ./gui/qml/components/ArrowButton.qml
    • -0
    • +22
    ./gui/qml/components/ContentArea.qml
    • -0
    • +39
    ./gui/qml/components/IconButton.qml
    • -0
    • +76
    ./gui/qml/components/LabelValue.qml
    • -3
    • +3
    ./gui/qml/components/ProgressBarEx.qml
    • -3
    • +8
    ./gui/qml/components/ProgressCircle.qml
    • -5
    • +13
    ./gui/qml/components/RangeMarker.qml
    • -30
    • +31
    ./gui/qml/components/TimeText.qml
  1. … 166 more files in changeset.
LDT-858 Main Treatment Screen - SW - Components & Screens - 05: DEV - Feature Implementation

Update icon button to remove alias

LDT-858 Main Treatment Screen - SW - Components & Screens - 05: DEV - Feature Implementation

revert touchRect properties not being used

LDT-858 Main Treatment Screen - SW - Components & Screens - 05: DEV - Feature Implementation

address CR comments

    • -15
    • +0
    ./gui/qml/components/ArrowButton.qml
LDT-858 Main Treatment Screen - SW - Components & Screens - 05: DEV - Feature Implementation

remove hardcoded values for testing

LDT-858 Main Treatment Screen - SW - Components & Screens - 05: DEV - Feature Implementation

remved import thats not needed

LDT-858 Main Treatment Screen - SW - Components & Screens - 05: DEV - Feature Implementation

address more pr comments

    • -0
    • +39
    ./gui/qml/components/IconButton.qml
    • -12
    • +1
    ./gui/qml/components/ProgressBarEx.qml
    • -4
    • +8
    ./gui/qml/components/ProgressCircle.qml
  1. … 9 more files in changeset.
LDT-858 Main Treatment Screen - SW - Components & Screens - 05: DEV - Feature Implementation

Address PR Comment

  1. … 1 more file in changeset.
LDT-858 Main Treatment Screen - SW - Components & Screens - 05: DEV - Feature Implementation

Updated expanding arrow image so removed extra logic to compensate

LDT-858 Main Treatment Screen - SW - Components & Screens - 05: DEV - Feature Implementation

Address code review comments

    • -0
    • +57
    ./gui/qml/components/ArrowButton.qml
    • -16
    • +16
    ./gui/qml/pages/treatment/TreatmentHome.qml
    • -68
    • +4
    ./gui/qml/pages/treatment/TreatmentStack.qml
  1. … 1 more file in changeset.
Merge branch 'feature/LDT-1021-device-settings-sw-wifi' into staging

Merge branch 'LDT-627-Main-Treatment-Screen-SW-Messaging-Broadcast' into staging

LDT-858 Main Treatment Screen - SW - Components & Screens - 05: DEV - Feature Implementation

Update lock popup timeout from 3 sec to 750 ms