leahi-application

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
    /sources/view/dd/data/VDDValvesStatesData.h
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

    • -48
    • +93
    /sources/model/dd/data/MDDValvesStatesData.cpp
    • -93
    • +60
    /sources/model/dd/data/MDDValvesStatesData.h
    • -27
    • +59
    /sources/view/dd/data/VDDValvesStatesData.cpp
    • -27
    • +57
    /sources/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

    • binary
    /SDDs/DiagnosticsScreen.png
    • binary
    /SDDs/MainTreatmentScreen.png
    • -1
    • +2
    /sources/canbus/MessageInterpreter.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
    /sources/model/hd/data/MHDAirBubbleData.cpp
    • -84
    • +0
    /sources/model/hd/data/MHDAirBubbleData.h
    • -0
    • +49
    /sources/model/td/data/MTDAirBubbleData.cpp
    • -0
    • +84
    /sources/model/td/data/MTDAirBubbleData.h
    • -25
    • +0
    /sources/view/hd/data/VHDAirBubbleData.cpp
    • -43
    • +0
    /sources/view/hd/data/VHDAirBubbleData.h
    • -0
    • +25
    /sources/view/td/data/VTDAirBubbleData.cpp
    • -0
    • +43
    /sources/view/td/data/VTDAirBubbleData.h
LDT-912: Main Treatment Screen - SW - Diagnostics Screen-DD - 05: DEV - Feature Implementation

-Implement DD blood Leak message

    • -0
    • +1
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +41
    /sources/model/dd/data/MDDBloodLeakData.cpp
    • -0
    • +78
    /sources/model/dd/data/MDDBloodLeakData.h
    • -0
    • +24
    /sources/view/dd/data/VDDBloodLeakData.cpp
    • -0
    • +42
    /sources/view/dd/data/VDDBloodLeakData.h
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

    • -1
    • +3
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +119
    /sources/model/dd/data/MDDConcentratePumpData.cpp
    • -0
    • +152
    /sources/model/dd/data/MDDConcentratePumpData.h
    • -0
    • +104
    /sources/model/dd/data/MDDDialysatePumpData.cpp
    • -0
    • +138
    /sources/model/dd/data/MDDDialysatePumpData.h
    • -44
    • +15
    /sources/model/dd/data/MDDTemperaturesData.h
    • -0
    • +87
    /sources/model/dd/data/MDDValvesStatesData.cpp
  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

    • -0
    • +33
    /SDDs/Diagostics.puml
    • -4
    • +4
    /sources/canbus/MessageInterpreter.cpp
    • -2
    • +2
    /sources/model/dd/data/MDDGenDialysateData.h
    • -0
    • +99
    /sources/model/dd/data/MDDHeatersData.cpp
  1. … 34 more files in changeset.
Merge branch 'feature/LDT-1209-main-treatment-screen' into staging

    • -1
    • +1
    /sources/canbus/MessageInterpreter.cpp
Merge branch 'LDT-907-Main-Treatment-Screen-SW-Diagnostics-Screen-DD' into staging

    • -0
    • +1
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +280
    /sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml
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

    • -3
    • +3
    /sources/canbus/MessageInterpreter.cpp
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

    • -0
    • +1
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +47
    /sources/model/dg/data/MDDLevelData.cpp
    • -0
    • +84
    /sources/model/dg/data/MDDLevelData.h
    • -0
    • +26
    /sources/view/dg/data/VDDLevelData.cpp
    • -0
    • +44
    /sources/view/dg/data/VDDLevelData.h
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
    • +2
    /sources/gui/qml/components/Circle.qml
    • -1
    • +0
    /sources/gui/qml/components/IconButton.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

    • -1
    • +1
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +2
    /sources/gui/qml/globals/Variables.qml
  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-1207 Main Treatment Screen - SW - 01 - Screen Integration (MSG,QML) - R&I - 03: SDD - Design Diagram - plantuml

Updated SDD diagram and removed obsolete components

    • -102
    • +81
    /SDDs/Main_Treatment/FinalDiagram.dot
    • -846
    • +0
    /SDDs/Main_Treatment/finalDiagram.dot
    • binary
    /SDDs/Main_Treatment/images/IsolatedUfButton.png
LDT-1209 Main Treatment Screen - SW - 01 - Screen Integration (MSG,QML) - R&I - 05: DEV - Feature Implementation

address cr comments

    • -2
    • +5
    /sources/gui/qml/components/RangeBar.qml
    • -1
    • +0
    /sources/view/hd/data/VTreatmentRanges.cpp
LDT-1209 Main Treatment Screen - SW - 01 - Screen Integration (MSG,QML) - R&I - 05: DEV - Feature Implementation

remove states

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

    • -8
    • +9
    /sources/view/hd/data/VTreatmentRanges.cpp
    • -2
    • +2
    /sources/view/hd/data/VTreatmentRanges.h
LDT-1207 Main Treatment Screen - SW - 01 - Screen Integration (MSG,QML) - R&I - 03: SDD - Design Diagram - plantuml

add final SDD diagram

    • -0
    • +846
    /SDDs/Main_Treatment/finalDiagram.dot
Main Treatment Screen - SW - 01 - Screen Integration (MSG,QML) - R&I - 03: SDD - Design Diagram

Updated SDD diagram

    • -1
    • +1
    /SDDs/Main_Treatment/TreatmentSaline.dot
    • -2
    • +2
    /SDDs/Main_Treatment/TreatmentTime.dot
    • binary
    /SDDs/Main_Treatment/images/UfProgressBar.png
    • binary
    /SDDs/Main_Treatment/images/UfProgressMarker.png
  1. … 4 more files in changeset.
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
    • +1
    /sources/gui/qml/components/ModalDialog.qml
    • -1
    • +2
    /sources/gui/qml/globals/Variables.qml
Merge branch 'feature/LDT-853-main-treatment-screen' into staging

- staging|MERGING issue and recommit.

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

    • -0
    • +863
    /SDDs/Main_Treatment/FinalDiagram.dot
    • -0
    • +55
    /SDDs/Main_Treatment/TreatmentParameters-BloodFlow.dot
    • -0
    • +45
    /SDDs/Main_Treatment/TreatmentParameters-DialysateCond.dot
    • -0
    • +56
    /SDDs/Main_Treatment/TreatmentParameters-DialysateFlow.dot
    • -0
    • +55
    /SDDs/Main_Treatment/TreatmentParameters-DialysateTemp.dot
    • -0
    • +52
    /SDDs/Main_Treatment/TreatmentParameters.dot
    • -0
    • +197
    /SDDs/Main_Treatment/TreatmentPressures.dot
    • -0
    • +71
    /SDDs/Main_Treatment/TreatmentSaline.dot
    • -0
    • +62
    /SDDs/Main_Treatment/TreatmentTime.dot
    • -0
    • +70
    /SDDs/Main_Treatment/TreatmentVitals.dot
    • binary
    /SDDs/Main_Treatment/images/ArterialLowerMarker.png
  1. … 166 more files in changeset.
LDT-858 Main Treatment Screen - SW - Components & Screens - 05: DEV - Feature Implementation

Update icon button to remove alias

    • -3
    • +3
    /sources/gui/qml/components/IconButton.qml
LDT-858 Main Treatment Screen - SW - Components & Screens - 05: DEV - Feature Implementation

revert touchRect properties not being used

    • -4
    • +2
    /sources/gui/qml/components/TouchRect.qml
Main Treatment Screen - SW - Components & Screens - 03: SDD - Design Diagram

Added MainTreatmentScreen.puml to SDD folder

    • -0
    • +46
    /SDDs/MainTreatmentScreen.puml