Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDT-912: Main Treatment Screen - SW - Diagnostics Screen-DD - 05: DEV - Feature Implementation

- Add back refresh trigger in VDDValvesStatesData

    • -1
    • +1
    ./view/dd/data/VDDValvesStatesData.cpp
LDT-912: Main Treatment Screen - SW - Diagnostics Screen-DD - 05: DEV - Feature Implementation - Adjust DD Valves payload length - Implement Model and View format for DD Valves - Add DD Valves Enum to Gui Globals - Add DD Valves to Diagnostics Screen

    • -63
    • +129
    ./gui/qml/dialogs/diagnostics/DiagnosticsDD.qml
    • -48
    • +93
    ./model/dd/data/MDDValvesStatesData.cpp
    • -93
    • +60
    ./model/dd/data/MDDValvesStatesData.h
    • -27
    • +59
    ./view/dd/data/VDDValvesStatesData.cpp
    • -27
    • +57
    ./view/dd/data/VDDValvesStatesData.h
LDT-912: Main Treatment Screen - SW - Diagnostics Screen-DD - 05: DEV - Feature Implementation

- implement TD air pump and air bubbles message

- Adjust page indicators in diagnostics screen

- Add TD air pump and bubbles message to diagnostics screen

- fix DD diagnostics conductivity to have fixed float points

-Fix dd dialysate pump model comments

- Add Base of DD valves in doxygen comment TODO LATER

- Address imports for diagnostics QML files

- Generate png files for all SDD items

    • -1
    • +3
    ./gui/qml/dialogs/diagnostics/DiagnosticsSwipe.qml
    • -18
    • +99
    ./gui/qml/dialogs/diagnostics/DiagnosticsTD.qml
    • -23
    • +23
    ./model/dd/data/MDDDialysatePumpData.h
    • -13
    • +13
    ./model/dd/data/MDDHeatersData.h
    • -15
    • +7
    ./model/dd/data/MDDValvesStatesData.h
    • -12
    • +12
    ./model/td/data/MTDAirBubbleData.cpp
  1. … 15 more files in changeset.
LDT-912: Main Treatment Screen - SW - Diagnostics Screen-DD - 05: DEV - Feature Implementation

- implement TD air pump and air bubbles message

- Adjust page indicators in diagnostics screen

- Add TD air pump and bubbles message to diagnostics screen

- fix DD diagnostics conductivity to have fixed float points

-Fix dd dialysate pump model comments

- Add Base of DD valves in doxygen comment TODO LATER

    • -49
    • +0
    ./model/hd/data/MHDAirBubbleData.cpp
    • -0
    • +49
    ./model/td/data/MTDAirBubbleData.cpp
    • -0
    • +84
    ./model/td/data/MTDAirBubbleData.h
    • -25
    • +0
    ./view/hd/data/VHDAirBubbleData.cpp
    • -0
    • +25
    ./view/td/data/VTDAirBubbleData.cpp
    • -0
    • +43
    ./view/td/data/VTDAirBubbleData.h
LDT-912: Main Treatment Screen - SW - Diagnostics Screen-DD - 05: DEV - Feature Implementation

-Implement DD blood Leak message

    • -0
    • +13
    ./gui/qml/dialogs/diagnostics/DiagnosticsDD.qml
    • -0
    • +41
    ./model/dd/data/MDDBloodLeakData.cpp
    • -0
    • +78
    ./model/dd/data/MDDBloodLeakData.h
    • -0
    • +24
    ./view/dd/data/VDDBloodLeakData.cpp
    • -0
    • +42
    ./view/dd/data/VDDBloodLeakData.h
  1. … 1 more file in changeset.
LDT-912: Main Treatment Screen - SW - Diagnostics Screen-DD - 05: DEV - Feature Implementation

- Move DG Valves to DD and rename to DD

- Implement the following DD messages:

Dialysate Pump, Concentrate pump

- Cleanup Saloine bolus enum in VTDTretamentSattesData.cpp

- Minor comment cleanup in MDDTemperatures

    • -123
    • +237
    ./gui/qml/dialogs/diagnostics/DiagnosticsDD.qml
    • -0
    • +119
    ./model/dd/data/MDDConcentratePumpData.cpp
    • -0
    • +152
    ./model/dd/data/MDDConcentratePumpData.h
    • -0
    • +104
    ./model/dd/data/MDDDialysatePumpData.cpp
    • -0
    • +138
    ./model/dd/data/MDDDialysatePumpData.h
    • -44
    • +15
    ./model/dd/data/MDDTemperaturesData.h
    • -0
    • +87
    ./model/dd/data/MDDValvesStatesData.cpp
    • -0
    • +186
    ./model/dd/data/MDDValvesStatesData.h
  1. … 13 more files in changeset.
LDT-912: Main Treatment Screen - SW - Diagnostics Screen-DD - 05: DEV - Feature Implementation

-Add SDD for diagnostics screen

- Fix typo in DD Gen dialysate to be 'SpentPressure' instead of 'SpendPressure'

- Move Leahi implementation of DG to now DD folder

- implement DD diagnostics including the following:

Heaters

Pressures

Temperatures

- The following DD message ID's have been updated:

Pressure

Temperature

Heaters

Blood Leak

Dialysate Pump

Concentrate Pump

Valves

    • -140
    • +178
    ./gui/qml/dialogs/diagnostics/DiagnosticsDD.qml
    • -38
    • +37
    ./gui/qml/dialogs/diagnostics/DiagnosticsTD.qml
    • -1
    • +1
    ./model/dd/data/MDDGenDialysateData.cpp
    • -0
    • +99
    ./model/dd/data/MDDHeatersData.cpp
    • -0
    • +132
    ./model/dd/data/MDDHeatersData.h
    • -0
    • +47
    ./model/dd/data/MDDLevelData.cpp
  1. … 34 more files in changeset.
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.