leahi-application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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
Merge branch 'feature/LDT-1209-main-treatment-screen' into develop

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.
Merge branch 'feature/LDT-1209-main-treatment-screen' into develop

Merge branch 'staging' into develop

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
LDT-858 Main Treatment Screen - SW - Components & Screens - 05: DEV - Feature Implementation

address CR comments

    • -15
    • +0
    /sources/gui/qml/components/ArrowButton.qml
    • -3
    • +4
    /sources/gui/qml/components/ModalDialog.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

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

address more pr comments

    • -30
    • +0
    /sources/gui/qml/components/Circle.qml
    • -0
    • +39
    /sources/gui/qml/components/IconButton.qml
    • -0
    • +1
    /sources/gui/qml/components/ModalDialog.qml
    • -5
    • +4
    /sources/gui/qml/components/ProgressBar.qml
    • -12
    • +1
    /sources/gui/qml/components/ProgressBarEx.qml
    • -8
    • +0
    /sources/gui/qml/components/ProgressRect.qml
    • -1
    • +0
    /sources/gui/qml/components/RangeBar.qml
    • -1
    • +4
    /sources/gui/qml/dialogs/AutoHideInfo.qml
    • -1
    • +1
    /sources/gui/qml/globals/Variables.qml
  1. … 9 more files in changeset.
LDT-858 Main Treatment Screen - SW - Components & Screens - 05: DEV - Feature Implementation

Address PR Comment

    • -49
    • +0
    /sources/gui/qml/components/Fader.qml
    • -0
    • +49
    /sources/gui/qml/compounds/Fader.qml
LDT-858 Main Treatment Screen - SW - Components & Screens - 05: DEV - Feature Implementation

Updated expanding arrow image so removed extra logic to compensate

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

Address code review comments

    • -0
    • +57
    /sources/gui/qml/components/ArrowButton.qml
    • -2
    • +4
    /sources/gui/qml/components/TouchRect.qml
    • -4
    • +5
    /sources/gui/qml/globals/Variables.qml
    • -16
    • +16
    /sources/gui/qml/pages/treatment/TreatmentHome.qml
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

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

Update qml components, fix drop shadow, add homescreen background

    • -4
    • +12
    /sources/gui/qml/pages/MainHome.qml
LDT-627: Main Treatment Screen - SW - Messaging Broadcast - 05: DEV - Feature Implementation

Adjust Message ID's per Dialin message changes (0x52-0x54)